Bug fix

TetsuOtter · Apr 30, 2019 · 0e6017c · 0e6017c
1 parent 26c82b1
commit 0e6017c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/LimExpTIMS/Keiki.cs b/LimExpTIMS/Keiki.cs
@@ -72,8 +72,8 @@ static internal unsafe void Elapse(int* Pa)
 
       if (IsADCChangeChacking)
       {
-        int TimeDifference = Ats.StateD.T - (int)ADCCheckStartTime;
         if (ADCCheckStartTime == null) ADCCheckStartTime = Ats.StateD.T;
+        int TimeDifference = Ats.StateD.T - (int)ADCCheckStartTime;
         if (TimeDifference > ADCChangeCheckLength || TimeDifference < 0)
         {
           ADCCheckStartTime = null;
@@ -92,29 +92,31 @@ static internal unsafe void Elapse(int* Pa)
           if (Pa[Panel.GCP.ACDCLamp] == 1)//DC区間の場合
           {
             Pa[Panel.GCP.AccidentLamp] = 1;//事故
+            Pa[Panel.GCP.ThreePhaseLamp] = 1;//三相
 
             Pa[Panel.GCP.DCVolNeedle] = 0;//直流電圧系の針
             Pa[Panel.GCP.DCVolUnusual] = 1;//DC電圧異常
 
             Pa[Panel.Cab.VCBState] = 3;//VCB状態(両点灯)
 
             Pa[Panel.GCP.ControlVolNeedle] = 87 - (TimeDifference / ControlVoltageDecSPD);//制御電圧計の針
-            Pa[Panel.GCP.ControlVolUnusual] = 0;//制御電圧異常
+            Pa[Panel.GCP.ControlVolUnusual] = 1;//制御電圧異常
             Pa[Panel.GCP.ControlVol10] = Pa[Panel.GCP.ControlVolNeedle] / 10;//制御電圧10の位
             Pa[Panel.GCP.ControlVol1] = Pa[Panel.GCP.ControlVolNeedle] % 10;//制御電圧1の位
 
           }
           else if (Pa[Panel.GCP.ACDCLamp] == 2)//AC区間の場合
           {
             Pa[Panel.GCP.AccidentLamp] = 1;//事故
+            Pa[Panel.GCP.ThreePhaseLamp] = 1;//三相
 
             Pa[Panel.GCP.ACVolNeedle] = 0;//交流電圧系の針
             Pa[Panel.GCP.ACVolUnusual] = 1;//AC電圧異常
 
             Pa[Panel.Cab.VCBState] = 3;//VCB状態(両点灯)
 
             Pa[Panel.GCP.ControlVolNeedle] = 87 - (TimeDifference / ControlVoltageDecSPD);//制御電圧計の針
-            Pa[Panel.GCP.ControlVolUnusual] = 0;//制御電圧異常
+            Pa[Panel.GCP.ControlVolUnusual] = 1;//制御電圧異常
             Pa[Panel.GCP.ControlVol10] = Pa[Panel.GCP.ControlVolNeedle] / 10;//制御電圧10の位
             Pa[Panel.GCP.ControlVol1] = Pa[Panel.GCP.ControlVolNeedle] % 10;//制御電圧1の位
           }