[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,125 @@
|
||||
/*
|
||||
OpenMQTTGateway Addon - ESP8266, ESP32 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
|
||||
|
||||
RN8209 reading Addon
|
||||
|
||||
Contributors:
|
||||
- 1technophile
|
||||
|
||||
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 ZsensorRN8209
|
||||
# include <TheengsUtils.h>
|
||||
# include <driver/uart.h>
|
||||
# include <rn8209_flash.h>
|
||||
# include <rn8209c_user.h>
|
||||
|
||||
# include "TheengsCommon.h"
|
||||
# include "config_RN8209.h"
|
||||
|
||||
extern "C" bool init_8209c_interface();
|
||||
extern void overLimitCurrent(float RN8209current);
|
||||
|
||||
extern bool ProcessLock;
|
||||
|
||||
float voltage = 0;
|
||||
float current = 0;
|
||||
float power = 0;
|
||||
|
||||
TaskHandle_t rn8209TaskHandle = nullptr;
|
||||
|
||||
unsigned long PublishingTimerRN8209 = 0;
|
||||
|
||||
void rn8209_loop(void* mode) {
|
||||
while (1) {
|
||||
uint32_t temp_voltage = 0;
|
||||
uint8_t retv = rn8209c_read_voltage(&temp_voltage);
|
||||
uint8_t ret = rn8209c_read_emu_status();
|
||||
uint8_t retc = 1;
|
||||
uint8_t retp = 1;
|
||||
static float previousCurrent = 0;
|
||||
static float previousVoltage = 0;
|
||||
if (ret) {
|
||||
uint32_t temp_current = 0;
|
||||
retc = rn8209c_read_current(phase_A, &temp_current);
|
||||
if (ret == 1) {
|
||||
current = temp_current;
|
||||
} else {
|
||||
current = (int32_t)temp_current * (-1);
|
||||
}
|
||||
if (retc == 0) {
|
||||
current = current / 10000.0;
|
||||
overLimitCurrent(current);
|
||||
}
|
||||
if (retv == 0) {
|
||||
voltage = (float)temp_voltage / 1000.0;
|
||||
}
|
||||
}
|
||||
unsigned long now = millis();
|
||||
if ((now > (PublishingTimerRN8209 + TimeBetweenPublishingRN8209) ||
|
||||
!PublishingTimerRN8209 ||
|
||||
(abs(current - previousCurrent) > MinCurrentThreshold) || (abs(voltage - previousVoltage) > MinVoltageThreshold)) &&
|
||||
!ProcessLock) {
|
||||
StaticJsonDocument<JSON_MSG_BUFFER> RN8209dataBuffer;
|
||||
JsonObject RN8209data = RN8209dataBuffer.to<JsonObject>();
|
||||
if (retc == 0) {
|
||||
previousCurrent = current;
|
||||
RN8209data["current"] = TheengsUtils::round2(current);
|
||||
}
|
||||
uint32_t temp_power = 0;
|
||||
retp = rn8209c_read_power(phase_A, &temp_power);
|
||||
if (retv == 0) {
|
||||
previousVoltage = voltage;
|
||||
RN8209data["volt"] = TheengsUtils::round2(voltage);
|
||||
}
|
||||
if (ret == 1) {
|
||||
power = temp_power;
|
||||
} else {
|
||||
power = (int32_t)temp_power * (-1);
|
||||
}
|
||||
if (retp == 0) {
|
||||
power = power / 10000.0;
|
||||
RN8209data["power"] = TheengsUtils::round2(power);
|
||||
}
|
||||
PublishingTimerRN8209 = now;
|
||||
if (RN8209data) {
|
||||
RN8209data["origin"] = subjectRN8209toMQTT;
|
||||
enqueueJsonObject(RN8209data, QueueSemaphoreTimeOutTask);
|
||||
}
|
||||
}
|
||||
//esp_task_wdt_reset();
|
||||
delay(TimeBetweenReadingRN8209);
|
||||
}
|
||||
}
|
||||
|
||||
void setupRN8209() {
|
||||
STU_8209C cal = {0};
|
||||
cal.Ku = RN8209_KU;
|
||||
cal.Kia = RN8209_KIA;
|
||||
cal.EC = RN8209_EC;
|
||||
set_user_param(cal);
|
||||
init_8209c_interface();
|
||||
xTaskCreate(rn8209_loop, "rn8209_loop", RN8209_TASK_STACK_SIZE_OVERRIDE, NULL, 10, &rn8209TaskHandle);
|
||||
//esp_task_wdt_add(rn8209TaskHandle);
|
||||
Log.trace(F("sensorRN8209 setup done " CR));
|
||||
}
|
||||
|
||||
#endif // ZsensorRN8209
|
||||
Reference in new issue
Block a user