dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-23 21:01:25 +01:00
Code Releases Activity

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

Browse Source
This commit is contained in:
kempe63 2024-02-04 18:57:50 +00:00
commit 53fec9bc3a
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GITHUB_SHA.h
View File

@ -1 +1 @@
#define GITHUB_SHA "devel-202401212011Z"
#define GITHUB_SHA "devel-202402041151Z"

3
WiThrottle.cpp
View File

@ -187,6 +187,7 @@ void WiThrottle::parse(RingStream * stream, byte * cmdx) {
}
break;
case 'N': // Heartbeat (2), only send if connection completed by 'HU' message
sendIntro(stream);
StringFormatter::send(stream, F("*%d\n"), heartrateSent ? HEARTBEAT_SECONDS : HEARTBEAT_PRELOAD); // return timeout value
break;
case 'M': // multithrottle
@ -498,6 +499,8 @@ void WiThrottle::getLocoCallback(int16_t locoid) {
}
void WiThrottle::sendIntro(Print* stream) {
if (introSent) // sendIntro only once
return;
introSent=true;
StringFormatter::send(stream,F("VN2.0\nHTDCC-EX\nRL0\n"));
StringFormatter::send(stream,F("HtDCC-EX v%S, %S, %S, %S\n"), F(VERSION), F(ARDUINO_TYPE), DCC::getMotorShieldName(), F(GITHUB_SHA));

1
platformio.ini
View File

@ -12,7 +12,6 @@
default_envs =
mega2560
uno
mega328
unowifiR2
nano
samd21-dev-usb

3
version.h
View File

@ -3,7 +3,8 @@
#include "StringFormatter.h"
#define VERSION "5.2.29"
#define VERSION "5.2.30"
// 5.2.40 - Bugfix: WiThrottle sendIntro after initial N message as well
// 5.2.29 - Added IO_I2CDFPlayer.h to support DFPLayer over I2C connected to NXP SC16IS750/SC16IS752 (currently only single UART for SC16IS752)
// - Added enhanced IO_I2CDFPLayer enum commands to EXRAIL2.h
// - Added PLAYSOUND alias of ANOUT to EXRAILMacros.h