mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2025-03-14 18:13:09 +01:00
Nucleo compilation cleanup
This commit is contained in:
parent
ebcde5335c
commit
5221ab1502
@ -107,7 +107,7 @@ uint16_t RMFT2::getOperand2(uint32_t farAddr) {
|
|||||||
return pgm_read_word_near(farAddr);
|
return pgm_read_word_near(farAddr);
|
||||||
#else
|
#else
|
||||||
// other cpus dont care but may be averse to reading an int16_tr at an odd byte boundary.
|
// 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);
|
return *op | (*(op+1) << 8);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -995,7 +995,7 @@ void RMFT2::delayMe(long delay) {
|
|||||||
delayStart=millis();
|
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
|
if (FLAGOVERFLOW(id)) return false; // Outside range limit
|
||||||
byte f=flags[id];
|
byte f=flags[id];
|
||||||
f &= ~offMask;
|
f &= ~offMask;
|
||||||
|
@ -103,7 +103,7 @@ const int StringMacroTracker1=__COUNTER__;
|
|||||||
#define THRUNGE(msg,mode) \
|
#define THRUNGE(msg,mode) \
|
||||||
case (__COUNTER__ - StringMacroTracker1) : {\
|
case (__COUNTER__ - StringMacroTracker1) : {\
|
||||||
static const char HIGHFLASH thrunge[]=msg;\
|
static const char HIGHFLASH thrunge[]=msg;\
|
||||||
strfar=(uint32_t)pgm_get_far_address(thrunge);\
|
strfar=(uint32_t)GETFARPTR(thrunge);\
|
||||||
tmode=mode;\
|
tmode=mode;\
|
||||||
break;\
|
break;\
|
||||||
}
|
}
|
||||||
@ -133,7 +133,7 @@ const int StringMacroTracker1=__COUNTER__;
|
|||||||
#define LCD(id,msg) \
|
#define LCD(id,msg) \
|
||||||
case (__COUNTER__ - StringMacroTracker1) : {\
|
case (__COUNTER__ - StringMacroTracker1) : {\
|
||||||
static const char HIGHFLASH thrunge[]=msg;\
|
static const char HIGHFLASH thrunge[]=msg;\
|
||||||
strfar=(uint32_t)pgm_get_far_address(thrunge);\
|
strfar=(uint32_t)GETFARPTR(thrunge);\
|
||||||
tmode=thrunge_lcd; \
|
tmode=thrunge_lcd; \
|
||||||
lcdid=id;\
|
lcdid=id;\
|
||||||
break;\
|
break;\
|
||||||
|
@ -184,7 +184,7 @@ platform = ststm32
|
|||||||
board = nucleo_f411re
|
board = nucleo_f411re
|
||||||
framework = arduino
|
framework = arduino
|
||||||
lib_deps = ${env.lib_deps}
|
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_speed = 115200
|
||||||
monitor_echo = yes
|
monitor_echo = yes
|
||||||
|
|
||||||
@ -192,7 +192,7 @@ monitor_echo = yes
|
|||||||
platform = teensy
|
platform = teensy
|
||||||
board = teensy31
|
board = teensy31
|
||||||
framework = arduino
|
framework = arduino
|
||||||
build_flags = -std=c++17 -DDISABLE_EEPROM -Os -g2
|
build_flags = -std=c++17 -Os -g2
|
||||||
lib_deps = ${env.lib_deps}
|
lib_deps = ${env.lib_deps}
|
||||||
lib_ignore = NativeEthernet
|
lib_ignore = NativeEthernet
|
||||||
|
|
||||||
@ -200,7 +200,7 @@ lib_ignore = NativeEthernet
|
|||||||
platform = teensy
|
platform = teensy
|
||||||
board = teensy35
|
board = teensy35
|
||||||
framework = arduino
|
framework = arduino
|
||||||
build_flags = -std=c++17 -DDISABLE_EEPROM -Os -g2
|
build_flags = -std=c++17 -Os -g2
|
||||||
lib_deps = ${env.lib_deps}
|
lib_deps = ${env.lib_deps}
|
||||||
lib_ignore = NativeEthernet
|
lib_ignore = NativeEthernet
|
||||||
|
|
||||||
@ -208,7 +208,7 @@ lib_ignore = NativeEthernet
|
|||||||
platform = teensy
|
platform = teensy
|
||||||
board = teensy36
|
board = teensy36
|
||||||
framework = arduino
|
framework = arduino
|
||||||
build_flags = -std=c++17 -DDISABLE_EEPROM -Os -g2
|
build_flags = -std=c++17 -Os -g2
|
||||||
lib_deps = ${env.lib_deps}
|
lib_deps = ${env.lib_deps}
|
||||||
lib_ignore = NativeEthernet
|
lib_ignore = NativeEthernet
|
||||||
|
|
||||||
@ -216,7 +216,7 @@ lib_ignore = NativeEthernet
|
|||||||
platform = teensy
|
platform = teensy
|
||||||
board = teensy40
|
board = teensy40
|
||||||
framework = arduino
|
framework = arduino
|
||||||
build_flags = -std=c++17 -DDISABLE_EEPROM -Os -g2
|
build_flags = -std=c++17 -Os -g2
|
||||||
lib_deps = ${env.lib_deps}
|
lib_deps = ${env.lib_deps}
|
||||||
lib_ignore = NativeEthernet
|
lib_ignore = NativeEthernet
|
||||||
|
|
||||||
@ -224,6 +224,6 @@ lib_ignore = NativeEthernet
|
|||||||
platform = teensy
|
platform = teensy
|
||||||
board = teensy41
|
board = teensy41
|
||||||
framework = arduino
|
framework = arduino
|
||||||
build_flags = -std=c++17 -DDISABLE_EEPROM -Os -g2
|
build_flags = -std=c++17 -Os -g2
|
||||||
lib_deps = ${env.lib_deps}
|
lib_deps = ${env.lib_deps}
|
||||||
lib_ignore =
|
lib_ignore =
|
Loading…
Reference in New Issue
Block a user