Mirrors/MySensors
2
0
Fork 0
mirror of https://github.com/mysensors/MySensors.git synced 2026-02-20 01:21:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent toggle ACTIVATE (#1164)

Browse Source 
Fix issue #1163. Prevent toggling advanced features on nRF24L01 non-plus versions.
This commit is contained in:
Embedded Innovation
2018-07-30 13:14:36 +02:00
committed by Henrik Ekblad
parent 7553893495
commit c6a970be8b
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/RF24/RF24.cpp
View File

@@ -179,6 +179,18 @@ LOCAL void RF24_setRFSetup(const uint8_t RFsetup)
LOCAL void RF24_setFeature(const uint8_t feature)
{
RF24_writeByteRegister(RF24_REG_FEATURE, feature);
if (RF24_getFeature() != feature)
{
// toggle features (necessary on some clones and non-P versions)
RF24_enableFeatures();
RF24_writeByteRegister(RF24_REG_FEATURE, feature);
}
}
LOCAL uint8_t RF24_getFeature(void)
{
return RF24_readByteRegister(RF24_REG_FEATURE);
}
LOCAL void RF24_setPipe(const uint8_t pipe)
@@ -220,6 +232,7 @@ LOCAL void RF24_setStatus(const uint8_t status)
{
RF24_writeByteRegister(RF24_REG_STATUS, status);
}
LOCAL void RF24_enableFeatures(void)
{
RF24_RAW_writeByteRegister(RF24_CMD_ACTIVATE, 0x73);
@@ -502,8 +515,6 @@ LOCAL bool RF24_initialize(void)
RF24_setChannel(MY_RF24_CHANNEL);
// set data rate and pa level
RF24_setRFSetup(RF24_RF_SETUP);
// toggle features (necessary on some clones and non-P versions)
RF24_enableFeatures();
// enable ACK payload and dynamic payload
RF24_setFeature(RF24_FEATURE);
// sanity check (this function is P/non-P independent)

5
drivers/RF24/RF24.h
View File

@@ -320,6 +320,11 @@ LOCAL void RF24_setRFSetup(const uint8_t RFsetup);
*/
LOCAL void RF24_setFeature(const uint8_t feature);
/**
* @brief RF24_getFeature
* @return
*/
LOCAL uint8_t RF24_getFeature(void);
/**
* @brief RF24_setPipe
* @param pipe
*/