Engine idle, Generating 시퀀스 수정

Oper.c

@@ -10,10 +10,7 @@
 #define ENGINE_OPERATION_SPEED  (2400U)
 #define ENGINE_DIFF_SPEED       (400U)  // 2800 - 2400
 
-// IDLE_SEQ_MOD
-#define RPM_RAMP_START          (1500U)
 #define RPM_RAMP_END            (2400U)
-#define RPM_RAMP_RANGE          (RPM_RAMP_END - RPM_RAMP_START)   // 900
 #define TIME_RAMP_UP            (TIME_1SEC * 3UL)                 // 3초
 
 #define LED_OFF    (0U)
@@ -39,6 +36,7 @@ static void CProcessApuStateGenerating(void);
 static void CProcessApuStateCooldown(void);
 static void CProcessApuStateStopping(void);
 static void CProcessApuStateTransition(void); // 비상/시동/정지 전이 판별용
+static void CExecuteApuState(Uint16 uiState);
 static void CSetEngineActualRpm(Uint16 Rpm);
 static float32 CGetGcuLoadPower(void);
 static Uint16 CDynamicRpmControl(void);
@@ -123,40 +121,18 @@ static void CProcessApuStateRetryCranking(void)
 
 static void CProcessApuStateEngineIdle(void)
 {
-#if 0 // '0' - 기존 코드, '1' - IDLE_SEQ_MOD
-    if (((Rx301.State >> 1U) & 0x07U) == (Uint16)IDX_ECU_STAT_OPERATION)
-    {
-        // 보조엔진제어기의 상태가 OPERATION이고 보조엔진의 속도가 2300 RPM 이상 5초 유지 시 발전상태로 전환
-        if (CGetEngineActualRpm() >= (ENGINE_OPERATION_SPEED - 100U)) // 2300 RPM
-        {
-            if (CSoftWaitCountProcedure(SOFTTIMER_WAIT_OPERATION, TIME_5SEC) == (Uint16)TIME_OVER)
-            {
-                GeneralOperValue.uiApuState = (Uint16)IDX_APU_OPER_GENERATING;
-            }
-        }
-        else
-        {
-            CSoftWaitCountClear(SOFTTIMER_WAIT_OPERATION);
-        }
-    }
-#else
     if (((Rx301.State >> 1U) & 0x07U) == (Uint16)IDX_ECU_STAT_OPERATION)
     {
         // ECU OPERATION 확인 즉시 발전 상태로 전환 (RPM Ramp는 CProcessApuStateGenerating에서 수행)
         GeneralOperValue.ulRampStartClock = 0UL;
         GeneralOperValue.uiApuState       = (Uint16)IDX_APU_OPER_GENERATING;
     }
-#endif
 }
 
 static void CProcessApuStateGenerating(void)
 {
-#if 0 // '0' - 기존 코드, '1' - IDLE_SEQ_MOD
-    CSetGcuCommand((Uint16)IDX_GCU_CMD_GENERATING); // 발전 명령 송신
-    GeneralOperValue.uiDynamicRPM = CDynamicRpmControl();
-    CSetEngineActualRpm(GeneralOperValue.uiDynamicRPM); // RPM 가변 제어 시작
-#else
     Uint32 ulElapsed;
+    Uint16 uiRampRange;
     Uint16 uiRampRpm;
 
     CSetGcuCommand((Uint16)IDX_GCU_CMD_GENERATING);
@@ -170,27 +146,29 @@ static void CProcessApuStateGenerating(void)
     {
         if (GeneralOperValue.ulRampStartClock == 0UL)
         {
+            Uint16 uiActual = CGetEngineActualRpm();
+            GeneralOperValue.uiRampStartRpm   = (uiActual < RPM_RAMP_END) ? uiActual : RPM_RAMP_END;
             GeneralOperValue.ulRampStartClock = CGetSoftClock();
-            CSetEngineActualRpm(RPM_RAMP_START);
+            CSetEngineActualRpm(GeneralOperValue.uiRampStartRpm);
         }
         else
         {
-            ulElapsed = (CGetSoftClock() + SYSTEM_10MIN_TIME - GeneralOperValue.ulRampStartClock) % SYSTEM_10MIN_TIME;
+            ulElapsed  = (CGetSoftClock() + SYSTEM_10MIN_TIME - GeneralOperValue.ulRampStartClock) % SYSTEM_10MIN_TIME;
+            uiRampRange = RPM_RAMP_END - GeneralOperValue.uiRampStartRpm; // 동적 범위
 
             if (ulElapsed < TIME_RAMP_UP)
             {
-                uiRampRpm = (Uint16)(RPM_RAMP_START + (Uint16)(((Uint32)RPM_RAMP_RANGE * ulElapsed) / TIME_RAMP_UP));
+                uiRampRpm = (Uint16)(GeneralOperValue.uiRampStartRpm + (Uint16)(((Uint32)uiRampRange * ulElapsed) / TIME_RAMP_UP));
                 CSetEngineActualRpm(uiRampRpm);
             }
             else
             {
-                GeneralOperValue.uiRampComplete    = 1U;
-                GeneralOperValue.uiDynamicRPM      = CDynamicRpmControl();
+                GeneralOperValue.uiRampComplete = 1U;
+                GeneralOperValue.uiDynamicRPM   = CDynamicRpmControl();
                 CSetEngineActualRpm(GeneralOperValue.uiDynamicRPM);
             }
         }
     }
-#endif
 }
 
 static void CProcessApuStateCooldown(void)
@@ -292,49 +270,53 @@ void CApuOperProcedure(void)
             CSetAuxCtrlPin(IDX_CS_FUEL_PUMP, FuelPumpSig);
         }
 
-        // 각 상태별 동작 수행
-        switch (GeneralOperValue.uiApuState)
+        CExecuteApuState(GeneralOperValue.uiApuState);
+    }
+}
+
+static void CExecuteApuState(Uint16 uiState)
+{
+    switch (uiState)
+    {
+        case (Uint16)IDX_APU_OPER_READY:
         {
-            case (Uint16)IDX_APU_OPER_READY:
-            {
-                CProcessApuStateReady();
-                break;
-            }
-            case (Uint16)IDX_APU_OPER_PREHEAT:
-            {
-                CProcessApuStatePreheat();
-                break;
-            }
-            case (Uint16)IDX_APU_OPER_CRANKING:
-            {
-                CProcessApuStateCranking();
-                break;
-            }
-            case (Uint16)IDX_APU_OPER_RETRY_CRANKING:
-            {
-                CProcessApuStateRetryCranking();
-                break;
-            }
-            case (Uint16)IDX_APU_OPER_ENGINE_IDLE:
-            {
-                CProcessApuStateEngineIdle();
-                break;
-            }
-            case (Uint16)IDX_APU_OPER_GENERATING:
-            {
-                CProcessApuStateGenerating();
-                break;
-            }
-            case (Uint16)IDX_APU_OPER_COOLDOWN:
-            {
-                CProcessApuStateCooldown();
-                break;
-            }
-            default:
-            {
-                CProcessApuStateStopping();
-                break;
-            }
+            CProcessApuStateReady();
+            break;
+        }
+        case (Uint16)IDX_APU_OPER_PREHEAT:
+        {
+            CProcessApuStatePreheat();
+            break;
+        }
+        case (Uint16)IDX_APU_OPER_CRANKING:
+        {
+            CProcessApuStateCranking();
+            break;
+        }
+        case (Uint16)IDX_APU_OPER_RETRY_CRANKING:
+        {
+            CProcessApuStateRetryCranking();
+            break;
+        }
+        case (Uint16)IDX_APU_OPER_ENGINE_IDLE:
+        {
+            CProcessApuStateEngineIdle();
+            break;
+        }
+        case (Uint16)IDX_APU_OPER_GENERATING:
+        {
+            CProcessApuStateGenerating();
+            break;
+        }
+        case (Uint16)IDX_APU_OPER_COOLDOWN:
+        {
+            CProcessApuStateCooldown();
+            break;
+        }
+        default:
+        {
+            CProcessApuStateStopping();
+            break;
         }
     }
 }
@@ -384,10 +366,6 @@ static void CInitialStandby(void)
 
     GeneralOperValue.uiEmergency = 0U;
 
-    GeneralOperValue.ulRampStartClock = 0UL; // IDLE_SEQ_MOD
-
-    GeneralOperValue.uiRampComplete = 0U; // IDLE_SEQ_MOD
-
     GpioDataRegs.GPBCLEAR.bit.GPIO55 = 1U; // GPIO_FAULT_CMD
 }
 
@@ -409,10 +387,6 @@ static void CEmergencyStop(void)
 
     GeneralOperValue.uiEmergency = 1U;
 
-    GeneralOperValue.ulRampStartClock = 0UL; // IDLE_SEQ_MOD
-
-    GeneralOperValue.uiRampComplete = 0U; // IDLE_SEQ_MOD
-
     GpioDataRegs.GPBSET.bit.GPIO55 = 1U; //GPIO_FAULT_CMD
 }
 
@@ -468,12 +442,7 @@ void CSetEcuCommand(Uint16 Command)
         // [ECU_OPER_CMD_START]
         GeneralOperValue.EcuCommand.EngineStart = 1U;
         GeneralOperValue.EcuCommand.EngineStop = 0U;
-#if 0 // RPM 테스트
-        CSetEngineActualRpm(Rx400.SetRPM.PCAN_RPM);
-#else
-        //CSetEngineActualRpm(2400U);
-        CSetEngineActualRpm(1500U); // Target Idle
-#endif
+        CSetEngineActualRpm(1200U);
     }
 }
 
@@ -482,21 +451,8 @@ int16 CGetEngCoolantTemperature(void)
     return (int16) Rx321.CoolantTemperature - 40; // 온도 오프셋 -40도
 }
 
-void CDebugModeProcedure(void)
+void CMaintenanceProcedure(void)
 {
-    if (GeneralOperValue.Maintenance.ManualCranking == 1U)
-    {
-        if (GeneralOperValue.uiFaultOccured == 0U)
-        {
-            // 알람이 없을 경우만 동작 하도록 함.
-            CSetGcuCommand((Uint16)IDX_GCU_CMD_CRANKING);
-        }
-    }
-    else
-    {
-        CSetGcuCommand((Uint16)IDX_GCU_CMD_STOP);
-    }
-
     if (GeneralOperValue.Maintenance.LampTest == 1U)
     {
         CLedControl(0U, 1U);