From 37f6b10176efd3df12e5c3fcd4b21f0e3934377b Mon Sep 17 00:00:00 2001 From: fleinze Date: Sun, 13 Sep 2015 19:01:11 +0200 Subject: [PATCH 1/3] channel and datarate in constructor --- libraries/MySensors/MyTransportNRF24.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/MySensors/MyTransportNRF24.h b/libraries/MySensors/MyTransportNRF24.h index 8c582fb..feff4da 100644 --- a/libraries/MySensors/MyTransportNRF24.h +++ b/libraries/MySensors/MyTransportNRF24.h @@ -35,7 +35,7 @@ class MyTransportNRF24 : public MyTransport { public: - MyTransportNRF24(uint8_t ce=RF24_CE_PIN, uint8_t cs=RF24_CS_PIN, uint8_t paLevel=RF24_PA_LEVEL); + MyTransportNRF24(uint8_t ce=RF24_CE_PIN, uint8_t cs=RF24_CS_PIN, uint8_t paLevel=RF24_PA_LEVEL, uint8_t channel=RF24_CHANNEL, rf24_datarate_e datarate=RF24_DATARATE); bool init(); void setAddress(uint8_t address); uint8_t getAddress(); @@ -47,6 +47,9 @@ private: RF24 rf24; uint8_t _address; uint8_t _paLevel; + uint8_t _paLevel; + uint8_t _channel; + rf24_datarate_e _datarate; }; #endif From 58a6d5c67731a49e36cccbfac61118c8ff2827a1 Mon Sep 17 00:00:00 2001 From: fleinze Date: Sun, 13 Sep 2015 19:05:03 +0200 Subject: [PATCH 2/3] Update MyTransportNRF24.cpp --- libraries/MySensors/MyTransportNRF24.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/MySensors/MyTransportNRF24.cpp b/libraries/MySensors/MyTransportNRF24.cpp index d11545d..a01e8b3 100644 --- a/libraries/MySensors/MyTransportNRF24.cpp +++ b/libraries/MySensors/MyTransportNRF24.cpp @@ -20,11 +20,13 @@ #include "MyTransport.h" #include "MyTransportNRF24.h" -MyTransportNRF24::MyTransportNRF24(uint8_t ce, uint8_t cs, uint8_t paLevel) +MyTransportNRF24::MyTransportNRF24(uint8_t ce, uint8_t cs, uint8_t paLevel, uint8_t channel, rf24_datarate_e datarate) : MyTransport(), rf24(ce, cs), - _paLevel(paLevel) + _paLevel(paLevel), + _channel(channel), + _datarate(datarate) { } @@ -38,9 +40,9 @@ bool MyTransportNRF24::init() { rf24.setAutoAck(1); rf24.setAutoAck(BROADCAST_PIPE,false); // Turn off auto ack for broadcast rf24.enableAckPayload(); - rf24.setChannel(RF24_CHANNEL); + rf24.setChannel(_channel); rf24.setPALevel(_paLevel); - rf24.setDataRate(RF24_DATARATE); + rf24.setDataRate(_datarate); rf24.setRetries(5,15); rf24.setCRCLength(RF24_CRC_16); rf24.enableDynamicPayloads(); From 46f425cad1a03644c00aef2c3f6c563065660d88 Mon Sep 17 00:00:00 2001 From: fleinze Date: Sun, 13 Sep 2015 19:19:43 +0200 Subject: [PATCH 3/3] Update MyTransportNRF24.h --- libraries/MySensors/MyTransportNRF24.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/MySensors/MyTransportNRF24.h b/libraries/MySensors/MyTransportNRF24.h index feff4da..19d15e1 100644 --- a/libraries/MySensors/MyTransportNRF24.h +++ b/libraries/MySensors/MyTransportNRF24.h @@ -47,7 +47,6 @@ private: RF24 rf24; uint8_t _address; uint8_t _paLevel; - uint8_t _paLevel; uint8_t _channel; rf24_datarate_e _datarate; };