mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2025-04-21 20:41:19 +02:00
Compare commits
No commits in common. "6f0ff4994592ce02b62e908ebb3f03f8dce7e355" and "6f1c7a9e985869bae0dcd527528afafdb8b28190" have entirely different histories.
6f0ff49945
...
6f1c7a9e98
20
EXRAIL.h
20
EXRAIL.h
@ -1,23 +1,3 @@
|
|||||||
/*
|
|
||||||
* © 2021 Fred Decker
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This file is part of CommandStation-EX
|
|
||||||
*
|
|
||||||
* This is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* It is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with CommandStation. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef EXRAIL_H
|
#ifndef EXRAIL_H
|
||||||
#define EXRAIL_H
|
#define EXRAIL_H
|
||||||
|
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
* © 2021-2023 Harald Barth
|
* © 2021-2023 Harald Barth
|
||||||
* © 2020-2023 Chris Harlow
|
* © 2020-2023 Chris Harlow
|
||||||
* © 2022-2023 Colin Murdoch
|
* © 2022-2023 Colin Murdoch
|
||||||
* © 2025 Morten Nielsen
|
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This file is part of CommandStation-EX
|
* This file is part of CommandStation-EX
|
||||||
@ -872,14 +871,6 @@ void RMFT2::loop2() {
|
|||||||
DCC::changeFn(operand,getOperand(1));
|
DCC::changeFn(operand,getOperand(1));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case OPCODE_XFWD:
|
|
||||||
DCC::setThrottle(operand,getOperand(1), true);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case OPCODE_XREV:
|
|
||||||
DCC::setThrottle(operand,getOperand(1), false);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case OPCODE_DCCACTIVATE: {
|
case OPCODE_DCCACTIVATE: {
|
||||||
// operand is address<<3 | subaddr<<1 | active
|
// operand is address<<3 | subaddr<<1 | active
|
||||||
int16_t addr=operand>>3;
|
int16_t addr=operand>>3;
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
* © 2020-2022 Chris Harlow
|
* © 2020-2022 Chris Harlow
|
||||||
* © 2022-2023 Colin Murdoch
|
* © 2022-2023 Colin Murdoch
|
||||||
* © 2023 Harald Barth
|
* © 2023 Harald Barth
|
||||||
* © 2025 Morten Nielsen
|
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This file is part of CommandStation-EX
|
* This file is part of CommandStation-EX
|
||||||
@ -46,7 +45,7 @@ enum OPCODE : byte {OPCODE_THROW,OPCODE_CLOSE,OPCODE_TOGGLE_TURNOUT,
|
|||||||
OPCODE_ENDIF,OPCODE_ELSE,
|
OPCODE_ENDIF,OPCODE_ELSE,
|
||||||
OPCODE_DELAY,OPCODE_DELAYMINS,OPCODE_DELAYMS,OPCODE_RANDWAIT,
|
OPCODE_DELAY,OPCODE_DELAYMINS,OPCODE_DELAYMS,OPCODE_RANDWAIT,
|
||||||
OPCODE_FON,OPCODE_FOFF,OPCODE_XFON,OPCODE_XFOFF,
|
OPCODE_FON,OPCODE_FOFF,OPCODE_XFON,OPCODE_XFOFF,
|
||||||
OPCODE_FTOGGLE,OPCODE_XFTOGGLE,OPCODE_XFWD,OPCODE_XREV,
|
OPCODE_FTOGGLE,OPCODE_XFTOGGLE,
|
||||||
OPCODE_RED,OPCODE_GREEN,OPCODE_AMBER,OPCODE_DRIVE,
|
OPCODE_RED,OPCODE_GREEN,OPCODE_AMBER,OPCODE_DRIVE,
|
||||||
OPCODE_SERVO,OPCODE_SIGNAL,OPCODE_TURNOUT,OPCODE_WAITFOR,
|
OPCODE_SERVO,OPCODE_SIGNAL,OPCODE_TURNOUT,OPCODE_WAITFOR,
|
||||||
OPCODE_PAD,OPCODE_FOLLOW,OPCODE_CALL,OPCODE_RETURN,
|
OPCODE_PAD,OPCODE_FOLLOW,OPCODE_CALL,OPCODE_RETURN,
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
* © 2020-2022 Chris Harlow. All rights reserved.
|
* © 2020-2022 Chris Harlow. All rights reserved.
|
||||||
* © 2022-2023 Colin Murdoch
|
* © 2022-2023 Colin Murdoch
|
||||||
* © 2023 Harald Barth
|
* © 2023 Harald Barth
|
||||||
* © 2025 Morten Nielsen
|
|
||||||
*
|
*
|
||||||
* This file is part of CommandStation-EX
|
* This file is part of CommandStation-EX
|
||||||
*
|
*
|
||||||
@ -195,8 +194,6 @@
|
|||||||
#undef XFOFF
|
#undef XFOFF
|
||||||
#undef XFON
|
#undef XFON
|
||||||
#undef XFTOGGLE
|
#undef XFTOGGLE
|
||||||
#undef XREV
|
|
||||||
#undef XFWD
|
|
||||||
|
|
||||||
#ifndef RMFT2_UNDEF_ONLY
|
#ifndef RMFT2_UNDEF_ONLY
|
||||||
#define ACTIVATE(addr,subaddr)
|
#define ACTIVATE(addr,subaddr)
|
||||||
@ -368,7 +365,5 @@
|
|||||||
#define XFOFF(cab,func)
|
#define XFOFF(cab,func)
|
||||||
#define XFON(cab,func)
|
#define XFON(cab,func)
|
||||||
#define XFTOGGLE(cab,func)
|
#define XFTOGGLE(cab,func)
|
||||||
#define XFWD(cab,speed)
|
|
||||||
#define XREV(cab,speed)
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
* © 2020-2022 Chris Harlow
|
* © 2020-2022 Chris Harlow
|
||||||
* © 2022-2023 Colin Murdoch
|
* © 2022-2023 Colin Murdoch
|
||||||
* © 2023 Harald Barth
|
* © 2023 Harald Barth
|
||||||
* © 2025 Morten Nielsen
|
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This file is part of CommandStation-EX
|
* This file is part of CommandStation-EX
|
||||||
@ -666,8 +665,6 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
|
|||||||
#define XFOFF(cab,func) OPCODE_XFOFF,V(cab),OPCODE_PAD,V(func),
|
#define XFOFF(cab,func) OPCODE_XFOFF,V(cab),OPCODE_PAD,V(func),
|
||||||
#define XFON(cab,func) OPCODE_XFON,V(cab),OPCODE_PAD,V(func),
|
#define XFON(cab,func) OPCODE_XFON,V(cab),OPCODE_PAD,V(func),
|
||||||
#define XFTOGGLE(cab,func) OPCODE_XFTOGGLE,V(cab),OPCODE_PAD,V(func),
|
#define XFTOGGLE(cab,func) OPCODE_XFTOGGLE,V(cab),OPCODE_PAD,V(func),
|
||||||
#define XFWD(cab,speed) OPCODE_XFWD,V(cab),OPCODE_PAD,V(speed),
|
|
||||||
#define XREV(cab,speed) OPCODE_XREV,V(cab),OPCODE_PAD,V(speed),
|
|
||||||
|
|
||||||
// Build RouteCode
|
// Build RouteCode
|
||||||
const int StringMacroTracker2=__COUNTER__;
|
const int StringMacroTracker2=__COUNTER__;
|
||||||
|
@ -1 +1 @@
|
|||||||
#define GITHUB_SHA "devel-202501092043Z"
|
#define GITHUB_SHA "devel-202501021826Z"
|
||||||
|
@ -12,10 +12,18 @@
|
|||||||
default_envs =
|
default_envs =
|
||||||
mega2560
|
mega2560
|
||||||
uno
|
uno
|
||||||
|
unowifiR2
|
||||||
nano
|
nano
|
||||||
|
samd21-dev-usb
|
||||||
|
samd21-zero-usb
|
||||||
ESP32
|
ESP32
|
||||||
Nucleo-F411RE
|
Nucleo-F411RE
|
||||||
Nucleo-F446RE
|
Nucleo-F446RE
|
||||||
|
Teensy3_2
|
||||||
|
Teensy3_5
|
||||||
|
Teensy3_6
|
||||||
|
Teensy4_0
|
||||||
|
Teensy4_1
|
||||||
src_dir = .
|
src_dir = .
|
||||||
include_dir = .
|
include_dir = .
|
||||||
|
|
||||||
|
@ -3,10 +3,7 @@
|
|||||||
|
|
||||||
#include "StringFormatter.h"
|
#include "StringFormatter.h"
|
||||||
|
|
||||||
#define VERSION "5.5.0"
|
#define VERSION "5.2.95"
|
||||||
// 5.5.0 - New version on devel
|
|
||||||
// 5.4.0 - New version on master
|
|
||||||
// 5.2.96 - EXRAIL additions XFWD() and XREV()
|
|
||||||
// 5.2.95 - Release candidate for 5.4
|
// 5.2.95 - Release candidate for 5.4
|
||||||
// 5.2.94 - Bugfix: Less confusion and simpler code around the RCN213 defines
|
// 5.2.94 - Bugfix: Less confusion and simpler code around the RCN213 defines
|
||||||
// 5.2.93 - Bugfix ESP32: clear progTrackSyncMain (join flag) when prog track is removed
|
// 5.2.93 - Bugfix ESP32: clear progTrackSyncMain (join flag) when prog track is removed
|
||||||
|
Loading…
x
Reference in New Issue
Block a user