Merge 31f89ad4c4701c3137dca6826f81adb3b4c22f33 into 911bbd63be2c8dcf2730ad96eb94a95fed4c0eee

CommandDistributor.cpp

@@ -153,11 +153,11 @@ void  CommandDistributor::broadcastSensor(int16_t id, bool on ) {
 }
 
 void CommandDistributor::broadcastAccessory(int16_t address, byte port, bool gate, bool on) {
-  broadcastReply(COMMAND_TYPE, F("<y A %d %d %c %c>\n"), address, port, gate?'1':'0', on?'1':'0');
+  broadcastReply(COMMAND_TYPE, F("<y a %d %d %c %c>\n"), address, port, gate?'1':'0', on?'1':'0');
 }
 
 void CommandDistributor::broadcastExtendedAccessory(int16_t address, int16_t value) {
-  broadcastReply(COMMAND_TYPE, F("<y E %d %d>\n"), address, value);
+  broadcastReply(COMMAND_TYPE, F("<y A %d %d>\n"), address, value);
 }
 
 void  CommandDistributor::broadcastTurnout(int16_t id, bool isClosed ) {

EXRAIL2MacroReset.h

@@ -217,7 +217,7 @@
 #define BROADCAST(msg)
 #define CALL(route)
 #define CLEAR_STASH(id)
-#define CLEAR_ALL_STASH
+#define CLEAR_ALL_STASH(id)
 #define CLOSE(id)
 #define CONFIGURE_SERVO(vpin,pos1,pos2,profile) 
 #define DCC_SIGNAL(id,add,subaddr)

version.h

@@ -3,8 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.4.7"
+#define VERSION "5.4.6"
-// 5.4.7  - Bugfix: EXRAIL fix CLEAR_ALL_STASH
 // 5.4.6  - Bugfix: Do not drop further commands in same packet
 // 5.4.5  - ESP32: Better detection of correct IDF version
 //        - track power is always turned on after setJoin() not by setJoin()