Merge branch 'DiSlord_tinySA-V4-SI4463' of https://github.com/erikkaashoek/tinySA into DiSlord_tinySA-V4-SI4463

main.c

@@ -2098,6 +2098,7 @@ int main(void)
 
 #ifdef TINYSA3
   has_esd = ((palReadPort(GPIOB) & (1<<12)) ? false : true );
+
 #endif
 
 
@@ -2161,6 +2162,10 @@ int main(void)
 #endif
 
 /* restore config */
+#ifdef TINYSA3
+  if (has_esd)
+    config.switch_offset = -5.0;
+#endif
   config_recall();
   config.cor_am = 0;        // Should be removed from config
   config.cor_nfm = 0;

sa_core.c

@@ -3483,6 +3483,7 @@ again:                                                              // Spur redu
     //      shell_printf("%d %.3f %.3f %.1f\r\n", i, local_IF/1000000.0, lf/1000000.0, subRSSI);
 
     // ************** trigger mode if need
+#if 0
     // trigger on measure 4 point
 #define T_POINTS            4
 #define T_LEVEL_UNDEF       (1<<(16-T_POINTS)) // should drop after 4 shifts left
@@ -3492,6 +3493,17 @@ again:                                                              // Spur redu
 #define T_DOWN_MASK         (0b0011)           // 2 from up 2 to bottom
 #define T_UP_MASK           (0b1100)           // 2 from bottom 2 to up
 #define T_LEVEL_CLEAN       ~(1<<T_POINTS)     // cleanup old trigger data
+#else
+    // trigger on measure 2 point
+#define T_POINTS            2
+#define T_LEVEL_UNDEF       (1<<(16-T_POINTS)) // should drop after 4 shifts left
+#define T_LEVEL_BELOW       1
+#define T_LEVEL_ABOVE       0
+    // Trigger mask, should have width T_POINTS bit
+#define T_DOWN_MASK         (0b0001)           // 1 from up 1 to bottom
+#define T_UP_MASK           (0b0010)           // 1 from bottom 1 to up
+#define T_LEVEL_CLEAN       ~(1<<T_POINTS)     // cleanup old trigger data
+#endif
 
     if (i == 0 && setting.frequency_step == 0 && setting.trigger != T_AUTO) { // if in zero span mode and wait for trigger to happen and NOT in trigger mode
 

si4432.c

@@ -556,6 +556,7 @@ int SI4432_is_fast_mode(void)
 
 //--------------------------- Trigger -------------------
 // ************** trigger mode if need
+#if 0
 // trigger on measure 4 point
 #define T_POINTS            4
 #define T_LEVEL_UNDEF       (1<<(16-T_POINTS)) // should drop after 4 shifts left
@@ -565,6 +566,17 @@ int SI4432_is_fast_mode(void)
 #define T_DOWN_MASK         (0b0011)           // 2 from up 2 to bottom
 #define T_UP_MASK           (0b1100)           // 2 from bottom 2 to up
 #define T_LEVEL_CLEAN       ~(1<<T_POINTS)     // cleanup old trigger data
+#else
+    // trigger on measure 2 point
+#define T_POINTS            2
+#define T_LEVEL_UNDEF       (1<<(16-T_POINTS)) // should drop after 2 shifts left
+#define T_LEVEL_BELOW       1
+#define T_LEVEL_ABOVE       0
+    // Trigger mask, should have width T_POINTS bit
+#define T_DOWN_MASK         (0b0001)           // 1 from up 1 to bottom
+#define T_UP_MASK           (0b0010)           // 1 from bottom 1 to up
+#define T_LEVEL_CLEAN       ~(1<<T_POINTS)     // cleanup old trigger data
+#endif
 
 enum { ST_ARMING, ST_WAITING, ST_FILLING };
 

ui_sa.c

@@ -3384,7 +3384,7 @@ redraw_cal_status:
   if (setting.spur_removal != S_OFF) {
     ili9341_set_foreground(setting.spur_removal == S_ON ? LCD_BRIGHT_COLOR_GREEN : LCD_FG_COLOR);
     lcd_printf(x, y, "Spur:\n%s", S_IS_AUTO(setting.spur_removal) ? "AUTO" : "ON");
-    y = add_quick_menu(y += YSTEP, (menuitem_t *)menu_stimulus);
+    y = add_quick_menu(y += YSTEP, (menuitem_t *)menu_config);
   }
   if (setting.mirror_masking) {
     ili9341_set_foreground(LCD_BRIGHT_COLOR_GREEN);