Merge 13e5676ee3 into 24ceb3e97e

src/publisher/pubMqtt.h

@@ -158,6 +158,7 @@ class PubMqtt {
             publish(subtopics[MQTT_UPTIME], mVal.data());
             publish(subtopics[MQTT_RSSI], String(WiFi.RSSI()).c_str());
             publish(subtopics[MQTT_FREE_HEAP], String(ESP.getFreeHeap()).c_str());
+            publish(subtopics[MQTT_TEMP_SENS_C], String(ah::readTemperature()).c_str());
             #ifndef ESP32
             publish(subtopics[MQTT_HEAP_FRAG], String(ESP.getHeapFragmentation()).c_str());
             #endif
@@ -656,7 +657,7 @@ class PubMqtt {
             size_t index;
             size_t total;
 
-            message_s() 
+            message_s()
             : topic { nullptr }
             , payload { nullptr }
             , len { 0 }

src/publisher/pubMqttDefs.h

@@ -56,7 +56,8 @@ enum {
     MQTT_STATUS,
     MQTT_LWT_ONLINE,
     MQTT_LWT_OFFLINE,
-    MQTT_ACK_PWR_LMT
+    MQTT_ACK_PWR_LMT,
+    MQTT_TEMP_SENS_C
 };
 
 const char* const subtopics[] PROGMEM = {
@@ -76,7 +77,8 @@ const char* const subtopics[] PROGMEM = {
     "status",
     "connected",
     "not_connected",
-    "ack_pwr_limit"
+    "ack_pwr_limit",
+    "temp_sensor_c"
 };
 
 enum {

src/utils/helper.cpp

@@ -3,7 +3,11 @@
 // Creative Commons - http://creativecommons.org/licenses/by-nc-sa/3.0/de/
 //-----------------------------------------------------------------------------
 
+
+#include <Arduino.h>
 #include "helper.h"
+/*#include <driver/adc.h>
+#include <esp_adc_cal.h>*/
 #include "dbg.h"
 #include "../plugins/plugin_lang.h"
 
@@ -142,4 +146,25 @@ namespace ah {
         }
         DBGPRINTLN("");
     }
+
+#if defined(ESP32)
+    float readTemperature() {
+        /*// ADC1 channel 0 is GPIO36
+        adc1_config_width(ADC_WIDTH_BIT_12);
+        adc1_config_channel_atten(ADC1_CHANNEL_0, ADC_ATTEN_DB_0);
+
+        int adc_reading = adc1_get_raw(ADC1_CHANNEL_0);
+
+        // Convert the raw ADC reading to a voltage in mV
+        esp_adc_cal_characteristics_t characteristics;
+        esp_adc_cal_value_t val_type = esp_adc_cal_characterize(ADC_UNIT_1, ADC_ATTEN_DB_0, ADC_WIDTH_BIT_12, 1100, &characteristics);
+        uint32_t voltage = esp_adc_cal_raw_to_voltage(adc_reading, &characteristics);
+
+        // Convert the voltage to a temperature in Celsius
+        // This formula is an approximation and might need to be calibrated for your specific use case.
+        float temperature = (voltage - 500) / 10.0;*/
+
+        return temperatureRead();
+    }
+#endif
 }

src/utils/helper.h

@@ -49,6 +49,10 @@ namespace ah {
     String getTimeStrMs(uint64_t t);
     uint64_t Serial2u64(const char *val);
     void dumpBuf(uint8_t buf[], uint8_t len, uint8_t firstRepl = 0, uint8_t lastRepl = 0);
+
+    #if defined(ESP32)
+    float readTemperature();
+    #endif
 }
 
 #endif /*__HELPER_H__*/

src/web/RestApi.h

@@ -445,6 +445,7 @@ class RestApi {
             obj[F("chip_model")]    = ESP.getChipModel();
             obj[F("chip_cores")]    = ESP.getChipCores();
             obj[F("heap_total")]    = ESP.getHeapSize();
+            obj[F("temp_sensor_c")] = ah::readTemperature();
             //obj[F("core_version")]  = F("n/a");
             //obj[F("flash_size")]    = F("n/a");
             //obj[F("heap_frag")]     = F("n/a");

src/web/html/system.html

@@ -25,7 +25,7 @@
                 const data = ["sdk", "cpu_freq", "chip_revision", "device_name",
                     "chip_model", "chip_cores", "esp_type", "mac", "wifi_rssi", "wifi_channel", "ts_uptime",
                     "flash_size", "sketch_used", "heap_total", "heap_free", "heap_frag",
-                    "max_free_blk", "version", "modules", "env", "core_version", "reboot_reason"];
+                    "max_free_blk", "version", "modules", "env", "core_version", "reboot_reason", "temp_sensor_c"];
 
                 lines = [];
                 for (const [key, value] of Object.entries(obj)) {