MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Transport code harmonization (#1072)

Browse Source
This commit is contained in:
tekka
2018-02-20 12:32:17 +01:00
committed by Henrik Ekblad
parent b51981ab3d
commit 57eca4f4af
7 changed files with 30 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hal/transport/RF24/MyTransportRF24.cpp
+4 -4
View File
@@ -68,7 +68,7 @@ bool transportInit(void)
(void)memset(RF24_psk, 0, 16);
(void)memcpy(RF24_psk, MY_ENCRYPTION_SIMPLE_PASSWD, strnlen(MY_ENCRYPTION_SIMPLE_PASSWD, 16));
#else
hwReadConfigBlock((void*)RF24_psk, (void*)EEPROM_RF_ENCRYPTION_AES_KEY_ADDRESS, 16);
hwReadConfigBlock((void *)RF24_psk, (void *)EEPROM_RF_ENCRYPTION_AES_KEY_ADDRESS, 16);
#endif
//set up AES-key
RF24_aes.set_key(RF24_psk, 16);
@@ -93,7 +93,7 @@ uint8_t transportGetAddress(void)
return RF24_getNodeID();
}
bool transportSend(const uint8_t to, const void* data, const uint8_t len, const bool noACK)
bool transportSend(const uint8_t to, const void *data, const uint8_t len, const bool noACK)
{
#if defined(MY_RF24_ENABLE_ENCRYPTION)
// copy input data because it is read-only
@@ -124,7 +124,7 @@ bool transportSanityCheck(void)
return RF24_sanityCheck();
}
uint8_t transportReceive(void* data)
uint8_t transportReceive(void *data)
{
uint8_t len = 0;
#if defined(MY_RX_MESSAGE_BUFFER_FEATURE)
@@ -141,7 +141,7 @@ uint8_t transportReceive(void* data)
// has to be adjusted, WIP!
RF24_aes.set_IV(0);
// decrypt data
if (RF24_aes.cbc_decrypt((uint8_t*)(data), (uint8_t*)(data), len > 16 ? 2 : 1) != AES_SUCCESS) {
if (RF24_aes.cbc_decrypt((uint8_t *)data, (uint8_t *)data, len > 16 ? 2 : 1) != AES_SUCCESS) {
len = 0;
}
#endif
hal/transport/RFM69/MyTransportRFM69.cpp
+11 -11
View File
@@ -37,9 +37,9 @@ bool transportInit(void)
(void)memset(RFM69_psk, 0, 16);
(void)memcpy(RFM69_psk, MY_ENCRYPTION_SIMPLE_PASSWD, strnlen(MY_ENCRYPTION_SIMPLE_PASSWD, 16));
#else
hwReadConfigBlock((void*)RFM69_psk, (void*)EEPROM_RF_ENCRYPTION_AES_KEY_ADDRESS, 16);
hwReadConfigBlock((void *)RFM69_psk, (void*)EEPROM_RF_ENCRYPTION_AES_KEY_ADDRESS, 16);
#endif
RFM69_encrypt((const char*)RFM69_psk);
RFM69_encrypt((const char *)RFM69_psk);
(void)memset(RFM69_psk, 0, 16); // Make sure it is purged from memory when set
#else
(void)RFM69_encrypt;
@@ -57,7 +57,7 @@ uint8_t transportGetAddress(void)
return RFM69_getAddress();
}
bool transportSend(const uint8_t to, const void* data, uint8_t len, const bool noACK)
bool transportSend(const uint8_t to, const void *data, uint8_t len, const bool noACK)
{
if (noACK) {
(void)RFM69_sendWithRetry(to, data, len, 0, 0);
@@ -77,9 +77,9 @@ bool transportSanityCheck(void)
return RFM69_sanityCheck();
}
uint8_t transportReceive(void* data)
uint8_t transportReceive(void *data)
{
return RFM69_receive((uint8_t*)data, MAX_MESSAGE_LENGTH);
return RFM69_receive((uint8_t *)data, MAX_MESSAGE_LENGTH);
}
void transportSleep(void)
@@ -108,7 +108,7 @@ bool transportSetTxPowerLevel(const uint8_t powerLevel)
return RFM69_setTxPowerLevel(powerLevel);
}
void transportSetTargetRSSI(int16_t targetSignalStrength)
void transportSetTargetRSSI(const int16_t targetSignalStrength)
{
#if !defined(MY_GATEWAY_FEATURE) && !defined(MY_RFM69_ATC_MODE_DISABLED)
RFM69_ATCmode(true, targetSignalStrength);
@@ -175,9 +175,9 @@ bool transportInit(void)
(void)memset(RFM69_psk, 0, 16);
(void)memcpy(RFM69_psk, MY_ENCRYPTION_SIMPLE_PASSWD, strnlen(MY_ENCRYPTION_SIMPLE_PASSWD, 16));
#else
hwReadConfigBlock((void*)RFM69_psk, (void*)EEPROM_RF_ENCRYPTION_AES_KEY_ADDRESS, 16);
hwReadConfigBlock((void *)RFM69_psk, (void *)EEPROM_RF_ENCRYPTION_AES_KEY_ADDRESS, 16);
#endif
_radio.encrypt((const char*)RFM69_psk);
_radio.encrypt((const char *)RFM69_psk);
(void)memset(RFM69_psk, 0, 16); // Make sure it is purged from memory when set
#endif
return true;
@@ -196,7 +196,7 @@ uint8_t transportGetAddress(void)
return _address;
}
bool transportSend(const uint8_t to, const void* data, const uint8_t len, const bool noACK)
bool transportSend(const uint8_t to, const void *data, const uint8_t len, const bool noACK)
{
if (noACK) {
(void)_radio.sendWithRetry(to, data, len, 0, 0);
@@ -215,11 +215,11 @@ bool transportSanityCheck(void)
return _radio.sanityCheck();
}
uint8_t transportReceive(void* data)
uint8_t transportReceive(void *data)
{
// save payload length
const uint8_t dataLen = _radio.DATALEN < MAX_MESSAGE_LENGTH? _radio.DATALEN : MAX_MESSAGE_LENGTH;
(void)memcpy((void*)data, (void*)_radio.DATA, dataLen);
(void)memcpy((void *)data, (void *)_radio.DATA, dataLen);
// Send ack back if this message wasn't a broadcast
if (_radio.ACKRequested()) {
_radio.sendACK();
hal/transport/RFM95/MyTransportRFM95.cpp
+3 -3
View File
@@ -46,7 +46,7 @@ uint8_t transportGetAddress(void)
return RFM95_getAddress();
}
bool transportSend(const uint8_t to, const void* data, const uint8_t len, const bool noACK)
bool transportSend(const uint8_t to, const void *data, const uint8_t len, const bool noACK)
{
if (noACK) {
(void)RFM95_sendWithRetry(to, data, len, 0, 0);
@@ -66,9 +66,9 @@ bool transportSanityCheck(void)
return RFM95_sanityCheck();
}
uint8_t transportReceive(void* data)
uint8_t transportReceive(void *data)
{
const uint8_t len = RFM95_receive((uint8_t*)data, MAX_MESSAGE_LENGTH);
const uint8_t len = RFM95_receive((uint8_t *)data, MAX_MESSAGE_LENGTH);
return len;
}