[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:
Ryan Powell authored and GitHub committed
1 parent
6e77efb11b
commit
585df9a420
83 files changed
+1275
-1293
No files matched your search
@@ -0,0 +1,329 @@
|
||||
/*
|
||||
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:
|
||||
- receive MQTT data from a topic and send RF 433Mhz signal corresponding to the received MQTT data based on ESPilight library
|
||||
- publish MQTT data to a different topic related to received 433Mhz signal based on ESPilight library
|
||||
|
||||
Copyright: (c)Florian ROBERT
|
||||
Pilight gateway made by steadramon, improvments with the help of puuu
|
||||
|
||||
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 ZgatewayPilight
|
||||
# include "TheengsCommon.h"
|
||||
|
||||
# if defined(ESP32)
|
||||
# include <SPIFFS.h>
|
||||
# else
|
||||
# include <FS.h>
|
||||
# endif
|
||||
|
||||
# include "config_RF.h"
|
||||
|
||||
# ifdef ZradioCC1101
|
||||
# include <ELECHOUSE_CC1101_SRC_DRV.h>
|
||||
# endif
|
||||
|
||||
# include <ESPiLight.h>
|
||||
ESPiLight rf(RF_EMITTER_GPIO); // use -1 to disable transmitter
|
||||
|
||||
# ifdef Pilight_rawEnabled
|
||||
// raw output support
|
||||
bool pilightRawEnabled = 0;
|
||||
# endif
|
||||
|
||||
void disableCurrentReceiver();
|
||||
void initCC1101();
|
||||
void enableActiveReceiver();
|
||||
|
||||
void pilightCallback(const String& protocol, const String& message, int status,
|
||||
size_t repeats, const String& deviceID) {
|
||||
if (status == VALID) {
|
||||
Log.trace(F("Creating RF PiLight buffer" CR));
|
||||
StaticJsonDocument<JSON_MSG_BUFFER> RFPiLightdataBuffer;
|
||||
JsonObject RFPiLightdata = RFPiLightdataBuffer.to<JsonObject>();
|
||||
StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer2;
|
||||
JsonObject msg = jsonBuffer2.to<JsonObject>();
|
||||
|
||||
if (message.length() > 0) {
|
||||
auto error = deserializeJson(jsonBuffer2, message);
|
||||
if (error) {
|
||||
Log.error(F("deserializeJson() failed: %s" CR), error.c_str());
|
||||
return;
|
||||
}
|
||||
RFPiLightdata["message"] = msg;
|
||||
}
|
||||
|
||||
if (protocol.length() > 0) {
|
||||
RFPiLightdata["protocol"] = protocol;
|
||||
}
|
||||
|
||||
if (deviceID.length() > 0) {
|
||||
// If deviceID is non-empty, use it directly for value
|
||||
RFPiLightdata["value"] = deviceID;
|
||||
} else if (!msg.isNull()) {
|
||||
// deviceID returned from Pilight is only extracted from id field
|
||||
// but some device may use another name as unique identifier
|
||||
char* choices[] = {"key", "unit", "device_id", "systemcode", "unitcode", "programcode"};
|
||||
|
||||
for (uint8_t i = 0; i < 6; i++) {
|
||||
if (msg.containsKey(choices[i])) {
|
||||
// Set value directly from msg; supports both strings and integers
|
||||
RFPiLightdata["value"] = msg[choices[i]];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
RFPiLightdata["repeats"] = (int)repeats;
|
||||
RFPiLightdata["status"] = (int)status;
|
||||
RFPiLightdata["origin"] = subjectPilighttoMQTT;
|
||||
enqueueJsonObject(RFPiLightdata);
|
||||
if (repeatPilightwMQTT) {
|
||||
Log.trace(F("Pub Pilight for rpt" CR));
|
||||
RFPiLightdata["origin"] = subjectMQTTtoPilight;
|
||||
enqueueJsonObject(RFPiLightdata);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# ifdef Pilight_rawEnabled
|
||||
void pilightRawCallback(const uint16_t* pulses, size_t length) {
|
||||
uint16_t pulse;
|
||||
|
||||
if (!pilightRawEnabled) {
|
||||
Log.trace(F("Pilight RAW not enabled" CR));
|
||||
return;
|
||||
}
|
||||
|
||||
StaticJsonDocument<JSON_MSG_BUFFER> RFPiLightdataBuffer;
|
||||
JsonObject RFPiLightdata = RFPiLightdataBuffer.to<JsonObject>();
|
||||
|
||||
RFPiLightdata["format"] = "RAW";
|
||||
RFPiLightdata["rawlen"] = length;
|
||||
RFPiLightdata["pulsesString"] = rf.pulseTrainToString(pulses, length); // c=pulse_array_key;p=pulse_types
|
||||
|
||||
// Enqueue data
|
||||
RFPiLightdata["origin"] = subjectPilighttoMQTT;
|
||||
enqueueJsonObject(RFPiLightdata);
|
||||
}
|
||||
# endif
|
||||
|
||||
void savePilightConfig() {
|
||||
Log.trace(F("saving Pilight config" CR));
|
||||
DynamicJsonDocument json(4096);
|
||||
deserializeJson(json, rf.enabledProtocols());
|
||||
|
||||
File configFile = SPIFFS.open("/pilight.json", "w");
|
||||
if (!configFile) {
|
||||
Log.error(F("failed to open config file for writing" CR));
|
||||
}
|
||||
|
||||
serializeJsonPretty(json, Serial);
|
||||
serializeJson(json, configFile);
|
||||
configFile.close();
|
||||
}
|
||||
|
||||
void loadPilightConfig() {
|
||||
Log.trace(F("reading Pilight config file" CR));
|
||||
File configFile = SPIFFS.open("/pilight.json", "r");
|
||||
if (configFile) {
|
||||
Log.trace(F("opened Pilight config file" CR));
|
||||
DynamicJsonDocument json(configFile.size() * 4);
|
||||
auto error = deserializeJson(json, configFile);
|
||||
if (error) {
|
||||
Log.error(F("deserialize config failed: %s, buffer capacity: %u" CR), error.c_str(), json.capacity());
|
||||
}
|
||||
serializeJson(json, Serial);
|
||||
if (!json.isNull()) {
|
||||
String rflimit;
|
||||
serializeJson(json, rflimit);
|
||||
rf.limitProtocols(rflimit);
|
||||
} else {
|
||||
Log.warning(F("failed to load json config" CR));
|
||||
}
|
||||
configFile.close();
|
||||
}
|
||||
}
|
||||
|
||||
void PilighttoX() {
|
||||
rf.loop();
|
||||
}
|
||||
|
||||
void XtoPilight(const char* topicOri, JsonObject& Pilightdata) {
|
||||
if (cmpToMainTopic(topicOri, subjectMQTTtoPilightProtocol)) {
|
||||
bool success = false;
|
||||
if (Pilightdata.containsKey("reset")) {
|
||||
rf.limitProtocols(rf.availableProtocols());
|
||||
savePilightConfig();
|
||||
success = true;
|
||||
}
|
||||
if (Pilightdata.containsKey("limit")) {
|
||||
String output;
|
||||
serializeJson(Pilightdata["limit"], output);
|
||||
rf.limitProtocols(output);
|
||||
savePilightConfig();
|
||||
success = true;
|
||||
}
|
||||
if (Pilightdata.containsKey("enabled")) {
|
||||
Log.notice(F("PiLight protocols enabled: %s" CR), rf.enabledProtocols().c_str());
|
||||
success = true;
|
||||
}
|
||||
if (Pilightdata.containsKey("available")) {
|
||||
Log.notice(F("PiLight protocols available: %s" CR), rf.availableProtocols().c_str());
|
||||
success = true;
|
||||
}
|
||||
# ifdef Pilight_rawEnabled
|
||||
if (Pilightdata.containsKey("rawEnabled")) {
|
||||
Log.notice(F("Setting PiLight raw output enabled: %T" CR), (bool)Pilightdata["rawEnabled"]);
|
||||
pilightRawEnabled = (bool)Pilightdata["rawEnabled"];
|
||||
if (currentReceiver == ACTIVE_PILIGHT) {
|
||||
disablePilightReceive();
|
||||
delay(1);
|
||||
enablePilightReceive();
|
||||
success = true;
|
||||
}
|
||||
}
|
||||
# endif
|
||||
|
||||
if (success) {
|
||||
// we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
|
||||
Pilightdata["origin"] = subjectGTWPilighttoMQTT;
|
||||
enqueueJsonObject(Pilightdata);
|
||||
} else {
|
||||
pub(subjectGTWPilighttoMQTT, "{\"Status\": \"Error\"}"); // Fail feedback
|
||||
Log.error(F("MQTTtoPilightProtocol Fail json" CR));
|
||||
}
|
||||
} else if (cmpToMainTopic(topicOri, subjectMQTTtoPilight)) {
|
||||
const char* message = Pilightdata["message"];
|
||||
Log.notice(F("MQTTtoPilight message: %s" CR), message);
|
||||
const char* protocol = Pilightdata["protocol"];
|
||||
Log.notice(F("MQTTtoPilight protocol: %s" CR), protocol);
|
||||
const char* raw = Pilightdata["raw"];
|
||||
float txFrequency = Pilightdata["frequency"] | RFConfig.frequency;
|
||||
bool success = false;
|
||||
disableCurrentReceiver();
|
||||
initCC1101();
|
||||
# ifdef ZradioCC1101 // set Receive off and Transmitt on
|
||||
ELECHOUSE_cc1101.SetTx(txFrequency);
|
||||
Log.notice(F("Transmit frequency: %F" CR), txFrequency);
|
||||
# endif
|
||||
pinMode(RF_EMITTER_GPIO, OUTPUT);
|
||||
if (raw) {
|
||||
uint16_t codes[MAXPULSESTREAMLENGTH];
|
||||
int repeats = rf.stringToRepeats(raw);
|
||||
if (repeats < 0) {
|
||||
switch (repeats) {
|
||||
case ESPiLight::ERROR_INVALID_PULSETRAIN_MSG_R:
|
||||
Log.trace(F("'r' not found in string, or has no data" CR));
|
||||
break;
|
||||
case ESPiLight::ERROR_INVALID_PULSETRAIN_MSG_END:
|
||||
Log.trace(F("';' or '@' not found in data string" CR));
|
||||
break;
|
||||
}
|
||||
repeats = 10;
|
||||
}
|
||||
int msgLength = rf.stringToPulseTrain(raw, codes, MAXPULSESTREAMLENGTH);
|
||||
if (msgLength > 0) {
|
||||
rf.sendPulseTrain(codes, msgLength, repeats);
|
||||
Log.notice(F("MQTTtoPilight raw ok" CR));
|
||||
success = true;
|
||||
} else {
|
||||
Log.trace(F("MQTTtoPilight raw KO" CR));
|
||||
switch (msgLength) {
|
||||
case ESPiLight::ERROR_INVALID_PULSETRAIN_MSG_C:
|
||||
Log.trace(F("'c' not found in string, or has no data" CR));
|
||||
break;
|
||||
case ESPiLight::ERROR_INVALID_PULSETRAIN_MSG_P:
|
||||
Log.trace(F("'p' not found in string, or has no data" CR));
|
||||
break;
|
||||
case ESPiLight::ERROR_INVALID_PULSETRAIN_MSG_END:
|
||||
Log.trace(F("';' or '@' not found in data string" CR));
|
||||
break;
|
||||
case ESPiLight::ERROR_INVALID_PULSETRAIN_MSG_TYPE:
|
||||
Log.trace(F("pulse type not defined" CR));
|
||||
break;
|
||||
}
|
||||
Log.error(F("Invalid JSON: raw data malformed" CR));
|
||||
}
|
||||
}
|
||||
if (message && protocol) {
|
||||
Log.trace(F("MQTTtoPilight msg & protocol ok" CR));
|
||||
int msgLength = rf.send(protocol, message);
|
||||
if (msgLength > 0) {
|
||||
Log.trace(F("Adv data XtoPilight push state via PilighttoMQTT" CR));
|
||||
// Acknowledgement
|
||||
pub(subjectGTWPilighttoMQTT, message);
|
||||
success = true;
|
||||
} else {
|
||||
switch (msgLength) {
|
||||
case ESPiLight::ERROR_UNAVAILABLE_PROTOCOL:
|
||||
Log.error(F("protocol is not available" CR));
|
||||
break;
|
||||
case ESPiLight::ERROR_INVALID_PILIGHT_MSG:
|
||||
Log.error(F("message is invalid" CR));
|
||||
break;
|
||||
case ESPiLight::ERROR_INVALID_JSON:
|
||||
Log.error(F("message is not a proper json object" CR));
|
||||
break;
|
||||
case ESPiLight::ERROR_NO_OUTPUT_PIN:
|
||||
Log.error(F("no transmitter pin" CR));
|
||||
break;
|
||||
default:
|
||||
Log.error(F("Invalid JSON: can't read message/protocol" CR));
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!success) {
|
||||
pub(subjectGTWPilighttoMQTT, "{\"Status\": \"Error\"}"); // Fail feedback
|
||||
Log.error(F("MQTTtoPilight Fail json" CR));
|
||||
}
|
||||
enableActiveReceiver();
|
||||
}
|
||||
}
|
||||
|
||||
extern void disablePilightReceive() {
|
||||
Log.trace(F("disablePilightReceive" CR));
|
||||
rf.initReceiver(-1);
|
||||
rf.disableReceiver();
|
||||
};
|
||||
|
||||
extern void enablePilightReceive() {
|
||||
Log.notice(F("Switching to Pilight Receiver: %F" CR), RFConfig.frequency);
|
||||
Log.notice(F("RF_EMITTER_GPIO: %d " CR), RF_EMITTER_GPIO);
|
||||
Log.notice(F("RF_RECEIVER_GPIO: %d " CR), RF_RECEIVER_GPIO);
|
||||
Log.trace(F("gatewayPilight command topic: %s%s%s" CR), mqtt_topic, gateway_name, subjectMQTTtoPilight);
|
||||
|
||||
initCC1101();
|
||||
|
||||
rf.setCallback(pilightCallback);
|
||||
# ifdef Pilight_rawEnabled
|
||||
if (pilightRawEnabled) {
|
||||
rf.setPulseTrainCallBack(pilightRawCallback);
|
||||
}
|
||||
# endif
|
||||
rf.initReceiver(RF_RECEIVER_GPIO);
|
||||
pinMode(RF_EMITTER_GPIO, OUTPUT); // Set this here, because if this is the RX pin it was reset to INPUT by Serial.end();
|
||||
rf.enableReceiver();
|
||||
loadPilightConfig();
|
||||
Log.trace(F("gatewayPilight setup done " CR));
|
||||
};
|
||||
#endif
|
||||
Reference in new issue
Block a user