fix oled

dawsonjon · Sep 1, 2024 · e85f19f · e85f19f
1 parent b81393b
commit e85f19f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/build/picorx.uf2 b/build/picorx.uf2
diff --git a/rx_dsp.cpp b/rx_dsp.cpp
@@ -419,6 +419,7 @@ void rx_dsp :: set_cw_sidetone_Hz(uint16_t val)
 void rx_dsp :: set_gain_cal_dB(uint16_t val)
 {
   amplifier_gain_dB = val;
+  s9_threshold = full_scale_signal_strength*powf(10.0f, (S9 - full_scale_dBm + amplifier_gain_dB)/20.0f);
 }
 
 //volume settings 0 to 9

diff --git a/rx_dsp.h b/rx_dsp.h
@@ -88,6 +88,7 @@ class rx_dsp
 
   //squelch
   int16_t squelch_threshold=0;
+  int16_t s9_threshold=0;
 
   //used in AGC
   uint8_t attack_factor;

diff --git a/ui.cpp b/ui.cpp
@@ -474,11 +474,10 @@ void ui::autorestore()
   }
 
   apply_settings(false);
-  ssd1306_flip(&disp, settings[idx_hw_setup] >> flag_flip_oled);
   uint8_t display_timeout_setting = (settings[idx_hw_setup] & mask_display_timeout) >> flag_display_timeout;
   display_timer = timeout_lookup[display_timeout_setting];
-  ssd1306_flip(&disp, settings_to_apply.flip_oled );
-  ssd1306_type(&disp, settings_to_apply.oled_type );
+  ssd1306_flip(&disp, (settings[idx_hw_setup] >> flag_flip_oled) & 1);
+  ssd1306_type(&disp, (settings[idx_hw_setup] >> flag_oled_type) & 1);
 
 }
 
@@ -1082,12 +1081,12 @@ bool ui::configuration_menu()
 
         case 5: 
           rx_settings_changed = bit_entry("Flip Oled", "Off#On#", flag_flip_oled, &settings[idx_hw_setup]);
-          ssd1306_flip(&disp, settings[idx_hw_setup] >> flag_flip_oled);
+          ssd1306_flip(&disp, (settings[idx_hw_setup] >> flag_flip_oled) & 1);
           break;
 
         case 6: 
           rx_settings_changed = bit_entry("Oled Type", "SSD1306#SH1106#", flag_oled_type, &settings[idx_hw_setup]);
-          ssd1306_type(&disp, settings[idx_hw_setup] >> flag_oled_type);
+          ssd1306_type(&disp, (settings[idx_hw_setup] >> flag_oled_type) & 1);
           break;
 
         case 7: 
@@ -1123,7 +1122,7 @@ void ui::do_ui(void)
     uint32_t encoder_change = get_encoder_change();
 
     //automatically switch off display after a period of inactivity
-    if(!display_timeout(encoder_change)) return false;
+    if(!display_timeout(encoder_change)) return;
 
     //update frequency if encoder changes
     switch(button_state)
@@ -1207,7 +1206,7 @@ void ui::do_ui(void)
 
       //top level menu
       uint32_t setting = 0;
-      if(!enumerate_entry("menu:", "Frequency#Recall#Store#Volume#Mode#AGC Speed#Bandwidth#Squelch#Frequency Step#CW Sidetone Frequency#Configuration", 10, &setting)) return 1;
+      if(!enumerate_entry("menu:", "Frequency#Recall#Store#Volume#Mode#AGC Speed#Bandwidth#Squelch#Frequency Step#CW Sidetone Frequency#Configuration", 10, &setting)) return;
 
       switch(setting)
       {

diff --git a/ui.h b/ui.h
@@ -40,7 +40,7 @@ const uint8_t PIN_DISPLAY_SCL = 19;
 #define flag_flip_oled 2
 #define flag_oled_type 3
 #define flag_display_timeout 4
-#define mask_display_timeout (0x7 << 3)
+#define mask_display_timeout (0x7 << flag_display_timeout)
 
 // define wait macros
 #define WAIT_10MS sleep_us(10000);