chriz/OpenMQTT-Gateway
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Makes RF2 sending and receiving work for ESP8266 with added support for group bit and dimming (#113)

Browse Source 
* Made rf2 sending and receiving work

With code from https://github.com/1technophile/OpenMQTTGateway/pull/109
plus some other fixes.

* Added support for group bit

Added support for sending and receiving group bit

* Group bit and MQTT retransmitting

Added support for sending and receiving group bit.
Made the gateway transmit the new state of a RF2 switch to the MQTT state topic when it receives a MQTT command to control that switch.

* Removed hard coded RF2 code length

* Added support for dimming to RF2

Verified to work with Nexa WMR-250 dimmer.

* Minor cleanup
This commit is contained in:
Lars Englund authored and Florian committed 2017-09-21 23:32:02 +02:00
1 parent 0b9bbc3dd6
commit 0d1e7bbe75
4 files changed
+74 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ZgatewayRF2.ino
+62 -8
View File
@@ -59,7 +59,10 @@ void setupRF2(){
#else
NewRemoteReceiver::init(0, 2, rf2Callback);
#endif
Serial.println("Receiver RF2 initialized");
trc(F("Receiver RF2 initialized"));
pinMode(RF_EMITTER_PIN, OUTPUT);
digitalWrite(RF_EMITTER_PIN, LOW);
trc(F("Transmitter RF2 initialized"));
}
boolean RF2toMQTT(){
@@ -80,10 +83,10 @@ boolean RF2toMQTT(){
MQTTgroupBit = String(rf2rd.groupBit);
MQTTswitchType = String(rf2rd.switchType);
String MQTTRF2string;
MQTTRF2string = subjectRF2toMQTT+String("/")+RF2codeKey+MQTTAddress+String("/")+RF2unitKey+MQTTunit+String("/")+RF2periodKey+MQTTperiod;
trc(F("Adv data RF2toMQTT"));
client.publish((char *)MQTTRF2string.c_str(),(char *)MQTTswitchType.c_str());
return true;
MQTTRF2string = subjectRF2toMQTT+String("/")+RF2codeKey+MQTTAddress+String("/")+RF2unitKey+MQTTunit+String("/")+RF2groupKey+MQTTgroupBit+String("/")+RF2periodKey+MQTTperiod;
trc(F("Adv data RF2toMQTT"));
client.publish((char *)MQTTRF2string.c_str(),(char *)MQTTswitchType.c_str());
return true;
}
return false;
}
@@ -110,7 +113,8 @@ void MQTTtoRF2(char * topicOri, char * datacallback) {
long valueCODE = 0;
int valueUNIT = -1;
int valuePERIOD = 0;
int valueBIT = 0;
int valueGROUP = 0;
int valueDIM = -1;
int pos = topic.lastIndexOf(RF2codeKey);
if (pos != -1){
@@ -129,10 +133,24 @@ void MQTTtoRF2(char * topicOri, char * datacallback) {
int pos3 = topic.lastIndexOf(RF2unitKey);
if (pos3 != -1){
pos3 = pos3 + strlen(RF2unitKey);
valueUNIT = (topic.substring(pos3,pos3 + 1)).toInt();
valueUNIT = (topic.substring(pos3, topic.indexOf("/", pos3))).toInt();
trc(F("Unit:"));
trc(String(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(String(valueGROUP));
}
int pos5 = topic.lastIndexOf(RF2dimKey);
if (pos5 != -1) {
pos5 = pos5 + strlen(RF2dimKey);
valueDIM = (topic.substring(pos5, topic.indexOf("/", pos5))).toInt();
trc(F("RF2 Dim:"));
trc(String(valueDIM));
}
if ((topic == subjectMQTTtoRF2) || (valueCODE != 0) || (valueUNIT != -1)|| (valuePERIOD != 0)){
trc(F("MQTTtoRF2"));
@@ -142,12 +160,48 @@ void MQTTtoRF2(char * topicOri, char * datacallback) {
trc(String(valueCODE));
trc(String(valueUNIT));
trc(String(valuePERIOD));
trc(String(valueGROUP));
trc(String(boolSWITCHTYPE));
trc(String(valueDIM));
NewRemoteReceiver::disable();
trc(F("Creating transmitter"));
NewRemoteTransmitter transmitter(valueCODE, RF_EMITTER_PIN, valuePERIOD);
trc(F("Sending data"));
transmitter.sendUnit(valueUNIT, boolSWITCHTYPE);
if (valueGROUP) {
if (valueDIM >= 0) {
transmitter.sendGroupDim(valueDIM);
}
else {
transmitter.sendGroup(boolSWITCHTYPE);
}
}
else {
if (valueDIM >= 0) {
transmitter.sendDim(valueUNIT, valueDIM);
}
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;
MQTTAddress = String(valueCODE);
MQTTperiod = String(valuePERIOD);
MQTTunit = String(valueUNIT);
MQTTgroupBit = String(rf2rd.groupBit);
MQTTswitchType = String(boolSWITCHTYPE);
String MQTTRF2string;
MQTTRF2string = subjectRF2toMQTT+String("/")+RF2codeKey+MQTTAddress+String("/")+RF2unitKey+MQTTunit+String("/")+RF2groupKey+MQTTgroupBit+String("/")+RF2periodKey+MQTTperiod;
trc(F("Adv data MQTTtoRF2 push state via RF2toMQTT"));
client.publish((char *)MQTTRF2string.c_str(),(char *)MQTTswitchType.c_str());
}
}