From feebe67ecbaee84a7a7afd5a05d1686ef05b44d1 Mon Sep 17 00:00:00 2001 From: Harald Barth Date: Sat, 30 Jul 2022 10:40:45 +0200 Subject: [PATCH] fix compiler Werror --- EEStore.cpp | 4 ++-- I2CManager_Wire.h | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/EEStore.cpp b/EEStore.cpp index 3a13be7..24be0f8 100644 --- a/EEStore.cpp +++ b/EEStore.cpp @@ -43,7 +43,7 @@ void EEStore::init() { if (strncmp(eeStore->data.id, EESTORE_ID, sizeof(EESTORE_ID)) != 0) { // if not, create blank eeStore structure (no // turnouts, no sensors) and save it back to EEPROM - strncpy(eeStore->data.id, EESTORE_ID, sizeof(EESTORE_ID)); + strncpy(eeStore->data.id, EESTORE_ID, sizeof(EESTORE_ID)+0); eeStore->data.nTurnouts = 0; eeStore->data.nSensors = 0; eeStore->data.nOutputs = 0; @@ -92,7 +92,7 @@ int EEStore::pointer() { return (eeAddress); } /////////////////////////////////////////////////////////////////////////////// void EEStore::dump(int num) { - byte b; + byte b = 0; DIAG(F("Addr 0x char")); for (int n = 0; n < num; n++) { EEPROM.get(n, b); diff --git a/I2CManager_Wire.h b/I2CManager_Wire.h index fb41f86..19e682e 100644 --- a/I2CManager_Wire.h +++ b/I2CManager_Wire.h @@ -98,22 +98,20 @@ uint8_t I2CManagerClass::read(uint8_t address, uint8_t readBuffer[], uint8_t rea * returned in the I2CRB as for the asynchronous version. ***************************************************************************/ void I2CManagerClass::queueRequest(I2CRB *req) { - uint8_t status; switch (req->operation) { case OPERATION_READ: - status = read(req->i2cAddress, req->readBuffer, req->readLen, NULL, 0, req); + req->status = read(req->i2cAddress, req->readBuffer, req->readLen, NULL, 0, req); break; case OPERATION_SEND: - status = write(req->i2cAddress, req->writeBuffer, req->writeLen, req); + req->status = write(req->i2cAddress, req->writeBuffer, req->writeLen, req); break; case OPERATION_SEND_P: - status = write_P(req->i2cAddress, req->writeBuffer, req->writeLen, req); + req->status = write_P(req->i2cAddress, req->writeBuffer, req->writeLen, req); break; case OPERATION_REQUEST: - status = read(req->i2cAddress, req->readBuffer, req->readLen, req->writeBuffer, req->writeLen, req); + req->status = read(req->i2cAddress, req->readBuffer, req->readLen, req->writeBuffer, req->writeLen, req); break; } - req->status = status; } /*************************************************************************** @@ -125,4 +123,4 @@ void I2CManagerClass::loop() {} void I2CManagerClass::checkForTimeout() {} -#endif \ No newline at end of file +#endif