dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-22 23:56:13 +01:00
Code Releases Activity

Reinstate obsolete <s>

Browse Source
This commit is contained in:
Asbelos 2023-03-01 16:32:05 +00:00
parent 003313998b
commit 4d8efcdd05
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DCCEXParser.cpp
View File

@ -503,8 +503,10 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
return; return;
case 'c': // SEND METER RESPONSES <c> case 'c': // SEND METER RESPONSES <c>
// No longer supported because of multiple tracks See <G> and <I> // No longer useful because of multiple tracks See <JG> and <JI>
break; if (params>0) break;
TrackManager::reportObsoleteCurrent(stream);
return;
case 'Q': // SENSORS <Q> case 'Q': // SENSORS <Q>
Sensor::printAll(stream); Sensor::printAll(stream);

9
TrackManager.cpp
View File

@ -424,6 +424,15 @@ POWERMODE TrackManager::getProgPower() {
return POWERMODE::OFF; return POWERMODE::OFF;
} }
void TrackManager::reportObsoleteCurrent(Print* stream) {
// This function is for backward JMRI compatibility only
// It reports the first track only, as main, regardless of track settings.
// <c MeterName value C/V unit min max res warn>
int maxCurrent=track[0]->raw2mA(track[0]->getRawCurrentTripValue());
StringFormatter::send(stream, F("<c CurrentMAIN %d C Milli 0 %d 1 %d>\n"),
track[0]->raw2mA(track[0]->getCurrentRaw(false)), maxCurrent, maxCurrent);
}
void TrackManager::reportCurrent(Print* stream) { void TrackManager::reportCurrent(Print* stream) {
StringFormatter::send(stream,F("<jI")); StringFormatter::send(stream,F("<jI"));
FOR_EACH_TRACK(t) { FOR_EACH_TRACK(t) {

1
TrackManager.h
View File

@ -79,6 +79,7 @@ class TrackManager {
static void sampleCurrent(); static void sampleCurrent();
static void reportGauges(Print* stream); static void reportGauges(Print* stream);
static void reportCurrent(Print* stream); static void reportCurrent(Print* stream);
static void reportObsoleteCurrent(Print* stream);
static int16_t joinRelay; static int16_t joinRelay;
static bool progTrackSyncMain; // true when prog track is a siding switched to main static bool progTrackSyncMain; // true when prog track is a siding switched to main
static bool progTrackBoosted; // true when prog track is not current limited static bool progTrackBoosted; // true when prog track is not current limited