From db0e0cbf8b7e9f94cbc7625b1cc5ce533d648213 Mon Sep 17 00:00:00 2001 From: Harald Barth Date: Thu, 25 May 2023 10:29:01 +0200 Subject: [PATCH] Send default function list in jR as well --- DCCEXParser.cpp | 8 ++++++-- GITHUB_SHA.h | 2 +- version.h | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/DCCEXParser.cpp b/DCCEXParser.cpp index d39fb5a..048ae2a 100644 --- a/DCCEXParser.cpp +++ b/DCCEXParser.cpp @@ -652,8 +652,12 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream) if (params==1) { SENDFLASHLIST(stream,RMFT2::rosterIdList) } - else StringFormatter::send(stream,F(" %d \"%S\" \"%S\""), - id, RMFT2::getRosterName(id), RMFT2::getRosterFunctions(id)); + else { + const FSH * functionNames= RMFT2::getRosterFunctions(id); + StringFormatter::send(stream,F(" %d \"%S\" \"%S\""), + id, RMFT2::getRosterName(id), + functionNames == NULL ? RMFT2::getRosterFunctions(0) : functionNames); + } #endif StringFormatter::send(stream, F(">\n")); return; diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h index db01055..9d9a4c8 100644 --- a/GITHUB_SHA.h +++ b/GITHUB_SHA.h @@ -1 +1 @@ -#define GITHUB_SHA "devel-202305250729Z" +#define GITHUB_SHA "devel-202305250828Z" diff --git a/version.h b/version.h index cfea8a8..e8c8294 100644 --- a/version.h +++ b/version.h @@ -4,7 +4,7 @@ #include "StringFormatter.h" -#define VERSION "4.2.54pre2" +#define VERSION "4.2.54pre3" // 4.2.54 - Fix: Pin handling supports pins up to 254 // 4.2.53 - Fix: Fault pin handling made more straight forward // 4.2.52 - Experimental support for sabertooth motor controller on ESP32