From 4ab831c10386005a3012713a07994b9b396d032d Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sat, 4 Jun 2022 07:28:58 -0500
Subject: [PATCH] Fix nagging bool linter warnings (#1491)

---
 src/SerialConsole.cpp                      | 5 ++---
 src/modules/AdminModule.cpp                | 8 --------
 src/modules/Telemetry/Sensor/DHTSensor.cpp | 3 ++-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/SerialConsole.cpp b/src/SerialConsole.cpp
index 76926bb4e..2d001192b 100644
--- a/src/SerialConsole.cpp
+++ b/src/SerialConsole.cpp
@@ -45,9 +45,8 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port)
 bool SerialConsole::checkIsConnected()
 {
     uint32_t now = millis();
-    return (now - lastContactMsec) < config.power.phone_timeout_secs
-               ? config.power.phone_timeout_secs
-               : default_phone_timeout_secs * 1000UL;
+    uint32_t timeout = (config.power.phone_timeout_secs > 0 ? config.power.phone_timeout_secs : default_phone_timeout_secs )* 1000UL;
+    return (now - lastContactMsec) < timeout;
 }
 
 /**
diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
index 222f1bcde..c9b533af6 100644
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -17,14 +17,6 @@ AdminModule *adminModule;
 /// a change.
 static const char *secretReserved = "sekrit";
 
-/// If buf is !empty, change it to secret
-static void hideSecret(char *buf)
-{
-    if (*buf) {
-        strcpy(buf, secretReserved);
-    }
-}
-
 /// If buf is the reserved secret word, replace the buffer with currentVal
 static void writeSecret(char *buf, const char *currentVal)
 {
diff --git a/src/modules/Telemetry/Sensor/DHTSensor.cpp b/src/modules/Telemetry/Sensor/DHTSensor.cpp
index 5ccb8b0e1..e10a46bfd 100644
--- a/src/modules/Telemetry/Sensor/DHTSensor.cpp
+++ b/src/modules/Telemetry/Sensor/DHTSensor.cpp
@@ -9,7 +9,8 @@ DHTSensor::DHTSensor() : TelemetrySensor{} {}
 
 int32_t DHTSensor::runOnce()
 {
-    if (TelemetrySensorType_DHT11 || TelemetrySensorType_DHT12) {
+    if (moduleConfig.telemetry.environment_sensor_type == TelemetrySensorType_DHT11 || 
+        moduleConfig.telemetry.environment_sensor_type == TelemetrySensorType_DHT12) {
         dht = new DHT(moduleConfig.telemetry.environment_sensor_pin, DHT11);
     } else {
         dht = new DHT(moduleConfig.telemetry.environment_sensor_pin, DHT22);