Merge branch 'devel-stm32-cmri' of https://github.com/DCC-EX/CommandStation-EX into devel-stm32-cmri

guessI2CDeviceType should always return FSH "string"
update for negative routes 5.2.22
2024-11-24 00:26:13 +01:00 · 2024-01-10 09:17:00 +01:00 · 2024-01-10 09:16:27 +01:00 · 2024-01-10 01:40:31 -06:00 · 2024-01-10 01:38:12 -06:00 · 2024-01-10 01:34:29 -06:00
5 changed files with 12 additions and 9 deletions
--- a/EXRAIL2.cpp
+++ b/EXRAIL2.cpp
@ -334,12 +334,14 @@ if (compileFeatures & FEATURE_SIGNAL) {

 void RMFT2::setTurnoutHiddenState(Turnout * t) {
  // turnout descriptions are in low flash F strings
-  t->setHidden(GETFLASH(getTurnoutDescription(t->getId()))==0x01);     
+  const FSH *desc = getTurnoutDescription(t->getId());
+  if (desc) t->setHidden(GETFLASH(desc)==0x01);
 }

 #ifndef IO_NO_HAL
 void RMFT2::setTurntableHiddenState(Turntable * tto) {
-  tto->setHidden(GETFLASH(getTurntableDescription(tto->getId()))==0x01);
+  const FSH *desc = getTurntableDescription(tto->getId());
+  if (desc) tto->setHidden(GETFLASH(desc)==0x01);
 }
 #endif

--- a/EXRAIL2Parser.cpp
+++ b/EXRAIL2Parser.cpp
@ -134,7 +134,7 @@ void RMFT2::ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16
              return; 
            }
            if (paramCount==2) {  // <JA id>
-              uint16_t id=p[1]; 
+              int16_t id=p[1];
              StringFormatter::send(stream,F("<jA %d %c \"%S\">\n"), 
                id, getRouteType(id), getRouteDescription(id));
              
--- a/GITHUB_SHA.h
+++ b/GITHUB_SHA.h
@ -1 +1 @@
-#define GITHUB_SHA "devel-202401081219Z"
+#define GITHUB_SHA "devel-202401100719Z"
--- a/I2CManager.cpp
+++ b/I2CManager.cpp
@ -66,8 +66,8 @@ static const FSH * guessI2CDeviceType(uint8_t address) {
    return F("Real-time clock"); 
  else if (address >= 0x70 && address <= 0x77)
    return F("I2C Mux");
-  else if (address >= 0x90 && address <= 0xAE);  
-  else
+  else if (address >= 0x90 && address <= 0xAE)
+    return F("UART");
  return F("?");
 }

--- a/version.h
+++ b/version.h
@ -3,7 +3,8 @@

 #include "StringFormatter.h"

-#define VERSION "5.2.21ethCdf"
+#define VERSION "5.2.22ethCdf"
+// 5.2.22 - Bugfixes: Empty turnout descriptions ok; negative route numbers valid.
 // 5.2.21 - Add STARTUP_DELAY config option to delay CS bootup
 // 5.2.20 - Check return of Ethernet.begin()
 // 5.2.19 - ESP32: Determine if the RMT hardware can handle DCC
Author	SHA1	Message	Date
Harald Barth	6f797b2e15	Merge branch 'devel-stm32-cmri' of https://github.com/DCC-EX/CommandStation-EX into devel-stm32-cmri	2024-01-10 09:17:00 +01:00
Harald Barth	fa44d54774	guessI2CDeviceType should always return FSH "string"	2024-01-10 09:16:27 +01:00
Ash-4	1bd113a35f	update for negative routes 5.2.22	2024-01-10 01:40:31 -06:00
Ash-4	2ab2b614cd	update for negative routes 5.2.22 update for negative routes 5.2.22	2024-01-10 01:38:12 -06:00
Ash-4	8e56a1e7f9	Update version.h	2024-01-10 01:34:29 -06:00
Harald Barth	796d5c4774	version 5.2.22	2024-01-10 08:20:14 +01:00
Harald Barth	27bd444884	Numbers for automations/routes can be negative	2024-01-10 08:18:14 +01:00
Harald Barth	ca380d11dc	Do not crash on turnouts or turntables without description	2024-01-10 08:15:30 +01:00
peteGSX	c336ab0bb4	Merge pull request #389 from DCC-EX:add-startup-delay Add-startup-delay	2024-01-09 16:43:41 +10:00