dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-23 08:06:13 +01:00
Code Releases Activity

comments and constant as unsigned

Browse Source
This commit is contained in:
Harald Barth 2020-08-01 15:03:15 +02:00
parent 93446f19ed
commit 7c94a3c881
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DCC.cpp
View File

@ -95,6 +95,7 @@ bool DCC::getThrottleDirection(int cab) {
return (speedTable[reg].speedCode & 0x80) !=0; return (speedTable[reg].speedCode & 0x80) !=0;
} }
// Set function to value on or off
void DCC::setFn( int cab, byte functionNumber, bool on) { void DCC::setFn( int cab, byte functionNumber, bool on) {
if (cab<=0 || functionNumber>28) return; if (cab<=0 || functionNumber>28) return;
int reg = lookupSpeedTable(cab); int reg = lookupSpeedTable(cab);
@ -102,13 +103,12 @@ void DCC::setFn( int cab, byte functionNumber, bool on) {
// Take care of functions: // Take care of functions:
// Set state of function // Set state of function
unsigned long funcmask = (1L<<functionNumber); unsigned long funcmask = (1UL<<functionNumber);
if (on) { if (on) {
speedTable[reg].functions |= funcmask; speedTable[reg].functions |= funcmask;
} else { } else {
speedTable[reg].functions &= ~funcmask; speedTable[reg].functions &= ~funcmask;
} }
//DIAG(F("\nFUNCTIONS of %d IS %d\n"),cab,speedTable[reg].functions);
updateGroupflags(speedTable[reg].groupFlags, functionNumber); updateGroupflags(speedTable[reg].groupFlags, functionNumber);
return; return;
} }
@ -125,7 +125,7 @@ int DCC::changeFn( int cab, byte functionNumber, bool pressed) {
// Take care of functions: // Take care of functions:
// Imitate how many command stations do it: Button press is // Imitate how many command stations do it: Button press is
// toggle but for F2 where it is momentary // toggle but for F2 where it is momentary
unsigned long funcmask = (1L<<functionNumber); unsigned long funcmask = (1UL<<functionNumber);
if (functionNumber == 2) { if (functionNumber == 2) {
// turn on F2 on press and off again at release of button // turn on F2 on press and off again at release of button
if (pressed) { if (pressed) {
@ -136,7 +136,7 @@ int DCC::changeFn( int cab, byte functionNumber, bool pressed) {
funcstate = 0; funcstate = 0;
} }
} else { } else {
// toggle function on release, ignore release // toggle function on press, ignore release
if (pressed) { if (pressed) {
speedTable[reg].functions ^= funcmask; speedTable[reg].functions ^= funcmask;
} }