dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-26 17:46:14 +01:00
Code Releases Activity

simpler macro insert

Browse Source
This commit is contained in:
Asbelos 2024-10-06 13:24:07 +01:00
parent 5883f474ee
commit 801cddfef7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EXRAIL2MacroReset.h
View File

@ -151,7 +151,6 @@
#undef ROUTE_HIDDEN #undef ROUTE_HIDDEN
#undef ROUTE_DISABLED #undef ROUTE_DISABLED
#undef ROUTE_CAPTION #undef ROUTE_CAPTION
#undef SEG7
#undef SENDLOCO #undef SENDLOCO
#undef SEQUENCE #undef SEQUENCE
#undef SERIAL #undef SERIAL
@ -323,7 +322,6 @@
#define ROUTE_HIDDEN(id) #define ROUTE_HIDDEN(id)
#define ROUTE_DISABLED(id) #define ROUTE_DISABLED(id)
#define ROUTE_CAPTION(id,caption) #define ROUTE_CAPTION(id,caption)
#define SEG7(vpin,value,format)
#define SENDLOCO(cab,route) #define SENDLOCO(cab,route)
#define SEQUENCE(id) #define SEQUENCE(id)
#define SERIAL(msg) #define SERIAL(msg)

6
EXRAILMacros.h
View File

@ -63,6 +63,10 @@
// playing sounds with IO_I2CDFPlayer // playing sounds with IO_I2CDFPlayer
#define PLAYSOUND ANOUT #define PLAYSOUND ANOUT
// SEG7 is a helper to create ANOUT from a 7-segment requets
#define SEG7(vpin,value,format) \
ANOUT(vpin,(value & 0xFFFF),TM1638::DF_##format,((uint32_t)value)>>16)
// helper macro to strip leading zeros off time inputs // helper macro to strip leading zeros off time inputs
// (10#mins)%100) // (10#mins)%100)
#define STRIP_ZERO(value) 10##value%100 #define STRIP_ZERO(value) 10##value%100
@ -618,8 +622,6 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
#define ROUTE_HIDDEN(id) OPCODE_ROUTE_HIDDEN,V(id), #define ROUTE_HIDDEN(id) OPCODE_ROUTE_HIDDEN,V(id),
#define ROUTE_DISABLED(id) OPCODE_ROUTE_DISABLED,V(id), #define ROUTE_DISABLED(id) OPCODE_ROUTE_DISABLED,V(id),
#define ROUTE_CAPTION(id,caption) PRINT(caption) #define ROUTE_CAPTION(id,caption) PRINT(caption)
#define SEG7(vpin,value,format) \
ANOUT(vpin,(value & 0xFFFF),TM1638::DF_##format,((uint32_t)value)>>16)
#define SENDLOCO(cab,route) OPCODE_SENDLOCO,V(cab),OPCODE_PAD,V(route), #define SENDLOCO(cab,route) OPCODE_SENDLOCO,V(cab),OPCODE_PAD,V(route),
#define SEQUENCE(id) OPCODE_SEQUENCE, V(id), #define SEQUENCE(id) OPCODE_SEQUENCE, V(id),
#define SERIAL(msg) PRINT(msg) #define SERIAL(msg) PRINT(msg)