From 96985c1502ddfbd5558b1f31e3b5f4766bf6eb61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 31 Jul 2023 15:04:15 +0000 Subject: [PATCH] Fix unit test build GCC 12 doesn't know AVR pgm_read_ptr() --- src/registers.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/registers.cpp b/src/registers.cpp index 818fee6..cf81c1a 100644 --- a/src/registers.cpp +++ b/src/registers.cpp @@ -412,7 +412,11 @@ bool ReadRegister(uint8_t address, uint16_t &value) { value = 0; // Get pointer to register at address +#ifndef UNITTEST RegisterRec reg = *static_cast(pgm_read_ptr(registers + address)); +#else + RegisterRec reg = registers[address]; +#endif if (!reg.flags.rwfuncs) { switch (reg.flags.size) { case 0: @@ -445,7 +449,11 @@ bool WriteRegister(uint8_t address, uint16_t value) { return false; } +#ifndef UNITTEST RegisterRec reg = *static_cast(pgm_read_ptr(registers + address)); +#else + RegisterRec reg = registers[address]; +#endif if (!reg.flags.writable) { return false; }