[SYS] Update arduino core to 3.1.1 + refactor ino to cpp (#2177)

* Update arduino core to 3.1.1 * Fix Blufi build * Update arduinojson, fix build errors with idf * Fix narrowing * fix RF builds * WIP-Convert ino files to cpp * Fix pilight build * Fix Somfy actuator build. * Update esp32dev-rf partition * Fix Weatherstation build * Fix GFSunInverter build * Fix esp32dev-ir build * Fix ble-aws build * Fix eth builds * Fix m5Stack missing pins_arduino.h * Fix build errors for M5 stack/tough, others are upstream issues. * Fix RTL 433 build - remaining errors are from radolib * Fix nodemcu build * fix 2g builds * Fix serial build * Fix actuator on off builds * Fix SSD1306 build - remaining errors are from radiolib * Fix multiple definition of OTAserver_cert * Fix nodemcu rf2 build * Fix ADC builds * Fix sensor builds * Fix LORA builds * Fix multi-receiver builds - remaining errors are in radiolib * Fix fastled builds * Fix theegns board builds * Fix broker builds * Update fastled - old version failed all-test build * Fix RN8209 builds * Fix max temp actuator builds * Fix PWM builds * Fix C37 sensor builds * Fix HTU21 builds * Fix INA266 builds * Fix undefined variables in mqtt discovery * Fix webui build * Fix fastled invalid pin error * Fix wifi manual setup builds * Fix onewire/all-test build - bin too big error remaining * Fix theengs plug build * Fix rfbridge builds * Fix blufi builds * Fix undefined functions in serial * Fix preprocessor definition checks * Set IDF log level to erre * Add delay in loop to prevent watchdog timeout * Use xTaskCreateUniveral to support single core processors * Remove old HTTPUpdate files - upsteam fixed. * Cleanup and move common declarations to header file * Use custom partiton table to fix builds where bin is too large * Update M5StickC - fixs esp32-m5stick-c-ble build * Revert to Arduino core 2.x for builds with incompatible libs * Remove "Z" from file names and rename omg_common to TheengsCommon * Fix gateway name when using MAC with new Arduino core * Update IDF config to reduce loop task stack use * Update esp-nimble-cpp version, corrects BLE uppercase ID's * Update wifi manager to fix watchdog timeout error
2025-05-06 19:35:50 -05:00
1 parent 6e77efb11b
commit 585df9a420
@@ -0,0 +1,115 @@
+/*  
+  Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
+ 
+   Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker 
+   Send and receiving command by MQTT
+   
+   This is the Climate Addon:
+   - Measures Temperature, Humidity
+   - Generates Values for: Temperature in degrees C and F, Humidity in %
+   - Required Hardware Module: AHTX0 (AHT10 & AHT20)
+   - Required Library: Adafruit AHTX0 by Adafruit
+
+   Connection Schemata:
+   --------------------
+
+   AHT10 ------> ESP8266
+   ==============================================
+   Vcc ---------> 3v3 (3V)
+   GND ---------> GND
+   SCL ---------> D1
+   SDA ---------> D2
+   
+    This file is part of OpenMQTTGateway.
+    
+    OpenMQTTGateway is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenMQTTGateway is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "User_config.h"
+
+#ifdef ZsensorAHTx0
+#  include <stdint.h>
+
+#  include "Adafruit_AHTX0.h"
+#  include "TheengsCommon.h"
+#  include "Wire.h" // Library for communication with I2C / TWI devices
+#  include "config_AHTx0.h"
+
+//Time used to wait for an interval before resending measured values
+unsigned long timeAHTx0 = 0;
+
+//Global sensor object
+Adafruit_AHTX0 ahtSensor;
+
+void setupZsensorAHTx0() {
+  delay(10); // Gives the Sensor enough time to turn on
+  Log.notice(F("AHTx0 Initialized - begin()" CR));
+
+#  if defined(ESP32)
+  Wire.begin(AHT_I2C_SDA, AHT_I2C_SCL);
+  if (!ahtSensor.begin(&Wire)) {
+    Log.error(F("Failed to initialize AHTx0 sensor!" CR));
+  }
+#  else
+  if (!ahtSensor.begin()) {
+    Log.error(F("Failed to initialize AHTx0 sensor!" CR));
+  }
+#  endif
+}
+
+void MeasureAHTTempHum() {
+  if (millis() > (timeAHTx0 + TimeBetweenReadingAHTx0)) {
+    Log.trace(F("Read AHTx0 Sensor" CR));
+
+    timeAHTx0 = millis();
+    static float persisted_aht_tempc;
+    static float persisted_aht_hum;
+
+    sensors_event_t ahtTempC, ahtHum;
+    if (!ahtSensor.getEvent(&ahtHum, &ahtTempC)) // get sensor data
+    {
+      Log.error(F("Failed to read from sensor AHTx0!" CR));
+      return;
+    }
+
+    // Check if reads failed and exit early (to try again).
+    if (isnan(ahtTempC.temperature) || isnan(ahtHum.relative_humidity)) {
+      Log.error(F("Failed to read from sensor AHTx0!" CR));
+    } else {
+      Log.notice(F("Creating AHTx0 buffer" CR));
+      StaticJsonDocument<JSON_MSG_BUFFER> AHTx0dataBuffer;
+      JsonObject AHTx0data = AHTx0dataBuffer.to<JsonObject>();
+      // Generate Temperature in degrees C
+      if (ahtTempC.temperature != persisted_aht_tempc || AHTx0_always) {
+        float ahtTempF = convertTemp_CtoF(ahtTempC.temperature);
+        AHTx0data["tempc"] = (float)ahtTempC.temperature;
+        AHTx0data["tempf"] = (float)ahtTempF;
+      } else {
+        Log.notice(F("Same Temp. Don't send it" CR));
+      }
+
+      // Generate Humidity in percent
+      if (ahtHum.relative_humidity != persisted_aht_hum || AHTx0_always) {
+        AHTx0data["hum"] = (float)ahtHum.relative_humidity;
+      } else {
+        Log.notice(F("Same Humidity. Don't send it" CR));
+      }
+      AHTx0data["origin"] = AHTTOPIC;
+      enqueueJsonObject(AHTx0data);
+    }
+    persisted_aht_tempc = ahtTempC.temperature;
+    persisted_aht_hum = ahtHum.relative_humidity;
+  }
+}
+
+#endif