diff --git a/DS2423.cpp b/DS2423.cpp index bd06e58..bba2d9a 100644 --- a/DS2423.cpp +++ b/DS2423.cpp @@ -23,12 +23,12 @@ bool DS2423::duty(OneWireHub *hub) // Adr1 b = hub->recv(); - ((uint8_t *) &memory_address)[0] = b; + reinterpret_cast(&memory_address)[0] = b; ow_crc16_update(b); // Adr2 b = hub->recv(); - ((uint8_t *) &memory_address)[1] = b; + reinterpret_cast(&memory_address)[1] = b; ow_crc16_update(b); memory_address_start = memory_address; @@ -68,8 +68,8 @@ bool DS2423::duty(OneWireHub *hub) // crc crc = ow_crc16_get(); - hub->send(((uint8_t *) &crc)[0]); - hub->send(((uint8_t *) &crc)[1]); + hub->send(reinterpret_cast(&crc)[0]); + hub->send(reinterpret_cast(&crc)[1]); ow_crc16_reset(); if (dbg_sensor) diff --git a/DS2433.cpp b/DS2433.cpp index 4d5585d..c8729c4 100644 --- a/DS2433.cpp +++ b/DS2433.cpp @@ -22,11 +22,11 @@ bool DS2433::duty(OneWireHub *hub) case 0x0F: // Adr1 b = hub->recv(); - ((uint8_t *) &memory_address)[0] = b; + reinterpret_cast(&memory_address)[0] = b; // Adr2 b = hub->recv(); - ((uint8_t *) &memory_address)[1] = b; + reinterpret_cast(&memory_address)[1] = b; for (int i = 0; i < 32; ++i) // TODO: check for memory_address + 32 < sizeof() { @@ -46,11 +46,11 @@ bool DS2433::duty(OneWireHub *hub) case 0xAA: // Adr1 b = hub->recv(); - ((uint8_t *) &memory_address)[0] = b; + reinterpret_cast(&memory_address)[0] = b; // Adr2 b = hub->recv(); - ((uint8_t *) &memory_address)[1] = b; + reinterpret_cast(&memory_address)[1] = b; // Offset mem_offset = hub->recv(); @@ -69,11 +69,11 @@ bool DS2433::duty(OneWireHub *hub) case 0xF0: // Adr1 b = hub->recv(); - ((uint8_t *) &memory_address)[0] = b; + reinterpret_cast(&memory_address)[0] = b; // Adr2 b = hub->recv(); - ((uint8_t *) &memory_address)[1] = b; + reinterpret_cast(&memory_address)[1] = b; // data for (int i = 0; i < 32; ++i) // TODO: check for memory_address + 32 < sizeof() diff --git a/OneWireHub.cpp b/OneWireHub.cpp index d12bf7a..91b0a1b 100644 --- a/OneWireHub.cpp +++ b/OneWireHub.cpp @@ -524,7 +524,7 @@ bool OneWireHub::recvAndProcessCmd(void) } } - if (flag == false) return false; + if (!flag) return false; if (SelectElm != nullptr) SelectElm->duty(this); return true;