Skip to content

Commit 487fcd1

Browse files
tekka007tekka007
committed
Fix Cppcheck issues
1 parent 14f6598 commit 487fcd1

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

‎core/MyDiagnostics.cpp‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ void PRINT(const char *fmt, ...)
6464
MY_SERIALDEVICE.print(fmtBuffer);
6565
}
6666

67-
void PrintHex8(const uint8_t *data, const uint16_t length)
67+
void PrintHex8(const uint8_t* data, uint16_t length)
6868
{
69-
for (uint16_t i = 0; i < length; i++) {
70-
PRINT(PSTR("%02" PRIX8 " "), data[i]);
71-
if ((((i + 1) % 16 == 0) && (i < length)) || (i == length - 1)) {
72-
MY_SERIALDEVICE.println();
73-
}
74-
}
69+
for (uint16_t i = 0; i < length; ++i) {
70+
PRINT(PSTR("%02" PRIX8 " "), data[i]);
71+
if ( ((i + 1u) % 16u == 0u) || (i + 1u == length) ) {
72+
MY_SERIALDEVICE.println();
73+
}
74+
}
7575
}
7676

7777
void diagnosticsPrintSeparationLine(void)
@@ -88,78 +88,78 @@ void diagnosticsMySensorsEEPROMDump(void)
8888
PRINT(PSTR("> MYS E2P START: 0x%04" PRIX16 "\n"), EEPROM_START);
8989

9090
MY_SERIALDEVICE.print(F("> NODE_ID="));
91-
hwReadConfigBlock(buffer, EEPROM_NODE_ID_ADDRESS, SIZE_NODE_ID);
91+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_NODE_ID_ADDRESS), SIZE_NODE_ID);
9292
PrintHex8(buffer, SIZE_NODE_ID);
9393

9494
MY_SERIALDEVICE.print(F("> PAR_ID="));
95-
hwReadConfigBlock(buffer, reinterpret_cast<void *>EEPROM_PARENT_NODE_ID_ADDRESS,
95+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_PARENT_NODE_ID_ADDRESS),
9696
SIZE_PARENT_NODE_ID);
9797
PrintHex8(buffer, SIZE_PARENT_NODE_ID);
9898

9999
MY_SERIALDEVICE.print(F("> D_GW="));
100-
hwReadConfigBlock(buffer, reinterpret_cast<void *>EEPROM_DISTANCE_ADDRESS, SIZE_DISTANCE);
100+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_DISTANCE_ADDRESS), SIZE_DISTANCE);
101101
PrintHex8(buffer, SIZE_DISTANCE);
102102

103103
MY_SERIALDEVICE.println(F("> RTE TABLE:"));
104-
hwReadConfigBlock(buffer, reinterpret_cast<void *> EEPROM_ROUTES_ADDRESS, SIZE_ROUTES);
104+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_ROUTES_ADDRESS), SIZE_ROUTES);
105105
PrintHex8(buffer, SIZE_ROUTES);
106106

107107
MY_SERIALDEVICE.println(F("> CTRL_CFG:"));
108-
hwReadConfigBlock(buffer, reinterpret_cast<void *>EEPROM_CONTROLLER_CONFIG_ADDRESS,
108+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_CONTROLLER_CONFIG_ADDRESS),
109109
SIZE_CONTROLLER_CONFIG);
110110
PrintHex8(buffer, SIZE_CONTROLLER_CONFIG);
111111

112112
MY_SERIALDEVICE.print(F("> PERS_CRC="));
113-
hwReadConfigBlock(buffer, reinterpret_cast<void *>EEPROM_PERSONALIZATION_CHECKSUM_ADDRESS,
113+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_PERSONALIZATION_CHECKSUM_ADDRESS),
114114
SIZE_PERSONALIZATION_CHECKSUM);
115115
PrintHex8(buffer, SIZE_PERSONALIZATION_CHECKSUM);
116116

117117
MY_SERIALDEVICE.print(F("> FW_TYPE="));
118-
hwReadConfigBlock(buffer, reinterpret_cast<void *>EEPROM_FIRMWARE_TYPE_ADDRESS,
118+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_FIRMWARE_TYPE_ADDRESS),
119119
SIZE_PERSONALIZATION_CHECKSUM);
120120
PrintHex8(buffer, SIZE_PERSONALIZATION_CHECKSUM);
121121

122122
MY_SERIALDEVICE.print(F("> FW_VERS="));
123-
hwReadConfigBlock(buffer, reinterpret_cast<void *>EEPROM_FIRMWARE_VERSION_ADDRESS,
123+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_FIRMWARE_VERSION_ADDRESS),
124124
SIZE_FIRMWARE_VERSION);
125125
PrintHex8(buffer, SIZE_FIRMWARE_VERSION);
126126

127127
MY_SERIALDEVICE.print(F("> FW_BLOCKS="));
128-
hwReadConfigBlock(buffer, reinterpret_cast<void *>EEPROM_FIRMWARE_BLOCKS_ADDRESS,
128+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_FIRMWARE_BLOCKS_ADDRESS),
129129
SIZE_FIRMWARE_BLOCKS);
130130
PrintHex8(buffer, SIZE_FIRMWARE_BLOCKS);
131131

132132
MY_SERIALDEVICE.print(F("> FW_CRC="));
133-
hwReadConfigBlock(buffer, reinterpret_cast<void *>EEPROM_FIRMWARE_CRC_ADDRESS, SIZE_FIRMWARE_CRC);
133+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_FIRMWARE_CRC_ADDRESS), SIZE_FIRMWARE_CRC);
134134
PrintHex8(buffer, SIZE_FIRMWARE_CRC);
135135

136136
MY_SERIALDEVICE.println(F("> SGN_REQ_TABLE:"));
137-
hwReadConfigBlock(buffer, reinterpret_cast<void *>EEPROM_SIGNING_REQUIREMENT_TABLE_ADDRESS,
137+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_SIGNING_REQUIREMENT_TABLE_ADDRESS),
138138
SIZE_SIGNING_REQUIREMENT_TABLE);
139139
PrintHex8(buffer, SIZE_SIGNING_REQUIREMENT_TABLE);
140140

141141
MY_SERIALDEVICE.println(F("> WL_REQ_TABLE:"));
142-
hwReadConfigBlock(buffer, reinterpret_cast<void *>EEPROM_WHITELIST_REQUIREMENT_TABLE_ADDRESS,
142+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_WHITELIST_REQUIREMENT_TABLE_ADDRESS),
143143
SIZE_WHITELIST_REQUIREMENT_TABLE);
144144
PrintHex8(buffer, SIZE_WHITELIST_REQUIREMENT_TABLE);
145145

146146
MY_SERIALDEVICE.println(F("> SGN_SOFT_KEY:"));
147-
hwReadConfigBlock(buffer, reinterpret_cast<void *>EEPROM_SIGNING_SOFT_HMAC_KEY_ADDRESS,
147+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_SIGNING_SOFT_HMAC_KEY_ADDRESS),
148148
SIZE_SIGNING_SOFT_HMAC_KEY);
149149
PrintHex8(buffer, SIZE_SIGNING_SOFT_HMAC_KEY);
150150

151151
MY_SERIALDEVICE.println(F("> SGN_SOFT_SER:"));
152-
hwReadConfigBlock(buffer, reinterpret_cast<void *>EEPROM_SIGNING_SOFT_SERIAL_ADDRESS,
152+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_SIGNING_SOFT_SERIAL_ADDRESS),
153153
SIZE_SIGNING_SOFT_SERIAL);
154154
PrintHex8(buffer, SIZE_SIGNING_SOFT_SERIAL);
155155

156156
MY_SERIALDEVICE.println(F("> AES_KEY:"));
157-
hwReadConfigBlock(buffer, reinterpret_cast<void *>EEPROM_RF_ENCRYPTION_AES_KEY_ADDRESS,
157+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_RF_ENCRYPTION_AES_KEY_ADDRESS),
158158
SIZE_RF_ENCRYPTION_AES_KEY);
159159
PrintHex8(buffer, SIZE_RF_ENCRYPTION_AES_KEY);
160160

161161
MY_SERIALDEVICE.print(F("> NL_CNT="));
162-
hwReadConfigBlock(buffer, reinterpret_cast<void *>EEPROM_NODE_LOCK_COUNTER_ADDRESS,
162+
hwReadConfigBlock(buffer, reinterpret_cast<void *>(EEPROM_NODE_LOCK_COUNTER_ADDRESS),
163163
SIZE_NODE_LOCK_COUNTER);
164164
PrintHex8(buffer, SIZE_NODE_LOCK_COUNTER);
165165

@@ -293,8 +293,8 @@ bool diagnosticsCryptoMenu(void)
293293
#endif
294294
uint8_t temp_iv[16];
295295
uint8_t temp_data[64];
296-
(void)memcpy((void *)temp_iv, (const void *)aes_iv, sizeof(aes_iv));
297-
(void)memcpy((void *)temp_data, (const void *)test_data, sizeof(temp_data));
296+
(void)memcpy(temp_iv, aes_iv, sizeof(aes_iv));
297+
(void)memcpy(temp_data, test_data, sizeof(temp_data));
298298
AES128CBCEncrypt(temp_iv, temp_data, sizeof(test_data));
299299
MY_SERIALDEVICE.print(F("- AES128 CBC encryption: "));
300300
const uint8_t aes_ciphertext[64] = {
@@ -315,7 +315,7 @@ bool diagnosticsCryptoMenu(void)
315315
(void)memcpy(temp_iv, aes_iv, sizeof(aes_iv));
316316
AES128CBCDecrypt(temp_iv, temp_data, sizeof(temp_data));
317317
MY_SERIALDEVICE.print(F("- AES128 CBC decryption: "));
318-
if (memcmp((const void *)test_data, (const void *)temp_data, sizeof(temp_data)) == 0) {
318+
if (memcmp(test_data, temp_data, sizeof(temp_data)) == 0) {
319319
MY_SERIALDEVICE.println(F("OK"));
320320
} else {
321321
MY_SERIALDEVICE.println(F("FAIL!"));
@@ -325,7 +325,7 @@ bool diagnosticsCryptoMenu(void)
325325
#endif
326326
MY_SERIALDEVICE.print(F("- SHA256: "));
327327
uint8_t dest[64];
328-
SHA256((uint8_t *)dest, (const uint8_t *)test_data, sizeof(test_data));
328+
SHA256(dest, test_data, sizeof(test_data));
329329
#if defined(CRYPTO_OUTPUT)
330330
MY_SERIALDEVICE.println(F("SHA256 input:"));
331331
PrintHex8(test_data, sizeof(test_data));
@@ -618,7 +618,7 @@ void diagnosticsRF24Menu(void)
618618
// disable ACK on all pipes
619619
RF24_setAutoACK(0);
620620
// clear result array
621-
(void)memset((void *)values, 0, sizeof(values));
621+
(void)memset(values, 0, sizeof(values));
622622
for (uint8_t rep_counter = 0; rep_counter < 100; rep_counter++) {
623623
for (uint8_t channel = 0; channel < num_channels; channel++) {
624624
RF24_setChannel(channel);
@@ -767,8 +767,8 @@ void diagnosticsMCUMenu(void)
767767
MY_SERIALDEVICE.println(F("ARCH: AVR"));
768768
#elif defined(ARDUINO_ARCH_SAMD)
769769
MY_SERIALDEVICE.println(F("ARCH: SAMD"));
770-
#elif defined(ARDUINO_ARCH_STM32F1)
771-
MY_SERIALDEVICE.println(F("ARCH: STM32F1"));
770+
#elif defined(ARDUINO_ARCH_STM32)
771+
MY_SERIALDEVICE.println(F("ARCH: STM32"));
772772
#elif defined(ARDUINO_ARCH_NRF5) || defined(ARDUINO_ARCH_NRF52)
773773
MY_SERIALDEVICE.println(F("ARCH: NRF5"));
774774
#elif defined(__arm__) && defined(TEENSYDUINO)

0 commit comments

Comments
 (0)