Apply DSP meter to all lcd types

2018-07-17 20:41:17 +09:00
parent b984f62dfd
commit c27bbf1b6b
6 changed files with 77 additions and 56 deletions
--- a/ubitx_20/ubitx_lcd_2004.ino
+++ b/ubitx_20/ubitx_lcd_2004.ino
@@ -690,7 +690,10 @@ void idle_process()
    if (((displayOption1 & 0x08) == 0x08 && (sdrModeOn == 0)) && (++checkCountSMeter > SMeterLatency))
    {
      int newSMeter;
-      
+
+#ifdef USE_I2CSMETER 
+    scaledSMeter = GetI2CSmeterValue(I2CMETER_CALCS);
+#else
      //VK2ETA S-Meter from MAX9814 TC pin
      newSMeter = analogRead(ANALOG_SMETER) / 4;
  
@@ -706,6 +709,7 @@ void idle_process()
          break;
        }
      }
+#endif  
  
      DisplayMeter(0, scaledSMeter, 0);
      checkCountSMeter = 0; //Reset Latency time