diff --git a/Train.cpp b/Train.cpp index 30c2275d..29f6f082 100644 --- a/Train.cpp +++ b/Train.cpp @@ -616,7 +616,8 @@ TTrain::get_state() const { { fHCurrent[ ( mvControlled->TrainType & dt_EZT ) ? 0 : 1 ], fHCurrent[ 2 ], fHCurrent[ 3 ] }, ggLVoltage.GetValue(), mvOccupied->DistCounter, - iRadioChannel + iRadioChannel, + btLampkaSpringBrakeActive.GetValue() }; } diff --git a/Train.h b/Train.h index 30f4831f..f2b6e4b8 100644 --- a/Train.h +++ b/Train.h @@ -105,6 +105,7 @@ class TTrain { float lv_voltage; double distance; int radio_channel; + bool springbrake_active; }; typedef std::tuple, std::unique_ptr> screen_entry; typedef std::vector screen_map; diff --git a/uart.cpp b/uart.cpp index 69bd4382..6290772d 100644 --- a/uart.cpp +++ b/uart.cpp @@ -280,7 +280,8 @@ void uart_input::poll() m_trainstatecab << 2 | trainstate.recorder_braking << 3 | trainstate.recorder_power << 4 - | trainstate.radio_stop <<5 + | trainstate.radio_stop << 5 + | trainstate.springbrake_active << 6 | trainstate.alerter_sound << 7), //byte 7-8 SPLIT_INT16(brake_press),