[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,145 @@
+/*
+  OpenMQTTGateway  - ESP8266 or Arduino program for home automation
+
+   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 gateway enables to:
+  - publish MQTT data, which are received from RF433Mhz signal (based on WeatherStationDataRx)
+
+    Library for read weather data from Venus W174/W132, Auriol H13726, Hama EWS 1500, Meteoscan W155/W160
+
+    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 ZgatewayWeatherStation
+#  include <WeatherStationDataRx.h>
+
+#  include "TheengsCommon.h"
+#  include "config_WeatherStation.h"
+
+WeatherStationDataRx wsdr(RF_WS_RECEIVER_GPIO, true);
+
+void PairedDeviceAdded(byte newID) {
+  Serial.printf("gatewayWeatherStation: New device paired %d\r\n", newID);
+  StaticJsonDocument<JSON_MSG_BUFFER> RFdataBuffer;
+  JsonObject RFdata = RFdataBuffer.to<JsonObject>();
+  RFdata["sensor"] = newID;
+  RFdata["action"] = "paired";
+  RFdata["origin"] = subjectRFtoMQTT;
+  enqueueJsonObject(RFdata);
+  wsdr.pair(NULL, PairedDeviceAdded);
+}
+
+void setupWeatherStation() {
+  Log.notice(F("RF_WS_RECEIVER_GPIO %d" CR), RF_WS_RECEIVER_GPIO);
+  wsdr.begin();
+  wsdr.pair(NULL, PairedDeviceAdded);
+  Log.trace(F("gatewayWeatherStation setup done " CR));
+}
+
+void sendWindSpeedData(byte id, float wind_speed, byte battery_status) {
+  unsigned long MQTTvalue = 10000 + round(wind_speed);
+  if (!isAduplicateSignal(MQTTvalue)) { // conditions to avoid duplications of RF -->MQTT
+    StaticJsonDocument<JSON_MSG_BUFFER> RFdataBuffer;
+    JsonObject RFdata = RFdataBuffer.to<JsonObject>();
+    RFdata["sensor"] = id;
+    RFdata["wind_speed"] = wind_speed;
+    RFdata["battery"] = bitRead(battery_status, 0) == 0 ? "OK" : "Low";
+    RFdata["origin"] = subjectRFtoMQTT;
+    enqueueJsonObject(RFdata);
+    Log.trace(F("Store wind speed val: %lu" CR), MQTTvalue);
+    storeSignalValue(MQTTvalue);
+  }
+}
+
+void sendRainData(byte id, float rain_volume, byte battery_status) {
+  unsigned long MQTTvalue = 11000 + round(rain_volume * 10.0);
+  if (!isAduplicateSignal(MQTTvalue)) { // conditions to avoid duplications of RF -->MQTT
+    StaticJsonDocument<JSON_MSG_BUFFER> RFdataBuffer;
+    JsonObject RFdata = RFdataBuffer.to<JsonObject>();
+    RFdata["sensor"] = id;
+    RFdata["rain_volume"] = rain_volume;
+    RFdata["battery"] = bitRead(battery_status, 1) == 0 ? "OK" : "Low";
+    RFdata["origin"] = subjectRFtoMQTT;
+    enqueueJsonObject(RFdata);
+    Log.trace(F("Store rain_volume: %lu" CR), MQTTvalue);
+    storeSignalValue(MQTTvalue);
+  }
+}
+
+void sendWindData(byte id, int wind_direction, float wind_gust, byte battery_status) {
+  unsigned long MQTTvalue = 20000 + round(wind_gust * 10.0) + wind_direction;
+  if (!isAduplicateSignal(MQTTvalue)) { // conditions to avoid duplications of RF -->MQTT
+    StaticJsonDocument<JSON_MSG_BUFFER> RFdataBuffer;
+    JsonObject RFdata = RFdataBuffer.to<JsonObject>();
+    RFdata["sensor"] = id;
+    RFdata["wind_direction"] = wind_direction;
+    RFdata["wind_gust"] = wind_gust;
+    RFdata["battery"] = bitRead(battery_status, 0) == 0 ? "OK" : "Low";
+    RFdata["origin"] = subjectRFtoMQTT;
+    enqueueJsonObject(RFdata);
+    Log.trace(F("Store wind data val: %lu" CR), MQTTvalue);
+    storeSignalValue(MQTTvalue);
+  }
+}
+
+void sendTemperatureData(byte id, float temperature, int humidity, byte battery_status) {
+  unsigned long MQTTvalue = 40000 + abs(round(temperature * 100.0)) + humidity;
+  if (!isAduplicateSignal(MQTTvalue)) { // conditions to avoid duplications of RF -->MQTT
+    StaticJsonDocument<JSON_MSG_BUFFER> RFdataBuffer;
+    JsonObject RFdata = RFdataBuffer.to<JsonObject>();
+    RFdata["sensor"] = id;
+    RFdata["tempc"] = temperature;
+    RFdata["tempf"] = wsdr.convertCtoF(temperature);
+    RFdata["humidity"] = humidity;
+    RFdata["battery"] = bitRead(battery_status, 0) == 0 ? "OK" : "Low";
+    RFdata["origin"] = subjectRFtoMQTT;
+    enqueueJsonObject(RFdata);
+    Log.trace(F("Store temp val: %lu" CR), MQTTvalue);
+    storeSignalValue(MQTTvalue);
+  }
+}
+
+void ZgatewayWeatherStationtoX() {
+  char newData = wsdr.readData();
+  switch (newData) {
+    case 'T':
+      Log.trace(F("Temperature" CR));
+      sendTemperatureData(wsdr.sensorID(), wsdr.readTemperature(), wsdr.readHumidity(), wsdr.batteryStatus());
+      break;
+
+    case 'S':
+      Log.trace(F("Wind speed" CR));
+      sendWindSpeedData(wsdr.sensorID(), wsdr.readWindSpeed(), wsdr.batteryStatus());
+      break;
+
+    case 'G':
+      Log.trace(F("Wind direction" CR));
+      sendWindData(wsdr.sensorID(), wsdr.readWindDirection(), wsdr.readWindGust(), wsdr.batteryStatus());
+      break;
+
+    case 'R':
+      Log.trace(F("Rain volume" CR));
+      sendRainData(wsdr.sensorID(), wsdr.readRainVolume(), wsdr.batteryStatus());
+      break;
+
+    default:
+      break;
+  }
+}
+
+#endif