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

added IR json datastring HEX decoding

Browse Source 
this breaks current datastring usage
This commit is contained in:
Legion2 authored and Florian committed 2019-04-22 20:56:33 +02:00
1 parent 4b8d28179b
commit 8b0e3eb8b4
1 file changed
+39 -23
Download Patch File Download Diff File Expand all files Collapse all files
ZgatewayIR.ino
+39 -23
View File
@@ -245,7 +245,7 @@ void IRtoMQTT(){
} }
if(topicOri && (strstr(topicOri, "IR_NEC") == NULL)){ if(topicOri && (strstr(topicOri, "IR_NEC") == NULL)){
signalSent = sendIdentifiedProtocol(topicOri, data, (unsigned char *)datacallback, valueBITS, valueRPT); signalSent = sendIdentifiedProtocol(topicOri, data, datacallback, valueBITS, valueRPT);
}else{ }else{
trc(F("Using NEC protocol")); trc(F("Using NEC protocol"));
if (valueBITS == 0) valueBITS = NEC_BITS; if (valueBITS == 0) valueBITS = NEC_BITS;
@@ -272,13 +272,15 @@ void IRtoMQTT(){
unsigned long data = IRdata["value"]; unsigned long data = IRdata["value"];
const char * raw = IRdata["raw"]; const char * raw = IRdata["raw"];
const char * datastring = IRdata["datastring"]; const char * datastring = IRdata["datastring"];
if (data != 0||raw) { if (data != 0||raw||datastring) {
trc(F("MQTTtoIR data || raw ok")); trc(F("MQTTtoIR data || raw ok"));
boolean signalSent = false; boolean signalSent = false;
trc(F("value")); trc(F("value"));
trc(data); trc(data);
trc(F("raw")); trc(F("raw"));
trc(raw); trc(raw);
trc(F("datastring"));
trc(datastring);
const char * protocol_name = IRdata["protocol_name"]; const char * protocol_name = IRdata["protocol_name"];
unsigned int valueBITS = IRdata["bits"]; unsigned int valueBITS = IRdata["bits"];
uint16_t valueRPT = IRdata["repeat"]|repeatIRwNumber; uint16_t valueRPT = IRdata["repeat"]|repeatIRwNumber;
@@ -344,7 +346,7 @@ void IRtoMQTT(){
} }
#endif #endif
}else if(protocol_name && (strstr(protocol_name, "IR_NEC") == NULL)){ }else if(protocol_name && (strstr(protocol_name, "IR_NEC") == NULL)){
signalSent = sendIdentifiedProtocol(protocol_name, data, (unsigned char*)datastring, valueBITS, valueRPT); signalSent = sendIdentifiedProtocol(protocol_name, data, datastring, valueBITS, valueRPT);
}else{ }else{
trc(F("Using NEC protocol")); trc(F("Using NEC protocol"));
if (valueBITS == 0) valueBITS = NEC_BITS; if (valueBITS == 0) valueBITS = NEC_BITS;
@@ -367,7 +369,21 @@ void IRtoMQTT(){
} }
#endif #endif
boolean sendIdentifiedProtocol(const char * protocol_name, unsigned long data, unsigned char * datastring, unsigned int valueBITS, uint16_t valueRPT){ boolean sendIdentifiedProtocol(const char * protocol_name, unsigned long data, const char * datastring, unsigned int valueBITS, uint16_t valueRPT){
unsigned char dataarray[valueBITS];
const char* pointer = datastring;
int i = 0;
while (strlen(pointer) > 0 && i < valueBITS) {
if (pointer[0] == ',') {
pointer++;
}
else
{
dataarray[i] = strtol(pointer, (char**)& pointer, 16);
i++;
}
}
#ifdef IR_Whynter #ifdef IR_Whynter
if (strstr(protocol_name, "IR_Whynter") != NULL){ if (strstr(protocol_name, "IR_Whynter") != NULL){
if (valueBITS == 0) valueBITS = WHYNTER_BITS; if (valueBITS == 0) valueBITS = WHYNTER_BITS;
@@ -586,21 +602,21 @@ boolean sendIdentifiedProtocol(const char * protocol_name, unsigned long data, u
#ifdef IR_DAIKIN #ifdef IR_DAIKIN
if (strstr(protocol_name, "IR_DAIKIN") != NULL){ if (strstr(protocol_name, "IR_DAIKIN") != NULL){
if (valueBITS == 0) valueBITS = kDaikinStateLength; if (valueBITS == 0) valueBITS = kDaikinStateLength;
irsend.sendDaikin(datastring, valueBITS, valueRPT); irsend.sendDaikin(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
#ifdef IR_KELVINATOR #ifdef IR_KELVINATOR
if (strstr(protocol_name, "IR_KELVINATOR") != NULL){ if (strstr(protocol_name, "IR_KELVINATOR") != NULL){
if (valueBITS == 0) valueBITS = kKelvinatorStateLength; if (valueBITS == 0) valueBITS = kKelvinatorStateLength;
irsend.sendKelvinator(datastring, valueBITS, valueRPT); irsend.sendKelvinator(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
#ifdef IR_MITSUBISHI_AC #ifdef IR_MITSUBISHI_AC
if (strstr(protocol_name, "IR_MITSUBISHI_AC") != NULL){ if (strstr(protocol_name, "IR_MITSUBISHI_AC") != NULL){
if (valueBITS == 0) valueBITS = kMitsubishiACStateLength; if (valueBITS == 0) valueBITS = kMitsubishiACStateLength;
irsend.sendMitsubishiAC(datastring, valueBITS, valueRPT); irsend.sendMitsubishiAC(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
@@ -621,27 +637,27 @@ boolean sendIdentifiedProtocol(const char * protocol_name, unsigned long data, u
#ifdef IR_ARGO #ifdef IR_ARGO
if (strstr(protocol_name, "IR_ARGO") != NULL){ if (strstr(protocol_name, "IR_ARGO") != NULL){
if (valueBITS == 0) valueBITS = kArgoStateLength; if (valueBITS == 0) valueBITS = kArgoStateLength;
irsend.sendArgo(datastring, valueBITS, valueRPT); irsend.sendArgo(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
#ifdef IR_TROTEC #ifdef IR_TROTEC
if (strstr(protocol_name, "IR_TROTEC") != NULL){ if (strstr(protocol_name, "IR_TROTEC") != NULL){
if (valueBITS == 0) valueBITS = kTrotecStateLength; if (valueBITS == 0) valueBITS = kTrotecStateLength;
irsend.sendTrotec(datastring, valueBITS, valueRPT); irsend.sendTrotec(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
#ifdef IR_TOSHIBA_AC #ifdef IR_TOSHIBA_AC
if (strstr(protocol_name, "IR_TOSHIBA_AC") != NULL){ if (strstr(protocol_name, "IR_TOSHIBA_AC") != NULL){
if (valueBITS == 0) valueBITS = kToshibaACBits; if (valueBITS == 0) valueBITS = kToshibaACBits;
irsend.sendToshibaAC(datastring, valueBITS, valueRPT); irsend.sendToshibaAC(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
#ifdef IR_FUJITSU_AC #ifdef IR_FUJITSU_AC
if (strstr(protocol_name, "IR_FUJITSU_AC") != NULL){ if (strstr(protocol_name, "IR_FUJITSU_AC") != NULL){
irsend.sendFujitsuAC(datastring, valueBITS, valueRPT); irsend.sendFujitsuAC(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
@@ -655,28 +671,28 @@ boolean sendIdentifiedProtocol(const char * protocol_name, unsigned long data, u
#ifdef IR_HAIER_AC #ifdef IR_HAIER_AC
if (strstr(protocol_name, "IR_HAIER_AC") != NULL){ if (strstr(protocol_name, "IR_HAIER_AC") != NULL){
if (valueBITS == 0) valueBITS = kHaierACStateLength; if (valueBITS == 0) valueBITS = kHaierACStateLength;
irsend.sendHaierAC(datastring, valueBITS, valueRPT); irsend.sendHaierAC(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
#ifdef IR_HITACHI_AC #ifdef IR_HITACHI_AC
if (strstr(protocol_name, "IR_HITACHI_AC") != NULL){ if (strstr(protocol_name, "IR_HITACHI_AC") != NULL){
if (valueBITS == 0) valueBITS = kHitachiAc2StateLength; if (valueBITS == 0) valueBITS = kHitachiAc2StateLength;
irsend.sendHitachiAC(datastring, valueBITS, valueRPT); irsend.sendHitachiAC(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
#ifdef IR_HITACHI_AC1 #ifdef IR_HITACHI_AC1
if (strstr(protocol_name, "IR_HITACHI_AC1") != NULL){ if (strstr(protocol_name, "IR_HITACHI_AC1") != NULL){
if (valueBITS == 0) valueBITS = kHitachiAc2StateLength; if (valueBITS == 0) valueBITS = kHitachiAc2StateLength;
irsend.sendHitachiAC1(datastring, valueBITS, valueRPT); irsend.sendHitachiAC1(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
#ifdef IR_HITACHI_AC2 #ifdef IR_HITACHI_AC2
if (strstr(protocol_name, "IR_HITACHI_AC2") != NULL){ if (strstr(protocol_name, "IR_HITACHI_AC2") != NULL){
if (valueBITS == 0) valueBITS = kHitachiAc2StateLength; if (valueBITS == 0) valueBITS = kHitachiAc2StateLength;
irsend.sendHitachiAC2(datastring, valueBITS, valueRPT); irsend.sendHitachiAC2(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
@@ -690,21 +706,21 @@ boolean sendIdentifiedProtocol(const char * protocol_name, unsigned long data, u
#ifdef IR_HAIER_AC_YRW02 #ifdef IR_HAIER_AC_YRW02
if (strstr(protocol_name, "IR_HAIER_AC_YRW02") != NULL){ if (strstr(protocol_name, "IR_HAIER_AC_YRW02") != NULL){
if (valueBITS == 0) valueBITS = kHaierACYRW02StateLength; if (valueBITS == 0) valueBITS = kHaierACYRW02StateLength;
irsend.sendHaierACYRW02(datastring, valueBITS, valueRPT); irsend.sendHaierACYRW02(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
#ifdef IR_WHIRLPOOL_AC #ifdef IR_WHIRLPOOL_AC
if (strstr(protocol_name, "IR_WHIRLPOOL_AC") != NULL){ if (strstr(protocol_name, "IR_WHIRLPOOL_AC") != NULL){
if (valueBITS == 0) valueBITS = kWhirlpoolAcStateLength; if (valueBITS == 0) valueBITS = kWhirlpoolAcStateLength;
irsend.sendWhirlpoolAC(datastring, valueBITS, valueRPT); irsend.sendWhirlpoolAC(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
#ifdef IR_SAMSUNG_AC #ifdef IR_SAMSUNG_AC
if (strstr(protocol_name, "IR_SAMSUNG_AC") != NULL){ if (strstr(protocol_name, "IR_SAMSUNG_AC") != NULL){
if (valueBITS == 0) valueBITS = kSamsungAcStateLength; if (valueBITS == 0) valueBITS = kSamsungAcStateLength;
irsend.sendSamsungAC(datastring, valueBITS, valueRPT); irsend.sendSamsungAC(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
@@ -718,14 +734,14 @@ boolean sendIdentifiedProtocol(const char * protocol_name, unsigned long data, u
#ifdef IR_ELECTRA_AC #ifdef IR_ELECTRA_AC
if (strstr(protocol_name, "IR_ELECTRA_AC") != NULL){ if (strstr(protocol_name, "IR_ELECTRA_AC") != NULL){
if (valueBITS == 0) valueBITS = kElectraAcStateLength; if (valueBITS == 0) valueBITS = kElectraAcStateLength;
irsend.sendElectraAC(datastring, valueBITS, valueRPT); irsend.sendElectraAC(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
#ifdef IR_PANASONIC_AC #ifdef IR_PANASONIC_AC
if (strstr(protocol_name, "IR_PANASONIC_AC") != NULL){ if (strstr(protocol_name, "IR_PANASONIC_AC") != NULL){
if (valueBITS == 0) valueBITS = kPanasonicAcStateLength; if (valueBITS == 0) valueBITS = kPanasonicAcStateLength;
irsend.sendPanasonicAC(datastring, valueBITS, valueRPT); irsend.sendPanasonicAC(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
@@ -745,14 +761,14 @@ boolean sendIdentifiedProtocol(const char * protocol_name, unsigned long data, u
#endif #endif
#ifdef IR_MWM #ifdef IR_MWM
if (strstr(protocol_name, "IR_MWM") != NULL){ if (strstr(protocol_name, "IR_MWM") != NULL){
irsend.sendMWM(datastring, valueBITS, valueRPT); irsend.sendMWM(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
#ifdef IR_DAIKIN2 #ifdef IR_DAIKIN2
if (strstr(protocol_name, "IR_DAIKIN2") != NULL){ if (strstr(protocol_name, "IR_DAIKIN2") != NULL){
if (valueBITS == 0) valueBITS = kDaikin2StateLength; if (valueBITS == 0) valueBITS = kDaikin2StateLength;
irsend.sendDaikin2(datastring, valueBITS, valueRPT); irsend.sendDaikin2(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif
@@ -773,7 +789,7 @@ boolean sendIdentifiedProtocol(const char * protocol_name, unsigned long data, u
#ifdef IR_TCL112AC #ifdef IR_TCL112AC
if (strstr(protocol_name, "IR_TCL112AC") != NULL){ if (strstr(protocol_name, "IR_TCL112AC") != NULL){
if (valueBITS == 0) valueBITS = kTcl112AcStateLength; if (valueBITS == 0) valueBITS = kTcl112AcStateLength;
irsend.sendTcl112Ac(datastring, valueBITS, valueRPT); irsend.sendTcl112Ac(dataarray, valueBITS, valueRPT);
return true; return true;
} }
#endif #endif