Merge ccf7a85de7 into b4bdd75be9

src/menu_utils.cpp

@@ -682,7 +682,7 @@ namespace MENU_Utils {
                         }
                     #endif
                     #ifdef HAS_AXP2101
-                        if (Config.notification.lowBatteryBeep && !POWER_Utils::isCharging() && batteryCharge.toInt() < lowBatteryPercent) {
+                        if (Config.notification.buzzerActive && Config.notification.lowBatteryBeep && !POWER_Utils::isCharging() && batteryCharge.toInt() < lowBatteryPercent) {
                             lowBatteryPercent = batteryCharge.toInt();
                             NOTIFICATION_Utils::lowBatteryBeep();
                             if (batteryCharge.toInt() < 6) {
@@ -721,4 +721,4 @@ namespace MENU_Utils {
         }
     }
 
-}
+}

src/msg_utils.cpp

@@ -181,8 +181,10 @@ namespace MSG_Utils {
         if (messageLed && ledOnDelta > 1 * 1000) {
             digitalWrite(Config.notification.ledMessagePin, LOW);
         }
-        if (!messageLed && digitalRead(Config.notification.ledMessagePin) == HIGH) {
-            digitalWrite(Config.notification.ledMessagePin, LOW);
+        if (!messageLed && Config.notification.ledMessage){
+            if (digitalRead(Config.notification.ledMessagePin) == HIGH){
+                digitalWrite(Config.notification.ledMessagePin, LOW);
+            }
         }
     }
 
@@ -547,4 +549,4 @@ namespace MSG_Utils {
         }   
     }
 
-}
+}

src/power_utils.cpp

@@ -466,7 +466,7 @@ namespace POWER_Utils {
     void shutdown() {
         logger.log(logging::LoggerLevel::LOGGER_LEVEL_WARN, "Main", "SHUTDOWN !!!");
         #if defined(HAS_AXP192) || defined(HAS_AXP2101)
-            if (Config.notification.shutDownBeep) NOTIFICATION_Utils::shutDownBeep();
+            if (Config.notification.buzzerActive && Config.notification.shutDownBeep) NOTIFICATION_Utils::shutDownBeep();
             displayToggle(false);
             PMU.shutdown();
         #else
@@ -504,4 +504,4 @@ namespace POWER_Utils {
         #endif
     }
 
-}
+}

src/wx_utils.cpp

@@ -47,6 +47,8 @@ namespace WX_Utils {
                     while (1) delay(1);
                 }
                 logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "BME", " SHTC3 sensor found");
+                wxModuleFound = true;
+                wxModuleType = 4;
             #else
                 if (wxModuleAddress != 0x00) {
                     #if defined(HELTEC_V3_GPS) || defined(HELTEC_V3_TNC) || defined(HELTEC_V3_2_GPS) || defined(HELTEC_V3_2_TNC)