From c0cb643cb56bd2282d282082315a4f3ca436a910 Mon Sep 17 00:00:00 2001 From: Harald Barth Date: Fri, 4 Nov 2022 23:15:29 +0100 Subject: [PATCH] When sending all turnouts, keep it short --- DCCEXParser.cpp | 10 +--------- GITHUB_SHA.h | 2 +- Turnouts.h | 9 +++++++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/DCCEXParser.cpp b/DCCEXParser.cpp index 21a9d3d..f947db9 100644 --- a/DCCEXParser.cpp +++ b/DCCEXParser.cpp @@ -730,15 +730,7 @@ bool DCCEXParser::parseT(Print *stream, int16_t params, int16_t p[]) switch (params) { case 0: // list turnout definitions - { - bool gotOne = false; - for (Turnout *tt = Turnout::first(); tt != NULL; tt = tt->next()) - { - gotOne = true; - tt->print(stream); - } - return gotOne; // will if none found - } + return Turnout::printAll(stream); // will if none found case 1: // delete turnout if (!Turnout::remove(p[0])) diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h index 93b77aa..d9d37b0 100644 --- a/GITHUB_SHA.h +++ b/GITHUB_SHA.h @@ -1 +1 @@ -#define GITHUB_SHA "devel-202211041507Z" +#define GITHUB_SHA "devel-202211042214Z" diff --git a/Turnouts.h b/Turnouts.h index b181709..7c40bde 100644 --- a/Turnouts.h +++ b/Turnouts.h @@ -171,9 +171,14 @@ public: // Save all turnout definitions static void store(); #endif - static void printAll(Print *stream) { + static bool printAll(Print *stream) { + bool gotOne=false; for (Turnout *tt = _firstTurnout; tt != 0; tt = tt->_nextTurnout) - if (!tt->isHidden()) StringFormatter::send(stream, F("\n"),tt->getId(), tt->isThrown()); + if (!tt->isHidden()) { + gotOne=true; + StringFormatter::send(stream, F("\n"),tt->getId(), tt->isThrown()); + } + return gotOne; }