From 09eab93593ded092f4d4c3eb3ed35586b11e9da7 Mon Sep 17 00:00:00 2001 From: Northern Man Date: Tue, 26 Jan 2021 17:29:37 -0500 Subject: [PATCH] Update to SmartRC-CC1101-Driver-Lib@^2.5.4 and removal of workaround from #847 (#851) Tks to @LSatan workaround no longer needed https://github.com/LSatan/SmartRC-CC1101-Driver-Lib/issues/65 --- main/ZactuatorSomfy.ino | 1 - main/ZgatewayRF.ino | 2 -- platformio.ini | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/main/ZactuatorSomfy.ino b/main/ZactuatorSomfy.ino index 67889b2..54c7097 100644 --- a/main/ZactuatorSomfy.ino +++ b/main/ZactuatorSomfy.ino @@ -71,7 +71,6 @@ void MQTTtoSomfy(char* topicOri, JsonObject& jsonData) { SomfyRemote somfyRemote(RF_EMITTER_GPIO, somfyRemotes[remoteIndex], &rollingCodeStorage); somfyRemote.sendCommand(command); # ifdef ZradioCC1101 - ELECHOUSE_cc1101.SpiStrobe(CC1101_SIDLE); // Idle receiver prior to setting a new frequency ELECHOUSE_cc1101.SetRx(receiveMhz); // set Receive on # endif } diff --git a/main/ZgatewayRF.ino b/main/ZgatewayRF.ino index 2587c84..6549ab5 100644 --- a/main/ZgatewayRF.ino +++ b/main/ZgatewayRF.ino @@ -167,7 +167,6 @@ void MQTTtoRF(char* topicOri, char* datacallback) { pub(subjectGTWRFtoMQTT, datacallback); // 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 } # ifdef ZradioCC1101 // set Receive on and Transmitt off - ELECHOUSE_cc1101.SpiStrobe(CC1101_SIDLE); // Idle receiver prior to setting a new frequency ELECHOUSE_cc1101.SetRx(receiveMhz); mySwitch.disableTransmit(); mySwitch.enableReceive(RF_RECEIVER_GPIO); @@ -223,7 +222,6 @@ void MQTTtoRF(char* topicOri, JsonObject& RFdata) { // json object decoding } } # ifdef ZradioCC1101 // set Receive on and Transmitt off - ELECHOUSE_cc1101.SpiStrobe(CC1101_SIDLE); // Idle receiver prior to setting a new frequency ELECHOUSE_cc1101.SetRx(receiveMhz); mySwitch.disableTransmit(); mySwitch.enableReceive(RF_RECEIVER_GPIO); diff --git a/platformio.ini b/platformio.ini index 400fbde..11b3f17 100644 --- a/platformio.ini +++ b/platformio.ini @@ -111,7 +111,7 @@ dallastemperature = DallasTemperature m5stickc = M5StickC@0.2.0 m5stickcp = https://github.com/m5stack/M5StickC-Plus.git m5stack = M5Stack@0.3.0 -smartrc-cc1101-driver-lib = SmartRC-CC1101-Driver-Lib@2.5.2 +smartrc-cc1101-driver-lib = SmartRC-CC1101-Driver-Lib@2.5.4 stl = https://github.com/mike-matera/ArduinoSTL.git#7411816 shtc3 = https://github.com/sparkfun/SparkFun_SHTC3_Arduino_Library somfy_remote=Somfy_Remote_Lib@0.2.0