mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-26 17:46:14 +01:00
Remove implicit AUTOSTART
This commit is contained in:
parent
c4b4e11a67
commit
329dc41452
13
EXRAIL2.cpp
13
EXRAIL2.cpp
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* © 2021 Neil McKechnie
|
* © 2021 Neil McKechnie
|
||||||
* © 2021-2023 Harald Barth
|
* © 2021-2023 Harald Barth
|
||||||
* © 2020-2022 Chris Harlow
|
* © 2020-2023 Chris Harlow
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This file is part of CommandStation-EX
|
* This file is part of CommandStation-EX
|
||||||
|
@ -24,8 +24,8 @@
|
||||||
F1. [DONE] DCC accessory packet opcodes (short and long form)
|
F1. [DONE] DCC accessory packet opcodes (short and long form)
|
||||||
F2. [DONE] ONAccessory catchers
|
F2. [DONE] ONAccessory catchers
|
||||||
F3. [DONE] Turnout descriptions for Withrottle
|
F3. [DONE] Turnout descriptions for Withrottle
|
||||||
F4. Oled announcements (depends on HAL)
|
F4. [DONE] Oled announcements (depends on HAL)
|
||||||
F5. Withrottle roster info
|
F5. [DONE] Withrottle roster info
|
||||||
F6. Multi-occupancy semaphore
|
F6. Multi-occupancy semaphore
|
||||||
F7. [DONE see AUTOSTART] Self starting sequences
|
F7. [DONE see AUTOSTART] Self starting sequences
|
||||||
F8. Park/unpark
|
F8. Park/unpark
|
||||||
|
@ -240,8 +240,9 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) {
|
||||||
|
|
||||||
case OPCODE_AUTOSTART:
|
case OPCODE_AUTOSTART:
|
||||||
// automatically create a task from here at startup.
|
// automatically create a task from here at startup.
|
||||||
// but we will do one at 0 anyway by default.
|
// Removed if (progCounter>0) check 4.2.31 because
|
||||||
if (progCounter>0) new RMFT2(progCounter);
|
// default start it top of file is now removed. .
|
||||||
|
new RMFT2(progCounter);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default: // Ignore
|
default: // Ignore
|
||||||
|
@ -252,7 +253,7 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) {
|
||||||
|
|
||||||
DIAG(F("EXRAIL %db, fl=%d"),progCounter,MAX_FLAGS);
|
DIAG(F("EXRAIL %db, fl=%d"),progCounter,MAX_FLAGS);
|
||||||
|
|
||||||
new RMFT2(0); // add the startup route
|
// Removed for 4.2.31 new RMFT2(0); // add the startup route
|
||||||
diag=saved_diag;
|
diag=saved_diag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// This is the startup sequence, AKA SEQUENCE(0)
|
// This is the startup sequence,
|
||||||
|
AUTOSTART
|
||||||
SENDLOCO(3,1) // send loco 3 off along route 1
|
SENDLOCO(3,1) // send loco 3 off along route 1
|
||||||
SENDLOCO(10,2) // send loco 10 off along route 2
|
SENDLOCO(10,2) // send loco 10 off along route 2
|
||||||
DONE // This just ends the startup thread, leaving 2 others running.
|
DONE // This just ends the startup thread, leaving 2 others running.
|
||||||
|
|
|
@ -4,7 +4,9 @@
|
||||||
#include "StringFormatter.h"
|
#include "StringFormatter.h"
|
||||||
|
|
||||||
|
|
||||||
#define VERSION "4.2.30"
|
#define VERSION "4.2.31"
|
||||||
|
// 4.2.31 - Removes EXRAIL statup from top of file. (BREAKING CHANGE !!)
|
||||||
|
// Just add AUTOSTART to the top of your myAutomation.h to restore this function.
|
||||||
// 4.2.30 - Fixes/enhancements to EX-IOExpander device driver.
|
// 4.2.30 - Fixes/enhancements to EX-IOExpander device driver.
|
||||||
// 4.2.29 - Bugfix Scroll LCD without empty lines and consistent
|
// 4.2.29 - Bugfix Scroll LCD without empty lines and consistent
|
||||||
// 4.2.28 - Reinstate use of timer11 in STM32 - remove HA mode.
|
// 4.2.28 - Reinstate use of timer11 in STM32 - remove HA mode.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user