diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index ad6f1f61..dd4f11f7 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1387,6 +1387,7 @@ class TMoverParameters int FFEDListSize = 0; TWiperSchemeTable WiperList; int WiperListSize; + int WiperDefaultPos; int modernWpierListSize; double Vadd = 1.0; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index c3466532..e381a059 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -11400,11 +11400,12 @@ void TMoverParameters::LoadFIZ_WiperList(std::string const &Input) { extract_value(WiperListSize, "Size", Input, ""); extract_value(WiperAngle, "Angle", Input, ""); + extract_value(WiperDefaultPos, "Default", Input, ""); } void TMoverParameters::LoadFIZ_DimmerList(std::string const &Input) { - extract_value(modernWpierListSize, "Size", Input, ""); + //extract_value(modernWpierListSize, "Size", Input, ""); extract_value(modernDimmerCanCycle, "Cycle", Input, ""); extract_value(modernDimmerDefaultPosition, "DefaultPos", Input, ""); } @@ -11806,6 +11807,10 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) if( LightsPosNo > 0 ) LightsPos = LightsDefPos; + + // set default wiper switch position + wiperSwitchPos = WiperDefaultPos; + if (CompressorListPosNo > 0) CompressorListPos = CompressorListDefPos;