Merge pull request #34 from Ho-Ro/V4.3_linux_fix

V4.3 #33 fix for linux build, fix for TARGET=F072 build

main.c

@@ -2085,7 +2085,9 @@ static const VNAShellCommand commands[] =
     { "agc", cmd_agc,    CMD_RUN_IN_LOAD },
 #endif
     { "actual_freq", cmd_actual_freq, CMD_WAIT_MUTEX | CMD_RUN_IN_LOAD },
+#ifdef TINYSA4
     { "freq_corr", cmd_freq_correction, CMD_WAIT_MUTEX | CMD_RUN_IN_LOAD },
+#endif
     { "attenuate", cmd_attenuate,    CMD_WAIT_MUTEX | CMD_RUN_IN_LOAD },
     { "level", cmd_level,    CMD_WAIT_MUTEX | CMD_RUN_IN_LOAD },
     { "sweeptime", cmd_sweeptime,    CMD_WAIT_MUTEX | CMD_RUN_IN_LOAD },

nanovna.h

@@ -18,7 +18,7 @@
  */
 #include "ch.h"
 
-//#ifdef TINYSA_F303
+#ifdef TINYSA_F303
 #ifdef TINYSA_F072
 #error "Remove comment for #ifdef TINYSA_F303"
 #endif
@@ -26,7 +26,7 @@
 #define TINYSA4
 #endif
 #define TINYSA4_PROTO
-//#endif
+#endif
 
 #ifdef TINYSA_F072
 #ifdef TINYSA_F303

sa_cmd.c

@@ -51,8 +51,8 @@ VNA_SHELL_FUNCTION(cmd_mode)
   } else
     io = get_str_index(argv[1], cmd_in_out);
 #else
-  int lh = get_str_index(argv[0], cmd_low_high);
+  lh = get_str_index(argv[0], cmd_low_high);
-  int io = get_str_index(argv[1], cmd_in_out);
+  io = get_str_index(argv[1], cmd_in_out);
 #endif
   if (lh < 0 || io<0)
     goto usage;

sa_core.c

@@ -7629,7 +7629,9 @@ void calibrate(void)
 #endif
 #endif
         if (calibration_stage == CS_NORMAL && peakLevel < -40) {
+#ifdef TINYSA4
 low_level:
+#endif
           ili9341_set_foreground(LCD_BRIGHT_COLOR_RED);
           ili9341_drawstring_7x13("Signal level incorrect", 30, 200);
           ili9341_drawstring_7x13("Check cable between connectors", 30, 220);

si4468.c

@@ -899,7 +899,7 @@ static void SI4463_set_properties(uint16_t prop, void* values, uint8_t len)
 }
 #endif
 
-#include "SI446x_cmd.h"
+#include "si446x_cmd.h"
 
 #include "radio_config_Si4468_undef.h"
 #undef RADIO_CONFIGURATION_DATA_ARRAY

ui_sa.c

@@ -446,8 +446,8 @@ enum {
   KM_RTC_DATE,
   KM_RTC_TIME,
 #endif
-  KM_CODE,
 #endif
+  KM_CODE,
   KM_NONE // always at enum end
 };
 
@@ -521,8 +521,8 @@ static const struct {
 [KM_RTC_DATE]     = {keypads_positive    , "SET DATE\n YYMMDD"}, // Date
 [KM_RTC_TIME]     = {keypads_positive    , "SET TIME\n HHMMSS"}, // Time
 #endif
-[KM_CODE]         = {keypads_positive    , "CODE"},              // KM_CODE
 #endif
+[KM_CODE]         = {keypads_positive    , "CODE"},              // KM_CODE
 };
 
 #if 0 // Not used
@@ -3193,7 +3193,9 @@ static const menuitem_t menu_settings[] =
   { MT_CALLBACK,    0 ,             "LOAD\nCONFIG.INI",     menu_load_config_cb},
 //  { MT_CALLBACK,        1 ,       "LOAD\nSETTING.INI",    menu_load_config_cb},
 #endif
+#ifdef TINYSA4
   { MT_ADV_CALLBACK,     0,              "INTERNALS",            menu_internals_acb},
+#endif
   { MT_NONE,        0, NULL, menu_back} // next-> menu_back
 };