1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-24 00:26:13 +01:00

Compare commits

..

No commits in common. "06fb74c3d71a2233bc46f175965a92cf4d56b21f" and "c0f69cd278f5a489f439655135d1b1678b23d51e" have entirely different histories.

4 changed files with 11 additions and 14 deletions

View File

@ -1 +1 @@
#define GITHUB_SHA "devel-stm32EC 202402041220Z" #define GITHUB_SHA "devel-stm32EC 202401280047Z"

View File

@ -187,7 +187,6 @@ void WiThrottle::parse(RingStream * stream, byte * cmdx) {
} }
break; break;
case 'N': // Heartbeat (2), only send if connection completed by 'HU' message 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 StringFormatter::send(stream, F("*%d\n"), heartrateSent ? HEARTBEAT_SECONDS : HEARTBEAT_PRELOAD); // return timeout value
break; break;
case 'M': // multithrottle case 'M': // multithrottle
@ -195,7 +194,7 @@ void WiThrottle::parse(RingStream * stream, byte * cmdx) {
break; break;
case 'H': // send initial connection info after receiving "HU" message case 'H': // send initial connection info after receiving "HU" message
if (cmd[1] == 'U') { if (cmd[1] == 'U') {
sendIntro(stream); sendIntro(stream);
} }
break; break;
case 'Q': // case 'Q': //
@ -499,14 +498,12 @@ void WiThrottle::getLocoCallback(int16_t locoid) {
} }
void WiThrottle::sendIntro(Print* stream) { void WiThrottle::sendIntro(Print* stream) {
if (introSent) // sendIntro only once
return;
introSent=true; introSent=true;
StringFormatter::send(stream,F("VN2.0\nHTDCC-EX\nRL0\n")); 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)); StringFormatter::send(stream,F("HtDCC-EX v%S, %S, %S, %S\n"), F(VERSION), F(ARDUINO_TYPE), DCC::getMotorShieldName(), F(GITHUB_SHA));
StringFormatter::send(stream,F("PTT]\\[Turnouts}|{Turnout]\\[THROW}|{2]\\[CLOSE}|{4\n")); StringFormatter::send(stream,F("PTT]\\[Turnouts}|{Turnout]\\[THROW}|{2]\\[CLOSE}|{4\n"));
StringFormatter::send(stream,F("PPA%x\n"),TrackManager::getMainPower()==POWERMODE::ON); StringFormatter::send(stream,F("PPA%x\n"),TrackManager::getMainPower()==POWERMODE::ON);
// set heartbeat to 2 seconds because we need to sync the metadata (1 second is too short!) // set heartbeat to 2 seconds because we need to sync the metadata (1 second is too short!)
StringFormatter::send(stream,F("*%d\nHMConnecting..\n"), HEARTBEAT_PRELOAD); StringFormatter::send(stream,F("*%d\nHMConnecting..\n"), HEARTBEAT_PRELOAD);
} }

View File

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

View File

@ -3,11 +3,10 @@
#include "StringFormatter.h" #include "StringFormatter.h"
#define VERSION "5.3.4" #define VERSION "5.2.27stm32ECvfmdns"
// 5.3.4 - Bugfix: WiThrottle sendIntro after initial N message as well // 5.2.XX - Fix Ethernet cable disconnected message, wait for DHCP
// 5.3.3 - Fix Ethernet cable disconnected message, wait for DHCP // 5.2.XX - MDNS Generic library integration for Ethernet
// 5.3.2 - MDNS Generic library integration for Ethernet // 5.2.XX - Variable frequency for DC mode
// 5.3.1 - Variable frequency for DC mode
// 5.2.27 - Bugfix: IOExpander memory allocation // 5.2.27 - Bugfix: IOExpander memory allocation
// 5.2.26 - Silently ignore overridden HAL defaults // 5.2.26 - Silently ignore overridden HAL defaults
// - include HAL_IGNORE_DEFAULTS macro in EXRAIL // - include HAL_IGNORE_DEFAULTS macro in EXRAIL