Merge branch 'milek-dev' into gfx-work

McZapkie/MOVER.h

@@ -1289,7 +1289,7 @@ public:
 	/*! pomocniczy nastawnik:*/
 	bool IncScndCtrl(int CtrlSpeed);
 	bool DecScndCtrl(int CtrlSpeed);
-
+	int GetVirtualScndPos();
 
 	bool AddPulseForce(int Multipler);/*dla drezyny*/
 

McZapkie/Mover.cpp

@@ -2064,6 +2064,16 @@ bool TMoverParameters::DecScndCtrl(int CtrlSpeed)
     return OK;
 }
 
+int TMoverParameters::GetVirtualScndPos()
+{
+	if (TrainType == dt_ET42)
+	{
+		if (DynamicBrakeFlag && !ScndCtrlPos)
+			return -1;
+	}
+	return ScndCtrlPos;
+}
+
 // *************************************************************************************************
 // Q: 20160710
 // załączenie rozrządu

Train.cpp

@@ -898,14 +898,13 @@ void TTrain::OnCommand_secondcontrollerdecreasefast( TTrain *Train, command_data
 }
 
 void TTrain::OnCommand_secondcontrollerset( TTrain *Train, command_data const &Command ) {
-
     auto const targetposition { std::min<int>( Command.param1, Train->mvControlled->ScndCtrlPosNo ) };
-    while( ( targetposition < Train->mvControlled->ScndCtrlPos )
+    while( ( targetposition < Train->mvControlled->GetVirtualScndPos() )
         && ( true == Train->mvControlled->DecScndCtrl( 1 ) ) ) {
         // all work is done in the header
         ;
     }
-    while( ( targetposition > Train->mvControlled->ScndCtrlPos )
+    while( ( targetposition > Train->mvControlled->GetVirtualScndPos() )
         && ( true == Train->mvControlled->IncScndCtrl( 1 ) ) ) {
         // all work is done in the header
         ;

uart.cpp

@@ -197,7 +197,7 @@ void uart_input::poll()
             // second controller
             relay.post(
                 user_command::secondcontrollerset,
-                buffer[ 7 ],
+                static_cast<int8_t>(buffer[ 7 ]),
                 0,
                 GLFW_PRESS,
                 // TODO: pass correct entity id once the missing systems are in place