eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 15:09:19 +02:00
Code Issues 123 Wiki Activity

springbrakeactive on uart

Browse Source
This commit is contained in:
milek7
2019-09-07 15:49:33 +02:00
parent c344f5cfc2
commit 7fd594ce51
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Train.cpp
View File

@@ -616,7 +616,8 @@ TTrain::get_state() const {
{ fHCurrent[ ( mvControlled->TrainType & dt_EZT ) ? 0 : 1 ], fHCurrent[ 2 ], fHCurrent[ 3 ] }, { fHCurrent[ ( mvControlled->TrainType & dt_EZT ) ? 0 : 1 ], fHCurrent[ 2 ], fHCurrent[ 3 ] },
ggLVoltage.GetValue(), ggLVoltage.GetValue(),
mvOccupied->DistCounter, mvOccupied->DistCounter,
iRadioChannel iRadioChannel,
btLampkaSpringBrakeActive.GetValue()
}; };
} }

1
Train.h
View File

@@ -105,6 +105,7 @@ class TTrain {
float lv_voltage; float lv_voltage;
double distance; double distance;
int radio_channel; int radio_channel;
bool springbrake_active;
}; };
typedef std::tuple<std::string, std::shared_ptr<python_rt>, std::unique_ptr<python_screen_viewer>> screen_entry; typedef std::tuple<std::string, std::shared_ptr<python_rt>, std::unique_ptr<python_screen_viewer>> screen_entry;
typedef std::vector<screen_entry> screen_map; typedef std::vector<screen_entry> screen_map;

3
uart.cpp
View File

@@ -280,7 +280,8 @@ void uart_input::poll()
m_trainstatecab << 2 m_trainstatecab << 2
| trainstate.recorder_braking << 3 | trainstate.recorder_braking << 3
| trainstate.recorder_power << 4 | trainstate.recorder_power << 4
| trainstate.radio_stop <<5 | trainstate.radio_stop << 5
| trainstate.springbrake_active << 6
| trainstate.alerter_sound << 7), | trainstate.alerter_sound << 7),
//byte 7-8 //byte 7-8
SPLIT_INT16(brake_press), SPLIT_INT16(brake_press),