diff options
| author | David Crocker <dcrocker@eschertech.com> | 2022-09-15 13:11:13 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2022-09-15 13:11:13 +0300 |
| commit | 45f0aa6dd284d3e54bc83fa54134b9e5a4e203bd (patch) | |
| tree | 3f474e549c56226edf4c15cfb8f19454cb6bdb5e | |
| parent | 3b5fe90f4ecc2527c7dcb7bbba35000d6ad789cf (diff) | |
Changed CAN firmware version response for ATE
| -rw-r--r-- | src/CAN/CommandProcessor.cpp | 3 | ||||
| -rw-r--r-- | src/Platform/Platform.cpp | 4 | ||||
| -rw-r--r-- | src/Version.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/CAN/CommandProcessor.cpp b/src/CAN/CommandProcessor.cpp index adba4782..a430d366 100644 --- a/src/CAN/CommandProcessor.cpp +++ b/src/CAN/CommandProcessor.cpp @@ -294,7 +294,8 @@ static GCodeResult EutGetInfo(const CanMessageReturnInfo& msg, const StringRef& { case CanMessageReturnInfo::typeFirmwareVersion: default: - reply.printf("%s version %s (%s%s) running on %s", FIRMWARE_NAME, VERSION, DATE, TIME_SUFFIX, reprap.GetPlatform().GetElectronicsString()); + // This must be formatted in a specific way for the ATE, starting with the electronics string + reply.printf("%s firmware version " VERSION " (%s%s)", reprap.GetPlatform().GetElectronicsString(), DATE, TIME_SUFFIX); break; case CanMessageReturnInfo::typeBoardName: diff --git a/src/Platform/Platform.cpp b/src/Platform/Platform.cpp index bbc1c0d9..08489c13 100644 --- a/src/Platform/Platform.cpp +++ b/src/Platform/Platform.cpp @@ -3873,9 +3873,9 @@ const char *_ecv_array Platform::GetElectronicsString() const noexcept case BoardType::Duet3Mini_WiFi: return "Duet 3 " BOARD_SHORT_NAME " WiFi"; case BoardType::Duet3Mini_Ethernet: return "Duet 3 " BOARD_SHORT_NAME " Ethernet"; #elif defined(DUET3_MB6HC) - case BoardType::Duet3_6HC_v06_100: return "Duet 3 " BOARD_SHORT_NAME " v0.6 or 1.0"; + case BoardType::Duet3_6HC_v06_100: return "Duet 3 " BOARD_SHORT_NAME " v1.0 or earlier"; case BoardType::Duet3_6HC_v101: return "Duet 3 " BOARD_SHORT_NAME " v1.01"; - case BoardType::Duet3_6HC_v102: return "Duet 3 " BOARD_SHORT_NAME " v1.02"; + case BoardType::Duet3_6HC_v102: return "Duet 3 " BOARD_SHORT_NAME " v1.02 or later"; #elif defined(DUET3_MB6XD) case BoardType::Duet3_6XD_v01: return "Duet 3 " BOARD_SHORT_NAME " v0.1"; case BoardType::Duet3_6XD_v100: return "Duet 3 " BOARD_SHORT_NAME " v1.0 or later"; diff --git a/src/Version.h b/src/Version.h index aa1ab386..d09f5e77 100644 --- a/src/Version.h +++ b/src/Version.h @@ -10,7 +10,7 @@ #ifndef VERSION // Note: the complete VERSION string must be in standard version number format and must not contain spaces! This is so that DWC can parse it. -# define MAIN_VERSION "3.4.2" +# define MAIN_VERSION "3.4.2+" # ifdef USE_CAN0 # define VERSION_SUFFIX "(CAN0)" # else |