[RF] Disable the active RF receive when transmitting with RC-Switch and NewRemoteTransmitter\n (#2084)
Pilight RF transmit is behaving this way already.
This commit is contained in:
1 parent
f5bca0054e
commit
e2641f49e7
2 files changed
+5
-5
No files matched your search
+1
-1
@@ -238,8 +238,8 @@ void XtoRF(const char* topicOri, JsonObject& RFdata) { // json object decoding
|
|||||||
Log.notice(F("RF Protocol:%d" CR), valuePRT);
|
Log.notice(F("RF Protocol:%d" CR), valuePRT);
|
||||||
Log.notice(F("RF Pulse Lgth: %d" CR), valuePLSL);
|
Log.notice(F("RF Pulse Lgth: %d" CR), valuePLSL);
|
||||||
Log.notice(F("Bits nb: %d" CR), valueBITS);
|
Log.notice(F("Bits nb: %d" CR), valueBITS);
|
||||||
# ifdef ZradioCC1101
|
|
||||||
disableCurrentReceiver();
|
disableCurrentReceiver();
|
||||||
|
# ifdef ZradioCC1101
|
||||||
initCC1101();
|
initCC1101();
|
||||||
int txPower = RFdata["txpower"] | RF_CC1101_TXPOWER;
|
int txPower = RFdata["txpower"] | RF_CC1101_TXPOWER;
|
||||||
ELECHOUSE_cc1101.setPA((int)txPower);
|
ELECHOUSE_cc1101.setPA((int)txPower);
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ void rf2Callback(unsigned int period, unsigned long address, unsigned long group
|
|||||||
|
|
||||||
# if simpleReceiving
|
# if simpleReceiving
|
||||||
void XtoRF2(const char* topicOri, const char* datacallback) {
|
void XtoRF2(const char* topicOri, const char* datacallback) {
|
||||||
NewRemoteReceiver::disable();
|
disableCurrentReceiver();
|
||||||
pinMode(RF_EMITTER_GPIO, OUTPUT);
|
pinMode(RF_EMITTER_GPIO, OUTPUT);
|
||||||
initCC1101();
|
initCC1101();
|
||||||
|
|
||||||
@@ -235,8 +235,8 @@ void XtoRF2(const char* topicOri, const char* datacallback) {
|
|||||||
}
|
}
|
||||||
# ifdef ZradioCC1101
|
# ifdef ZradioCC1101
|
||||||
ELECHOUSE_cc1101.SetRx(RFConfig.frequency); // set Receive on
|
ELECHOUSE_cc1101.SetRx(RFConfig.frequency); // set Receive on
|
||||||
NewRemoteReceiver::enable();
|
|
||||||
# endif
|
# endif
|
||||||
|
enableActiveReceiver();
|
||||||
}
|
}
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
@@ -266,7 +266,7 @@ void XtoRF2(const char* topicOri, JsonObject& RF2data) { // json object decoding
|
|||||||
valueUNIT = 0;
|
valueUNIT = 0;
|
||||||
if (valuePERIOD == 0)
|
if (valuePERIOD == 0)
|
||||||
valuePERIOD = 272;
|
valuePERIOD = 272;
|
||||||
NewRemoteReceiver::disable();
|
disableCurrentReceiver();
|
||||||
NewRemoteTransmitter transmitter(valueCODE, RF_EMITTER_GPIO, valuePERIOD, RF2_EMITTER_REPEAT);
|
NewRemoteTransmitter transmitter(valueCODE, RF_EMITTER_GPIO, valuePERIOD, RF2_EMITTER_REPEAT);
|
||||||
Log.trace(F("Sending" CR));
|
Log.trace(F("Sending" CR));
|
||||||
if (valueGROUP) {
|
if (valueGROUP) {
|
||||||
@@ -283,7 +283,7 @@ void XtoRF2(const char* topicOri, JsonObject& RF2data) { // json object decoding
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Log.notice(F("MQTTtoRF2 OK" CR));
|
Log.notice(F("MQTTtoRF2 OK" CR));
|
||||||
NewRemoteReceiver::enable();
|
enableActiveReceiver();
|
||||||
|
|
||||||
success = true;
|
success = true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user