From 329dc414523381fc18f93ed1960415ecd2cc3b38 Mon Sep 17 00:00:00 2001 From: Asbelos Date: Sat, 18 Mar 2023 18:52:01 +0000 Subject: [PATCH] Remove implicit AUTOSTART --- EXRAIL2.cpp | 13 +++++++------ myAutomation.example.h | 3 ++- version.h | 4 +++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/EXRAIL2.cpp b/EXRAIL2.cpp index 8541cd2..bb5989a 100644 --- a/EXRAIL2.cpp +++ b/EXRAIL2.cpp @@ -1,7 +1,7 @@ /* * © 2021 Neil McKechnie * © 2021-2023 Harald Barth - * © 2020-2022 Chris Harlow + * © 2020-2023 Chris Harlow * All rights reserved. * * This file is part of CommandStation-EX @@ -24,8 +24,8 @@ F1. [DONE] DCC accessory packet opcodes (short and long form) F2. [DONE] ONAccessory catchers F3. [DONE] Turnout descriptions for Withrottle - F4. Oled announcements (depends on HAL) - F5. Withrottle roster info + F4. [DONE] Oled announcements (depends on HAL) + F5. [DONE] Withrottle roster info F6. Multi-occupancy semaphore F7. [DONE see AUTOSTART] Self starting sequences F8. Park/unpark @@ -240,8 +240,9 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) { case OPCODE_AUTOSTART: // automatically create a task from here at startup. - // but we will do one at 0 anyway by default. - if (progCounter>0) new RMFT2(progCounter); + // Removed if (progCounter>0) check 4.2.31 because + // default start it top of file is now removed. . + new RMFT2(progCounter); break; default: // Ignore @@ -252,7 +253,7 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) { 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; } diff --git a/myAutomation.example.h b/myAutomation.example.h index 1382a52..e080f2f 100644 --- a/myAutomation.example.h +++ b/myAutomation.example.h @@ -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(10,2) // send loco 10 off along route 2 DONE // This just ends the startup thread, leaving 2 others running. diff --git a/version.h b/version.h index 1801b02..f886a1f 100644 --- a/version.h +++ b/version.h @@ -4,7 +4,9 @@ #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.29 - Bugfix Scroll LCD without empty lines and consistent // 4.2.28 - Reinstate use of timer11 in STM32 - remove HA mode.