diff --git a/Multiprotocol/A7105_SPI.ino b/Multiprotocol/A7105_SPI.ino index f848739..50e4f28 100644 --- a/Multiprotocol/A7105_SPI.ino +++ b/Multiprotocol/A7105_SPI.ino @@ -173,9 +173,8 @@ void A7105_SetPower() uint8_t power=A7105_BIND_POWER; if(IS_BIND_DONE_on) power=IS_POWER_FLAG_on?A7105_HIGH_POWER:A7105_LOW_POWER; - else - if(IS_RANGE_FLAG_on) - power=A7105_POWER_0; + if(IS_RANGE_FLAG_on) + power=A7105_RANGE_POWER; A7105_WriteReg(0x28, power); } diff --git a/Multiprotocol/CC2500_SPI.ino b/Multiprotocol/CC2500_SPI.ino index c27e31e..74fad18 100644 --- a/Multiprotocol/CC2500_SPI.ino +++ b/Multiprotocol/CC2500_SPI.ino @@ -162,9 +162,8 @@ void CC2500_SetPower() uint8_t power=CC2500_BIND_POWER; if(IS_BIND_DONE_on) power=IS_POWER_FLAG_on?CC2500_HIGH_POWER:CC2500_LOW_POWER; - else - if(IS_RANGE_FLAG_on) - power=CC2500_POWER_0; + if(IS_RANGE_FLAG_on) + power=CC2500_RANGE_POWER; cc2500_writeReg(CC2500_3E_PATABLE, power); } diff --git a/Multiprotocol/CYRF6936_SPI.ino b/Multiprotocol/CYRF6936_SPI.ino index 5ed9109..1722ac8 100644 --- a/Multiprotocol/CYRF6936_SPI.ino +++ b/Multiprotocol/CYRF6936_SPI.ino @@ -156,9 +156,8 @@ void CYRF_SetPower(uint8_t val) uint8_t power=CYRF_BIND_POWER; if(IS_BIND_DONE_on) power=IS_POWER_FLAG_on?CYRF_HIGH_POWER:CYRF_LOW_POWER; - else - if(IS_RANGE_FLAG_on) - power=CYRF_POWER_0; + if(IS_RANGE_FLAG_on) + power=CYRF_RANGE_POWER; CYRF_WriteRegister(CYRF_03_TX_CFG, val | power); } diff --git a/Multiprotocol/NRF24l01_SPI.ino b/Multiprotocol/NRF24l01_SPI.ino index d0fffa5..c37953f 100644 --- a/Multiprotocol/NRF24l01_SPI.ino +++ b/Multiprotocol/NRF24l01_SPI.ino @@ -185,9 +185,8 @@ void NRF24L01_SetPower() uint8_t power=NRF_BIND_POWER; if(IS_BIND_DONE_on) power=IS_POWER_FLAG_on?NRF_HIGH_POWER:NRF_LOW_POWER; - else - if(IS_RANGE_FLAG_on) - power=NRF_POWER_0; + if(IS_RANGE_FLAG_on) + power=NRF_POWER_0; rf_setup = (rf_setup & 0xF9) | (power << 1); NRF24L01_WriteReg(NRF24L01_06_RF_SETUP, rf_setup); } diff --git a/Multiprotocol/multiprotocol.h b/Multiprotocol/multiprotocol.h index 70a252e..5ec67e9 100644 --- a/Multiprotocol/multiprotocol.h +++ b/Multiprotocol/multiprotocol.h @@ -228,6 +228,7 @@ enum A7105_POWER #define A7105_HIGH_POWER A7105_POWER_5 #define A7105_LOW_POWER A7105_POWER_3 #define A7105_BIND_POWER A7105_POWER_0 +#define A7105_RANGE_POWER A7105_POWER_0 // NRF Power // Power setting is 0..3 for nRF24L01 @@ -242,6 +243,7 @@ enum NRF_POWER #define NRF_HIGH_POWER NRF_POWER_2 #define NRF_LOW_POWER NRF_POWER_1 #define NRF_BIND_POWER NRF_POWER_0 +#define NRF_RANGE_POWER NRF_POWER_0 // CC2500 power enum CC2500_POWER @@ -258,6 +260,7 @@ enum CC2500_POWER #define CC2500_HIGH_POWER CC2500_POWER_6 #define CC2500_LOW_POWER CC2500_POWER_3 #define CC2500_BIND_POWER CC2500_POWER_0 +#define CC2500_RANGE_POWER CC2500_POWER_0 // CYRF power enum CYRF_POWER @@ -271,9 +274,10 @@ enum CYRF_POWER CYRF_POWER_6 = 0x06, // CYRF_POWER_7 = 0x07 // }; -#define CYRF_HIGH_POWER 7 -#define CYRF_LOW_POWER 3 -#define CYRF_BIND_POWER 0 +#define CYRF_HIGH_POWER CYRF_POWER_7 +#define CYRF_LOW_POWER CYRF_POWER_3 +#define CYRF_BIND_POWER CYRF_POWER_0 +#define CYRF_RANGE_POWER CYRF_POWER_0 //******************* //*** CRC Table ***