Merge branch 'tmj-dev'

2026-07-18 04:19:19 +02:00 · 2018-03-11 21:19:53 +01:00
parent 81a6d753e5 d96b259191
commit dd0fa23e11
15 changed files with 58 additions and 62 deletions
--- a/uart.cpp
+++ b/uart.cpp
@@ -272,6 +272,7 @@ void uart_input::poll()
 			(uint8_t)(
                trainstate.recorder_braking << 3
              | trainstate.recorder_power << 4
+              | trainstate.radio_stop <<5
              | trainstate.alerter_sound << 7),
            //byte 7-8
 	        SPLIT_INT16(brake_press),