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

MainCtrl connected to 3rd AnalogInput

Browse Source
This commit is contained in:
Królik Uszasty
2018-07-08 11:56:42 +02:00
committed by tmj-fstate
parent d611622fad
commit 67de8b59e7
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Train.cpp
View File

@@ -5085,6 +5085,20 @@ bool TTrain::Update( double const Deltatime )
// McZapkie-080602: obroty (albo translacje) regulatorow // McZapkie-080602: obroty (albo translacje) regulatorow
if (ggMainCtrl.SubModel) { if (ggMainCtrl.SubModel) {
#ifdef _WIN32
if ((DynamicObject->Mechanik != nullptr)
&& (false == DynamicObject->Mechanik->AIControllFlag) // nie blokujemy AI
&& (Global.iFeedbackMode == 4)
&& (Global.fCalibrateIn[2][1] != 0.0)) {
auto const b = clamp<double>(
Console::AnalogCalibrateGet(2) * mvOccupied->MainCtrlPosNo,
0.0,
mvOccupied->MainCtrlPosNo);
while (mvOccupied->MainCtrlPos < b) { mvOccupied->MainCtrlPos = b - 1; mvOccupied->IncMainCtrl(1); }
while (mvOccupied->MainCtrlPos > b) { mvOccupied->MainCtrlPos = b + 1; mvOccupied->DecMainCtrl(1); }
}
#endif
if( mvControlled->CoupledCtrl ) { if( mvControlled->CoupledCtrl ) {
ggMainCtrl.UpdateValue( ggMainCtrl.UpdateValue(
double( mvControlled->MainCtrlPos + mvControlled->ScndCtrlPos ), double( mvControlled->MainCtrlPos + mvControlled->ScndCtrlPos ),
@@ -5172,7 +5186,7 @@ bool TTrain::Update( double const Deltatime )
auto const b = clamp<double>( auto const b = clamp<double>(
Console::AnalogCalibrateGet( 1 ) * 10.0, Console::AnalogCalibrateGet( 1 ) * 10.0,
0.0, 0.0,
ManualBrakePosNo ); LocalBrakePosNo );
ggLocalBrake.UpdateValue( b ); // przesów bez zaokrąglenia ggLocalBrake.UpdateValue( b ); // przesów bez zaokrąglenia
mvOccupied->LocalBrakePos = int( 1.09 * b ); // sposób zaokrąglania jest do ustalenia mvOccupied->LocalBrakePos = int( 1.09 * b ); // sposób zaokrąglania jest do ustalenia
} }