[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
This commit is contained in:
1 parent
6e77efb11b
commit
585df9a420
83 files changed
+1275
-1293
No files matched your search
@@ -0,0 +1,95 @@
|
||||
/*
|
||||
Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
|
||||
|
||||
Act as a wifi or ethernet gateway between your GridFree SUN-2000G inverter and a MQTT broker.
|
||||
Send inverter metrics by MQTT.
|
||||
|
||||
This gateway enables to:
|
||||
- publish MQTT data, which are received by RS232 ModBus.
|
||||
|
||||
Library for read metrics from GWL Power, GridFree SUN-2000G inverter <https://shop.gwl.eu/GridFree-Inverters/GridFree-AC-Inverter-with-limiter-2kW-SUN-2000G-45-90V.html>.
|
||||
|
||||
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 ZgatewayGFSunInverter
|
||||
|
||||
# include <GfSun2000.h>
|
||||
|
||||
# include "TheengsCommon.h"
|
||||
# include "config_GFSunInverter.h"
|
||||
|
||||
GfSun2000 GF = GfSun2000();
|
||||
|
||||
void GFSunInverterDataHandler(GfSun2000Data data) {
|
||||
StaticJsonDocument<JSON_MSG_BUFFER> jdataBuffer;
|
||||
JsonObject jdata = jdataBuffer.to<JsonObject>();
|
||||
|
||||
jdata["device_id"] = (char*)data.deviceID;
|
||||
Log.trace(F("Device ID : %s\n" CR), data.deviceID);
|
||||
jdata["ac_voltage"] = data.ACVoltage;
|
||||
Log.trace(F("AC Voltage : %.1f\tV\n" CR), data.ACVoltage);
|
||||
jdata["dc_voltage"] = data.DCVoltage;
|
||||
Log.trace(F("DC Voltage : %.1f\tV\n" CR), data.DCVoltage);
|
||||
jdata["power"] = data.averagePower;
|
||||
Log.trace(F("Output Power : %.1f\tW (5min avg)\n" CR), data.averagePower);
|
||||
jdata["c_energy"] = data.customEnergyCounter;
|
||||
Log.trace(F("Custom Energy : %.1f\tkW/h (can be reseted)\n" CR), data.customEnergyCounter);
|
||||
jdata["t_energy"] = data.totalEnergyCounter;
|
||||
Log.trace(F("Total Energy : %.1f\tkW/h\n" CR), data.totalEnergyCounter);
|
||||
|
||||
# ifdef GFSUNINVERTER_DEVEL
|
||||
StaticJsonDocument<JSON_MSG_BUFFER> jregisterBuffer;
|
||||
JsonObject jregister = jregisterBuffer.to<JsonObject>();
|
||||
char buffer[4];
|
||||
std::map<int16_t, int16_t>::iterator itr;
|
||||
for (itr = data.modbusRegistry.begin(); itr != data.modbusRegistry.end(); ++itr) {
|
||||
Log.notice("%d: %d\n", itr->first, itr->second);
|
||||
sprintf(buffer, "%d", itr->first);
|
||||
jregister[buffer] = itr->second;
|
||||
}
|
||||
jdata["register"] = jregister;
|
||||
# endif
|
||||
jdata["origin"] = subjectRFtoMQTT;
|
||||
enqueueJsonObject(jdata);
|
||||
}
|
||||
|
||||
void GFSunInverterErrorHandler(int errorId, char* errorMessage) {
|
||||
char buffer[50];
|
||||
sprintf(buffer, "Error response: %02X - %s\n", errorId, errorMessage);
|
||||
Log.error(buffer);
|
||||
StaticJsonDocument<JSON_MSG_BUFFER> jdataBuffer;
|
||||
JsonObject jdata = jdataBuffer.to<JsonObject>();
|
||||
jdata["status"] = "error";
|
||||
jdata["msg"] = errorMessage;
|
||||
jdata["id"] = errorId;
|
||||
jdata["origin"] = subjectRFtoMQTT;
|
||||
enqueueJsonObject(jdata);
|
||||
}
|
||||
|
||||
void setupGFSunInverter() {
|
||||
GF.setup(Serial2);
|
||||
GF.setDataHandler(GFSunInverterDataHandler);
|
||||
GF.setErrorHandler(GFSunInverterErrorHandler);
|
||||
Log.trace(F("gatewayGFSunInverter setup done " CR));
|
||||
}
|
||||
|
||||
void ZgatewayGFSunInverterMQTT() {
|
||||
GF.readData();
|
||||
delay(GFSUNINVERTER_DELAY);
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in new issue
Block a user