Merge branch 'tmj-dev' into milek-dev

2026-07-18 22:39:18 +02:00 · 2018-09-20 22:00:02 +02:00
parent d9687a4e1f 2448e59dc8
commit d9020b5881
39 changed files with 2997 additions and 2171 deletions
--- a/uart.cpp
+++ b/uart.cpp
@@ -253,7 +253,8 @@ void uart_input::poll()
                trainstate.ventilator_overload << 1
              | trainstate.motor_overload_threshold << 2),
            //byte 3
-			0,
+			(uint8_t)(
+                trainstate.coupled_hv_voltage_relays << 0),
            //byte 4
 			(uint8_t)(
                trainstate.train_heating << 0