diff --git a/data_embed/index.html b/data_embed/index.html index ae2fd51..509925b 100644 --- a/data_embed/index.html +++ b/data_embed/index.html @@ -89,11 +89,11 @@
- +
- +
@@ -122,8 +122,8 @@
- - + +
diff --git a/include/taskWebServer.h b/include/taskWebServer.h index c46ada6..c3aa21e 100644 --- a/include/taskWebServer.h +++ b/include/taskWebServer.h @@ -42,7 +42,7 @@ static const char *const PREF_APRS_SHOW_CMT_INIT = "show_cmt_init"; static const char *const PREF_DEV_BT_EN = "bt_enabled"; static const char *const PREF_DEV_BT_EN_INIT = "bt_enabled_init"; static const char *const PREF_DEV_OL_EN = "oled_enabled"; -static const char *const PREF_DEV_OL_EN_INIT = "oled_enabled_init"; +static const char *const PREF_DEV_OL_EN_INIT = "ol_enabled_init"; typedef struct { String callsign; diff --git a/src/TTGO_T-Beam_LoRa_APRS.ino b/src/TTGO_T-Beam_LoRa_APRS.ino index 7012ee6..9929abf 100644 --- a/src/TTGO_T-Beam_LoRa_APRS.ino +++ b/src/TTGO_T-Beam_LoRa_APRS.ino @@ -318,6 +318,13 @@ void writedisplaytext(String HeaderTxt, String Line1, String Line2, String Line3 display.println(Line4); display.setCursor(0,56); display.println(Line5); + if (enabled_oled){ + //axp.setPowerOutPut(AXP192_DCDC1, AXP202_ON); // enable oled + display.dim(true); + }else{ + //axp.setPowerOutPut(AXP192_DCDC1, AXP202_OFF); // disable oled + display.dim(false); + } display.display(); time_to_refresh = millis() + showRXTime; } @@ -481,7 +488,6 @@ void setup(){ if(digitalRead(BUTTON)==LOW){ clear_preferences = 2; } - } if (!preferences.getBool(PREF_APRS_SHOW_CMT_INIT)){ @@ -524,6 +530,8 @@ void setup(){ // Enable ADC to measure battery current, USB voltage etc. axp.adc1Enable(0xfe, true); axp.adc2Enable(0x80, true); + axp.setChgLEDMode(AXP20X_LED_OFF); + axp.setPowerOutPut(AXP192_DCDC1, AXP202_ON); // oled do not turn off #endif if(!display.begin(SSD1306_SWITCHCAPVCC, SSD1306_ADDRESS)) { @@ -604,14 +612,6 @@ void setup(){ time_to_refresh = millis() + showRXTime; displayInvalidGPS(); digitalWrite(TXLED, HIGH); - #ifdef T_BEAM_V1_0 - axp.setChgLEDMode(AXP20X_LED_OFF); - if (enabled_oled){ - axp.setPowerOutPut(AXP192_DCDC1, AXP202_ON); // enable oled - }else{ - axp.setPowerOutPut(AXP192_DCDC1, AXP202_OFF); // disable oled - } - #endif } // +---------------------------------------------------------------------+//