Merge branch 'dev' into dev-heltec-v4.3

variants/heltec_v4/HeltecV4Board.cpp

@@ -10,8 +10,6 @@ void HeltecV4Board::begin() {
     loRaFEMControl.init();
 
     periph_power.begin();
-
-    esp_reset_reason_t reason = esp_reset_reason();
     if (reason == ESP_RST_DEEPSLEEP) {
       long wakeup_source = esp_sleep_get_ext1_wakeup_status();
       if (wakeup_source & (1 << P_LORA_DIO_1)) {  // received a LoRa packet (while in deep sleep)

variants/heltec_v4/platformio.ini

@@ -24,7 +24,7 @@ build_flags =
   -D P_LORA_KCT8103L_PA_CTX=5
   -D PIN_USER_BTN=0
   -D PIN_VEXT_EN=36
-  -D PIN_VEXT_EN_ACTIVE=LOW
+  -D PIN_VEXT_EN_ACTIVE=HIGH
   -D LORA_TX_POWER=10 ;If it is configured as 10 here, the final output will be 22 dbm.
   -D MAX_LORA_TX_POWER=22 ; Max SX1262 output
   -D SX126X_REGISTER_PATCH=1       ; Patch register 0x8B5 for improved RX
@@ -56,8 +56,6 @@ build_flags =
   -D PIN_BOARD_SDA=17
   -D PIN_BOARD_SCL=18
   -D PIN_OLED_RESET=21
-  -D ENV_PIN_SDA=4
-  -D ENV_PIN_SCL=3
 build_src_filter= ${Heltec_lora32_v4.build_src_filter}
 lib_deps = ${Heltec_lora32_v4.lib_deps}
 

variants/heltec_v4/target.cpp

@@ -24,7 +24,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);
 #endif
 
 #ifdef DISPLAY_CLASS
-  DISPLAY_CLASS display(&(board.periph_power));
+  DISPLAY_CLASS display(NULL);
   MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
 #endif