diff --git a/EXRAIL2.cpp b/EXRAIL2.cpp index 97f86fd..3e8fe61 100644 --- a/EXRAIL2.cpp +++ b/EXRAIL2.cpp @@ -107,7 +107,7 @@ uint16_t RMFT2::getOperand2(uint32_t farAddr) { return pgm_read_word_near(farAddr); #else // other cpus dont care but may be averse to reading an int16_tr at an odd byte boundary. - const byte * op=farAddr; + const byte * op=(const byte *)farAddr; return *op | (*(op+1) << 8); #endif } @@ -995,7 +995,7 @@ void RMFT2::delayMe(long delay) { delayStart=millis(); } -boolean RMFT2::setFlag(VPIN id,byte onMask, byte offMask) { +bool RMFT2::setFlag(VPIN id,byte onMask, byte offMask) { if (FLAGOVERFLOW(id)) return false; // Outside range limit byte f=flags[id]; f &= ~offMask; diff --git a/EXRAILMacros.h b/EXRAILMacros.h index 1c39cd3..69ffed2 100644 --- a/EXRAILMacros.h +++ b/EXRAILMacros.h @@ -103,7 +103,7 @@ const int StringMacroTracker1=__COUNTER__; #define THRUNGE(msg,mode) \ case (__COUNTER__ - StringMacroTracker1) : {\ static const char HIGHFLASH thrunge[]=msg;\ - strfar=(uint32_t)pgm_get_far_address(thrunge);\ + strfar=(uint32_t)GETFARPTR(thrunge);\ tmode=mode;\ break;\ } @@ -133,7 +133,7 @@ const int StringMacroTracker1=__COUNTER__; #define LCD(id,msg) \ case (__COUNTER__ - StringMacroTracker1) : {\ static const char HIGHFLASH thrunge[]=msg;\ - strfar=(uint32_t)pgm_get_far_address(thrunge);\ + strfar=(uint32_t)GETFARPTR(thrunge);\ tmode=thrunge_lcd; \ lcdid=id;\ break;\ diff --git a/platformio.ini b/platformio.ini index bc1ef0e..5fcda00 100644 --- a/platformio.ini +++ b/platformio.ini @@ -184,7 +184,7 @@ platform = ststm32 board = nucleo_f411re framework = arduino lib_deps = ${env.lib_deps} -build_flags = -std=c++17 -DDISABLE_EEPROM -Os -g2 +build_flags = -std=c++17 -Os -g2 monitor_speed = 115200 monitor_echo = yes @@ -192,7 +192,7 @@ monitor_echo = yes platform = teensy board = teensy31 framework = arduino -build_flags = -std=c++17 -DDISABLE_EEPROM -Os -g2 +build_flags = -std=c++17 -Os -g2 lib_deps = ${env.lib_deps} lib_ignore = NativeEthernet @@ -200,7 +200,7 @@ lib_ignore = NativeEthernet platform = teensy board = teensy35 framework = arduino -build_flags = -std=c++17 -DDISABLE_EEPROM -Os -g2 +build_flags = -std=c++17 -Os -g2 lib_deps = ${env.lib_deps} lib_ignore = NativeEthernet @@ -208,7 +208,7 @@ lib_ignore = NativeEthernet platform = teensy board = teensy36 framework = arduino -build_flags = -std=c++17 -DDISABLE_EEPROM -Os -g2 +build_flags = -std=c++17 -Os -g2 lib_deps = ${env.lib_deps} lib_ignore = NativeEthernet @@ -216,7 +216,7 @@ lib_ignore = NativeEthernet platform = teensy board = teensy40 framework = arduino -build_flags = -std=c++17 -DDISABLE_EEPROM -Os -g2 +build_flags = -std=c++17 -Os -g2 lib_deps = ${env.lib_deps} lib_ignore = NativeEthernet @@ -224,6 +224,6 @@ lib_ignore = NativeEthernet platform = teensy board = teensy41 framework = arduino -build_flags = -std=c++17 -DDISABLE_EEPROM -Os -g2 +build_flags = -std=c++17 -Os -g2 lib_deps = ${env.lib_deps} lib_ignore = \ No newline at end of file