Apply VSC auto format to the code and indent macros for readability
This commit is contained in:
1technophile committed
1 parent
f7ec81ffaa
commit
7f9d8d18da
26 files changed
+4512
-3692
No files matched your search
+215
-179
@@ -52,220 +52,256 @@ struct RF2rxd
|
||||
|
||||
RF2rxd rf2rd;
|
||||
|
||||
void setupRF2(){
|
||||
#ifndef ZgatewayRF //receiving with RF2 is not compatible with ZgatewayRF
|
||||
NewRemoteReceiver::init(RF_RECEIVER_PIN, 2, rf2Callback);
|
||||
trc(F("RF_EMITTER_PIN "));
|
||||
trc(RF_EMITTER_PIN);
|
||||
trc(F("RF_RECEIVER_PIN "));
|
||||
trc(RF_RECEIVER_PIN);
|
||||
trc(F("ZgatewayRF2 setup done "));
|
||||
#endif
|
||||
pinMode(RF_EMITTER_PIN, OUTPUT);
|
||||
digitalWrite(RF_EMITTER_PIN, LOW);
|
||||
void setupRF2()
|
||||
{
|
||||
#ifndef ZgatewayRF //receiving with RF2 is not compatible with ZgatewayRF
|
||||
NewRemoteReceiver::init(RF_RECEIVER_PIN, 2, rf2Callback);
|
||||
trc(F("RF_EMITTER_PIN "));
|
||||
trc(RF_EMITTER_PIN);
|
||||
trc(F("RF_RECEIVER_PIN "));
|
||||
trc(RF_RECEIVER_PIN);
|
||||
trc(F("ZgatewayRF2 setup done "));
|
||||
#endif
|
||||
pinMode(RF_EMITTER_PIN, OUTPUT);
|
||||
digitalWrite(RF_EMITTER_PIN, LOW);
|
||||
}
|
||||
|
||||
void RF2toMQTT(){
|
||||
void RF2toMQTT()
|
||||
{
|
||||
|
||||
if(rf2rd.hasNewData){
|
||||
if (rf2rd.hasNewData)
|
||||
{
|
||||
trc(F("Creating RF2 buffer"));
|
||||
const int JSON_MSG_CALC_BUFFER = JSON_OBJECT_SIZE(5);
|
||||
StaticJsonBuffer<JSON_MSG_CALC_BUFFER> jsonBuffer;
|
||||
JsonObject& RF2data = jsonBuffer.createObject();
|
||||
|
||||
JsonObject &RF2data = jsonBuffer.createObject();
|
||||
|
||||
rf2rd.hasNewData = false;
|
||||
|
||||
|
||||
trc(F("Rcv. RF2"));
|
||||
RF2data.set("unit", (int)rf2rd.unit);
|
||||
RF2data.set("groupBit", (int)rf2rd.groupBit);
|
||||
RF2data.set("period", (int)rf2rd.period);
|
||||
RF2data.set("address", (unsigned long)rf2rd.address);
|
||||
RF2data.set("switchType", (int)rf2rd.switchType);
|
||||
|
||||
|
||||
trc(F("Adv data RF2toMQTT"));
|
||||
pub(subjectRF2toMQTT,RF2data);
|
||||
pub(subjectRF2toMQTT, RF2data);
|
||||
}
|
||||
}
|
||||
|
||||
void rf2Callback(unsigned int period, unsigned long address, unsigned long groupBit, unsigned long unit, unsigned long switchType) {
|
||||
|
||||
rf2rd.period=period;
|
||||
rf2rd.address=address;
|
||||
rf2rd.groupBit=groupBit;
|
||||
rf2rd.unit=unit;
|
||||
rf2rd.switchType=switchType;
|
||||
rf2rd.hasNewData=true;
|
||||
void rf2Callback(unsigned int period, unsigned long address, unsigned long groupBit, unsigned long unit, unsigned long switchType)
|
||||
{
|
||||
|
||||
rf2rd.period = period;
|
||||
rf2rd.address = address;
|
||||
rf2rd.groupBit = groupBit;
|
||||
rf2rd.unit = unit;
|
||||
rf2rd.switchType = switchType;
|
||||
rf2rd.hasNewData = true;
|
||||
}
|
||||
|
||||
#ifdef simpleReceiving
|
||||
void MQTTtoRF2(char * topicOri, char * datacallback) {
|
||||
|
||||
// RF DATA ANALYSIS
|
||||
//We look into the subject to see if a special RF protocol is defined
|
||||
String topic = topicOri;
|
||||
bool boolSWITCHTYPE;
|
||||
boolSWITCHTYPE = to_bool(datacallback);
|
||||
bool isDimCommand = false;
|
||||
|
||||
long valueCODE = 0;
|
||||
int valueUNIT = -1;
|
||||
int valuePERIOD = 0;
|
||||
int valueGROUP = 0;
|
||||
int valueDIM = -1;
|
||||
|
||||
int pos = topic.lastIndexOf(RF2codeKey);
|
||||
if (pos != -1){
|
||||
pos = pos + +strlen(RF2codeKey);
|
||||
valueCODE = (topic.substring(pos,pos + 8)).toInt();
|
||||
trc(F("RF2 code:"));
|
||||
trc(valueCODE);
|
||||
}
|
||||
int pos2 = topic.lastIndexOf(RF2periodKey);
|
||||
if (pos2 != -1) {
|
||||
pos2 = pos2 + strlen(RF2periodKey);
|
||||
valuePERIOD = (topic.substring(pos2,pos2 + 3)).toInt();
|
||||
trc(F("RF2 Period:"));
|
||||
trc(valuePERIOD);
|
||||
}
|
||||
int pos3 = topic.lastIndexOf(RF2unitKey);
|
||||
if (pos3 != -1){
|
||||
pos3 = pos3 + strlen(RF2unitKey);
|
||||
valueUNIT = (topic.substring(pos3, topic.indexOf("/", pos3))).toInt();
|
||||
trc(F("Unit:"));
|
||||
trc(valueUNIT);
|
||||
}
|
||||
int pos4 = topic.lastIndexOf(RF2groupKey);
|
||||
if (pos4 != -1) {
|
||||
pos4 = pos4 + strlen(RF2groupKey);
|
||||
valueGROUP = (topic.substring(pos4,pos4 + 1)).toInt();
|
||||
trc(F("RF2 Group:"));
|
||||
trc(valueGROUP);
|
||||
}
|
||||
int pos5 = topic.lastIndexOf(RF2dimKey);
|
||||
if (pos5 != -1) {
|
||||
isDimCommand = true;
|
||||
valueDIM = atoi(datacallback);
|
||||
trc(F("RF2 Dim:"));
|
||||
trc(valueDIM);
|
||||
}
|
||||
|
||||
if ((topic == subjectMQTTtoRF2) || (valueCODE != 0) || (valueUNIT != -1)|| (valuePERIOD != 0)){
|
||||
trc(F("MQTTtoRF2"));
|
||||
if (valueCODE == 0) valueCODE = 8233378;
|
||||
if (valueUNIT == -1) valueUNIT = 0;
|
||||
if (valuePERIOD == 0) valuePERIOD = 272;
|
||||
trc(valueCODE);
|
||||
trc(valueUNIT);
|
||||
trc(valuePERIOD);
|
||||
trc(valueGROUP);
|
||||
trc(boolSWITCHTYPE);
|
||||
trc(valueDIM);
|
||||
NewRemoteReceiver::disable();
|
||||
trc(F("Creating transmitter"));
|
||||
NewRemoteTransmitter transmitter(valueCODE, RF_EMITTER_PIN, valuePERIOD);
|
||||
trc(F("Sending data"));
|
||||
if (valueGROUP) {
|
||||
if (isDimCommand) {
|
||||
transmitter.sendGroupDim(valueDIM);
|
||||
}
|
||||
else {
|
||||
transmitter.sendGroup(boolSWITCHTYPE);
|
||||
}
|
||||
void MQTTtoRF2(char *topicOri, char *datacallback)
|
||||
{
|
||||
|
||||
// RF DATA ANALYSIS
|
||||
//We look into the subject to see if a special RF protocol is defined
|
||||
String topic = topicOri;
|
||||
bool boolSWITCHTYPE;
|
||||
boolSWITCHTYPE = to_bool(datacallback);
|
||||
bool isDimCommand = false;
|
||||
|
||||
long valueCODE = 0;
|
||||
int valueUNIT = -1;
|
||||
int valuePERIOD = 0;
|
||||
int valueGROUP = 0;
|
||||
int valueDIM = -1;
|
||||
|
||||
int pos = topic.lastIndexOf(RF2codeKey);
|
||||
if (pos != -1)
|
||||
{
|
||||
pos = pos + +strlen(RF2codeKey);
|
||||
valueCODE = (topic.substring(pos, pos + 8)).toInt();
|
||||
trc(F("RF2 code:"));
|
||||
trc(valueCODE);
|
||||
}
|
||||
int pos2 = topic.lastIndexOf(RF2periodKey);
|
||||
if (pos2 != -1)
|
||||
{
|
||||
pos2 = pos2 + strlen(RF2periodKey);
|
||||
valuePERIOD = (topic.substring(pos2, pos2 + 3)).toInt();
|
||||
trc(F("RF2 Period:"));
|
||||
trc(valuePERIOD);
|
||||
}
|
||||
int pos3 = topic.lastIndexOf(RF2unitKey);
|
||||
if (pos3 != -1)
|
||||
{
|
||||
pos3 = pos3 + strlen(RF2unitKey);
|
||||
valueUNIT = (topic.substring(pos3, topic.indexOf("/", pos3))).toInt();
|
||||
trc(F("Unit:"));
|
||||
trc(valueUNIT);
|
||||
}
|
||||
int pos4 = topic.lastIndexOf(RF2groupKey);
|
||||
if (pos4 != -1)
|
||||
{
|
||||
pos4 = pos4 + strlen(RF2groupKey);
|
||||
valueGROUP = (topic.substring(pos4, pos4 + 1)).toInt();
|
||||
trc(F("RF2 Group:"));
|
||||
trc(valueGROUP);
|
||||
}
|
||||
int pos5 = topic.lastIndexOf(RF2dimKey);
|
||||
if (pos5 != -1)
|
||||
{
|
||||
isDimCommand = true;
|
||||
valueDIM = atoi(datacallback);
|
||||
trc(F("RF2 Dim:"));
|
||||
trc(valueDIM);
|
||||
}
|
||||
|
||||
if ((topic == subjectMQTTtoRF2) || (valueCODE != 0) || (valueUNIT != -1) || (valuePERIOD != 0))
|
||||
{
|
||||
trc(F("MQTTtoRF2"));
|
||||
if (valueCODE == 0)
|
||||
valueCODE = 8233378;
|
||||
if (valueUNIT == -1)
|
||||
valueUNIT = 0;
|
||||
if (valuePERIOD == 0)
|
||||
valuePERIOD = 272;
|
||||
trc(valueCODE);
|
||||
trc(valueUNIT);
|
||||
trc(valuePERIOD);
|
||||
trc(valueGROUP);
|
||||
trc(boolSWITCHTYPE);
|
||||
trc(valueDIM);
|
||||
NewRemoteReceiver::disable();
|
||||
trc(F("Creating transmitter"));
|
||||
NewRemoteTransmitter transmitter(valueCODE, RF_EMITTER_PIN, valuePERIOD);
|
||||
trc(F("Sending data"));
|
||||
if (valueGROUP)
|
||||
{
|
||||
if (isDimCommand)
|
||||
{
|
||||
transmitter.sendGroupDim(valueDIM);
|
||||
}
|
||||
else {
|
||||
if (isDimCommand) {
|
||||
transmitter.sendDim(valueUNIT, valueDIM);
|
||||
}
|
||||
else {
|
||||
transmitter.sendUnit(valueUNIT, boolSWITCHTYPE);
|
||||
}
|
||||
else
|
||||
{
|
||||
transmitter.sendGroup(boolSWITCHTYPE);
|
||||
}
|
||||
trc(F("Data sent"));
|
||||
NewRemoteReceiver::enable();
|
||||
|
||||
// Publish state change back to MQTT
|
||||
String MQTTAddress;
|
||||
String MQTTperiod;
|
||||
String MQTTunit;
|
||||
String MQTTgroupBit;
|
||||
String MQTTswitchType;
|
||||
String MQTTdimLevel;
|
||||
|
||||
MQTTAddress = String(valueCODE);
|
||||
MQTTperiod = String(valuePERIOD);
|
||||
MQTTunit = String(valueUNIT);
|
||||
MQTTgroupBit = String(rf2rd.groupBit);
|
||||
MQTTswitchType = String(boolSWITCHTYPE);
|
||||
MQTTdimLevel = String(valueDIM);
|
||||
String MQTTRF2string;
|
||||
trc(F("Adv data MQTTtoRF2 push state via RF2toMQTT"));
|
||||
if (isDimCommand) {
|
||||
MQTTRF2string = subjectRF2toMQTT+String("/")+RF2codeKey+MQTTAddress+String("/")+RF2unitKey+MQTTunit+String("/")+RF2groupKey+MQTTgroupBit+String("/")+RF2dimKey+String("/")+RF2periodKey+MQTTperiod;
|
||||
pub((char *)MQTTRF2string.c_str(),(char *)MQTTdimLevel.c_str());
|
||||
}
|
||||
else
|
||||
{
|
||||
if (isDimCommand)
|
||||
{
|
||||
transmitter.sendDim(valueUNIT, valueDIM);
|
||||
}
|
||||
else {
|
||||
MQTTRF2string = subjectRF2toMQTT+String("/")+RF2codeKey+MQTTAddress+String("/")+RF2unitKey+MQTTunit+String("/")+RF2groupKey+MQTTgroupBit+String("/")+RF2periodKey+MQTTperiod;
|
||||
pub((char *)MQTTRF2string.c_str(),(char *)MQTTswitchType.c_str());
|
||||
else
|
||||
{
|
||||
transmitter.sendUnit(valueUNIT, boolSWITCHTYPE);
|
||||
}
|
||||
}
|
||||
trc(F("Data sent"));
|
||||
NewRemoteReceiver::enable();
|
||||
|
||||
// Publish state change back to MQTT
|
||||
String MQTTAddress;
|
||||
String MQTTperiod;
|
||||
String MQTTunit;
|
||||
String MQTTgroupBit;
|
||||
String MQTTswitchType;
|
||||
String MQTTdimLevel;
|
||||
|
||||
MQTTAddress = String(valueCODE);
|
||||
MQTTperiod = String(valuePERIOD);
|
||||
MQTTunit = String(valueUNIT);
|
||||
MQTTgroupBit = String(rf2rd.groupBit);
|
||||
MQTTswitchType = String(boolSWITCHTYPE);
|
||||
MQTTdimLevel = String(valueDIM);
|
||||
String MQTTRF2string;
|
||||
trc(F("Adv data MQTTtoRF2 push state via RF2toMQTT"));
|
||||
if (isDimCommand)
|
||||
{
|
||||
MQTTRF2string = subjectRF2toMQTT + String("/") + RF2codeKey + MQTTAddress + String("/") + RF2unitKey + MQTTunit + String("/") + RF2groupKey + MQTTgroupBit + String("/") + RF2dimKey + String("/") + RF2periodKey + MQTTperiod;
|
||||
pub((char *)MQTTRF2string.c_str(), (char *)MQTTdimLevel.c_str());
|
||||
}
|
||||
else
|
||||
{
|
||||
MQTTRF2string = subjectRF2toMQTT + String("/") + RF2codeKey + MQTTAddress + String("/") + RF2unitKey + MQTTunit + String("/") + RF2groupKey + MQTTgroupBit + String("/") + RF2periodKey + MQTTperiod;
|
||||
pub((char *)MQTTRF2string.c_str(), (char *)MQTTswitchType.c_str());
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef jsonReceiving
|
||||
void MQTTtoRF2(char * topicOri, JsonObject& RF2data) { // json object decoding
|
||||
|
||||
if (cmpToMainTopic(topicOri,subjectMQTTtoRF2)){
|
||||
trc(F("MQTTtoRF2 json"));
|
||||
int boolSWITCHTYPE = RF2data["switchType"] | 99;
|
||||
if (boolSWITCHTYPE != 99) {
|
||||
trc(F("MQTTtoRF2 switch type ok"));
|
||||
bool isDimCommand = boolSWITCHTYPE == 2;
|
||||
unsigned long valueCODE = RF2data["address"];
|
||||
int valueUNIT = RF2data["unit"] | -1;
|
||||
int valuePERIOD = RF2data["period"];
|
||||
int valueGROUP = RF2data["group"];
|
||||
int valueDIM = RF2data["dim"] | -1;
|
||||
if ((valueCODE != 0) || (valueUNIT != -1)|| (valuePERIOD != 0)){
|
||||
trc(F("MQTTtoRF2"));
|
||||
if (valueCODE == 0) valueCODE = 8233378;
|
||||
if (valueUNIT == -1) valueUNIT = 0;
|
||||
if (valuePERIOD == 0) valuePERIOD = 272;
|
||||
trc(valueCODE);
|
||||
trc(valueUNIT);
|
||||
trc(valuePERIOD);
|
||||
trc(valueGROUP);
|
||||
trc(boolSWITCHTYPE);
|
||||
trc(valueDIM);
|
||||
NewRemoteReceiver::disable();
|
||||
NewRemoteTransmitter transmitter(valueCODE, RF_EMITTER_PIN, valuePERIOD);
|
||||
trc(F("Sending"));
|
||||
if (valueGROUP) {
|
||||
if (isDimCommand) {
|
||||
transmitter.sendGroupDim(valueDIM);
|
||||
}
|
||||
else {
|
||||
transmitter.sendGroup(boolSWITCHTYPE);
|
||||
}
|
||||
void MQTTtoRF2(char *topicOri, JsonObject &RF2data)
|
||||
{ // json object decoding
|
||||
|
||||
if (cmpToMainTopic(topicOri, subjectMQTTtoRF2))
|
||||
{
|
||||
trc(F("MQTTtoRF2 json"));
|
||||
int boolSWITCHTYPE = RF2data["switchType"] | 99;
|
||||
if (boolSWITCHTYPE != 99)
|
||||
{
|
||||
trc(F("MQTTtoRF2 switch type ok"));
|
||||
bool isDimCommand = boolSWITCHTYPE == 2;
|
||||
unsigned long valueCODE = RF2data["address"];
|
||||
int valueUNIT = RF2data["unit"] | -1;
|
||||
int valuePERIOD = RF2data["period"];
|
||||
int valueGROUP = RF2data["group"];
|
||||
int valueDIM = RF2data["dim"] | -1;
|
||||
if ((valueCODE != 0) || (valueUNIT != -1) || (valuePERIOD != 0))
|
||||
{
|
||||
trc(F("MQTTtoRF2"));
|
||||
if (valueCODE == 0)
|
||||
valueCODE = 8233378;
|
||||
if (valueUNIT == -1)
|
||||
valueUNIT = 0;
|
||||
if (valuePERIOD == 0)
|
||||
valuePERIOD = 272;
|
||||
trc(valueCODE);
|
||||
trc(valueUNIT);
|
||||
trc(valuePERIOD);
|
||||
trc(valueGROUP);
|
||||
trc(boolSWITCHTYPE);
|
||||
trc(valueDIM);
|
||||
NewRemoteReceiver::disable();
|
||||
NewRemoteTransmitter transmitter(valueCODE, RF_EMITTER_PIN, valuePERIOD);
|
||||
trc(F("Sending"));
|
||||
if (valueGROUP)
|
||||
{
|
||||
if (isDimCommand)
|
||||
{
|
||||
transmitter.sendGroupDim(valueDIM);
|
||||
}
|
||||
else {
|
||||
if (isDimCommand) {
|
||||
transmitter.sendDim(valueUNIT, valueDIM);
|
||||
}
|
||||
else {
|
||||
transmitter.sendUnit(valueUNIT, boolSWITCHTYPE);
|
||||
}
|
||||
else
|
||||
{
|
||||
transmitter.sendGroup(boolSWITCHTYPE);
|
||||
}
|
||||
trc(F("MQTTtoRF2 OK"));
|
||||
NewRemoteReceiver::enable();
|
||||
|
||||
// Publish state change back to MQTT
|
||||
pub(subjectGTWRF2toMQTT,RF2data);
|
||||
}
|
||||
}else{
|
||||
trc(F("MQTTtoRF2 failed json read"));
|
||||
else
|
||||
{
|
||||
if (isDimCommand)
|
||||
{
|
||||
transmitter.sendDim(valueUNIT, valueDIM);
|
||||
}
|
||||
else
|
||||
{
|
||||
transmitter.sendUnit(valueUNIT, boolSWITCHTYPE);
|
||||
}
|
||||
}
|
||||
trc(F("MQTTtoRF2 OK"));
|
||||
NewRemoteReceiver::enable();
|
||||
|
||||
// Publish state change back to MQTT
|
||||
pub(subjectGTWRF2toMQTT, RF2data);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
trc(F("MQTTtoRF2 failed json read"));
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
Reference in new issue
Block a user