feat:解决冲突

Firmware/Source/Application/BackLight/BackLight.c

@@ -6,7 +6,7 @@
 
 
 #define BACK_LIGHT_DAY 200
-#define  openLED_flag  (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF &&(ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) <= 16000 && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) >= 9000))
+#define  openLED_flag  (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF )
 uint8_t interact_PWM_Low_Duty = 0;
 
 void BackLight_Process(void)
@@ -17,26 +17,26 @@ void BackLight_Process(void)
         //电量
         if (Get_EleDial_AllSOC_lenth() == 2 || checkself_seg_Flag == 1)
         {
-            RTE_GPIO_Config(RTE_GPIO_PORT03_PIN00, GpioOut_High);//百位
-            RTE_GPIO_Config(RTE_GPIO_PORT02_PIN04, GpioOut_High); 
+            RTE_GPIO_Set_Level(RTE_GPIO_PORT03_PIN00, RTE_GPIO_LEVEL_HIGH);//百位
+            RTE_GPIO_Set_Level(RTE_GPIO_PORT02_PIN04, RTE_GPIO_LEVEL_HIGH); 
         }
         else if(Get_EleDial_AllSOC_lenth() == 1)
         {
-            RTE_GPIO_Config(RTE_GPIO_PORT03_PIN00, GpioOut_Low);
-            RTE_GPIO_Config(RTE_GPIO_PORT02_PIN04, GpioOut_High); 
+            RTE_GPIO_Set_Level(RTE_GPIO_PORT03_PIN00, RTE_GPIO_LEVEL_LOW);
+            RTE_GPIO_Set_Level(RTE_GPIO_PORT02_PIN04, RTE_GPIO_LEVEL_HIGH); 
         }
         else
         {
-            RTE_GPIO_Config(RTE_GPIO_PORT03_PIN00, GpioOut_Low);
-            RTE_GPIO_Config(RTE_GPIO_PORT02_PIN04, GpioOut_Low); 
+            RTE_GPIO_Set_Level(RTE_GPIO_PORT03_PIN00, RTE_GPIO_LEVEL_LOW);
+            RTE_GPIO_Set_Level(RTE_GPIO_PORT02_PIN04, RTE_GPIO_LEVEL_LOW); 
         }
         
     }
     else
     {
         TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 0);
-        RTE_GPIO_Config(RTE_GPIO_PORT03_PIN00, GpioOut_Low);
-        RTE_GPIO_Config(RTE_GPIO_PORT02_PIN04, GpioOut_Low); 
+        RTE_GPIO_Set_Level(RTE_GPIO_PORT03_PIN00, RTE_GPIO_LEVEL_LOW);
+        RTE_GPIO_Set_Level(RTE_GPIO_PORT02_PIN04, RTE_GPIO_LEVEL_LOW); 
     }
 }
 
@@ -47,25 +47,25 @@ void BackLight_Clock_All_Process(void)
         //总计时间
         if (Get_Clock_All_lenth() == 2|| checkself_seg_Flag == 1)
         {
-            RTE_GPIO_Config(RTE_GPIO_PORT01_PIN05, GpioOut_High);     //总计工作时长统计千位_MCU_OUT
-            RTE_GPIO_Config(RTE_GPIO_PORT01_PIN06, GpioOut_High);     //总计工作时长统计百十位_MCU_OUT
+            RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN05, RTE_GPIO_LEVEL_HIGH);     //总计工作时长统计千位_MCU_OUT
+            RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN06, RTE_GPIO_LEVEL_HIGH);     //总计工作时长统计百十位_MCU_OUT
         }
         else if(Get_Clock_All_lenth() == 1)
         {
-            RTE_GPIO_Config(RTE_GPIO_PORT01_PIN05, GpioOut_Low);     //总计工作时长统计千位_MCU_OUT
-            RTE_GPIO_Config(RTE_GPIO_PORT01_PIN06, GpioOut_High);     //总计工作时长统计百十位_MCU_OUT
+            RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN05, RTE_GPIO_LEVEL_LOW);     //总计工作时长统计千位_MCU_OUT
+            RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN06, RTE_GPIO_LEVEL_HIGH);     //总计工作时长统计百十位_MCU_OUT
         }
         else
         {
-            RTE_GPIO_Config(RTE_GPIO_PORT01_PIN05, GpioOut_Low);     //总计工作时长统计千位_MCU_OUT
-            RTE_GPIO_Config(RTE_GPIO_PORT01_PIN06, GpioOut_Low);     //总计工作时长统计百十位_MCU_OUT 
+            RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN05, RTE_GPIO_LEVEL_LOW);     //总计工作时长统计千位_MCU_OUT
+            RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN06, RTE_GPIO_LEVEL_LOW);     //总计工作时长统计百十位_MCU_OUT 
         }
         
     }
     else
     {
-        RTE_GPIO_Config(RTE_GPIO_PORT01_PIN05, GpioOut_Low);     //总计工作时长统计千位_MCU_OUT
-        RTE_GPIO_Config(RTE_GPIO_PORT01_PIN06, GpioOut_Low);     //总计工作时长统计百十位_MCU_OUT 
+        RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN05, RTE_GPIO_LEVEL_LOW);     //总计工作时长统计千位_MCU_OUT
+        RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN06, RTE_GPIO_LEVEL_LOW);     //总计工作时长统计百十位_MCU_OUT 
     }
 }
 

Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.h

@@ -36,7 +36,6 @@ typedef enum
     CHRG_PLUGIN,
     CHRGING,
     CHRGEND,
-
 } POWER_CHECK_STATE_t;
 
 typedef enum
@@ -64,6 +63,8 @@ extern const st_CAN_SendAttribute    CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL]
 #define  CAN_CH0_ID_CAN_0x18200A21_Msg    0x18200A21ul
 #define  CAN_CH0_ID_CAN_0x134_Msg         0x134ul
 
+
+
 extern uint8_t  Get_CAN_CH0_ID_398_Sig_ICU_SN0(void);
 extern uint8_t  Get_CAN_CH0_ID_398_Sig_ICU_SN1(void);
 extern uint8_t  Get_CAN_CH0_ID_398_Sig_ICU_SN2(void);
@@ -104,10 +105,40 @@ extern uint8_t  Get_CAN_CH0_ID_339_Sig_MMCU_SingleWorkingHours(void);
 extern uint8_t  Get_CAN_CH0_ID_18200A21_Sig_SBMS_Soc(void);
 extern uint8_t  Get_CAN_CH0_ID_134_Sig_SMCU_ErrorGrage(void);
 
+
+extern uint8_t Get_CAN_Num_BMCU_ErrorGrage(void);
+extern uint8_t Get_CAN_Num_BMCU_BladeSpeedGear(void);
+extern uint8_t Get_CAN_Num_BMCU_PTOSwicthState(void);
+extern uint8_t Get_CAN_Num_BMCU_Moto2_Locked_RotorFault(void);
+extern uint8_t Get_CAN_Num_BMCU_Moto1_Locked_RotorFault(void);
+extern uint8_t Get_CAN_Num_MBMS_Soc(void);
+extern uint8_t Get_CAN_Num_MBMS_TOTALWorkState(void);
+extern uint8_t Get_CAN_Num_MBMS_TOTALSigOn(void);
+extern uint8_t Get_CAN_Num_MBMS_TOTALSigAcc(void);
+extern uint8_t Get_CAN_Num_MBMS_TOTALSigCharge(void);
+extern uint8_t Get_CAN_Num_MBMS_StatSoc(void);
+extern uint8_t Get_CAN_Num_MBMS_StatBattChargeState(void);
+extern uint8_t Get_CAN_Num_MBMS_StatBattWorkState(void);
+extern uint8_t Get_CAN_Num_MMCU_ErrorGrage(void);
+extern uint8_t Get_CAN_Num_MMCU_ChgProtectState(void);
+extern uint8_t Get_CAN_Num_MMCU_DCDCEnableState(void);
+extern uint8_t Get_CAN_Num_MMCU_ParkingGearState(void);
+extern uint8_t Get_CAN_Num_MMCU_SeatDetectState(void);
+extern uint8_t Get_CAN_Num_MMCU_LockMotoState(void);
+extern uint8_t Get_CAN_Num_MMCU_EBSState(void);
+extern uint8_t Get_CAN_Num_MMCU_TravelSpeedGear(void);
+extern uint8_t Get_CAN_Num_MMCU_PowerMode(void);
+extern uint8_t Get_CAN_Num_MMCU_WorkState(void);
+extern uint16_t Get_CAN_Num_MMCU_AccumulatedWorkHours(void);
+extern uint8_t Get_CAN_Num_MMCU_SingleWorkingHours(void);
+extern uint8_t Get_CAN_Num_SBMS_Soc(void);
+extern uint8_t Get_CAN_Num_SMCU_ErrorGrage(void);
+
 extern uint8_t  Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID);
 extern uint8_t System_Indicator_CANFlag;
-void System_Indicator_ON_callback(void);
-void System_Indicator_OFF_callback(void);
+extern void Set_CAN_ALL_Signal(void);
+void System_Indicator_ON_callback(canlib_uint8_t CopyData []);
+void System_Indicator_OFF_callback(canlib_uint8_t CopyData []);
 extern  uint8_t Get_CAN_Power_State(void);
 
 #endif

Firmware/Source/Component/System_Monitor/System_Monitor_User.c

@@ -10,10 +10,10 @@
 #define u16ENTER_LOW_Y_RANGE  9000U    
 #define u16EXIT_LOW_Y_RANGE   10000U   
 
-#define u16EXIT_HIGH_Y_RANGE  17500U  
-#define u16ENTER_HIGH_Y_RANGE 18000U  
-#define u16EXIT_HIGH_N_RANGE  17500U 
-#define u16ENTER_HIGH_N_RANGE 18000U  
+#define u16EXIT_HIGH_Y_RANGE  16000U  
+#define u16ENTER_HIGH_Y_RANGE 17500U  
+#define u16EXIT_HIGH_N_RANGE  18000U 
+#define u16ENTER_HIGH_N_RANGE 18500U  
 #define u16Top_Vol            0xffffu 
 
 
@@ -36,7 +36,7 @@ static const monitorlib_uint16_t  SysFun_Range [ 26u ] = {
     u16ENTER_HIGH_N_RANGE,
 
     u16Top_Vol,
-    2500,
+    5000,
     50u,
     u16Base_Vol,
 

Firmware/Source/Component/Telltales/Telltales_user.c

@@ -252,8 +252,8 @@ static void            LED_Grass_Full_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_OVERLOAD_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_38E_Sig_BMCU_Moto1_Locked_RotorFault();
-    Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_38E_Sig_BMCU_Moto2_Locked_RotorFault();
+    Tellib_uint8_t Signal1 = Get_CAN_Num_BMCU_Moto1_Locked_RotorFault();
+    Tellib_uint8_t Signal2 = Get_CAN_Num_BMCU_Moto2_Locked_RotorFault();
     if ((Signal1 == 0x1 || Signal2 == 0x1) && openLED_flag)
     {
         LED_STATE = 1;
@@ -307,7 +307,7 @@ static void            LED_READY_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_Seat_Detection_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_SeatDetectState();
+    Tellib_uint8_t Signal1 = Get_CAN_Num_MMCU_SeatDetectState();
     if (Signal1 == 0x1 && openLED_flag)
     {
         LED_STATE = 1;
@@ -343,7 +343,7 @@ static void            LED_Seat_Detection_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_Key_Access_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigAcc();
+    Tellib_uint8_t Signal1 = Get_CAN_Num_MBMS_TOTALSigAcc();
     if (Signal1 == 0x1 && openLED_flag)
     {
         LED_STATE = 1;
@@ -370,10 +370,10 @@ static void            LED_Key_Access_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_Battery_Charging_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigAcc();
-    Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigCharge();
+    Tellib_uint8_t Signal1 = Get_CAN_Num_MBMS_TOTALSigAcc();
+    Tellib_uint8_t Signal2 = Get_CAN_Num_MBMS_TOTALSigCharge();
     Tellib_uint8_t Signal3 = Get_CAN_Power_State();
-    if(ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) >= 9000 && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) <= 16000 && (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF && Charge_OFF_Flag != 2))
+    if( (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF && Charge_OFF_Flag != 2))
     {
         if ((Signal1 == 0x1 || Signal1 == 0x0 ) && Signal2 == 0X1)
         {
@@ -423,8 +423,8 @@ static void            LED_Battery_Charging_Execution(Tellib_uint16_t led_status
 // static Tellib_uint16_t LED_Battery_Charging_POWEROFF_Judgement(void)
 // {
 //     Tellib_uint16_t LED_STATE = 0u;
-//     Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigAcc();
-//     Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigCharge();
+//     Tellib_uint8_t Signal1 = Get_CAN_Num_MBMS_TOTALSigAcc();
+//     Tellib_uint8_t Signal2 = Get_CAN_Num_MBMS_TOTALSigCharge();
 //     Tellib_uint8_t Signal3 = Get_CAN_CH0_ID_125_Sig_MMCU_PowerMode();
 //     if(ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) >= 9 && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) <= 16)
 //     {
@@ -449,8 +449,8 @@ static void            LED_Battery_Charging_Execution(Tellib_uint16_t led_status
 static Tellib_uint16_t LED_Cutterhead_Switch_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_157_Sig_BMCU_PTOSwicthState();
-    if (Signal1 == 0x1 && openLED_flag)
+    Tellib_uint8_t Signal1 = Get_CAN_Num_BMCU_PTOSwicthState();
+    if (Signal1 == 0x1 && openLED_flag && (Get_CAN_Power_State() == READY))
     {
         LED_STATE = 1;
     }
@@ -476,8 +476,8 @@ static void            LED_Cutterhead_Switch_Execution(Tellib_uint16_t led_statu
 static Tellib_uint16_t LED_GEAR_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_TravelSpeedGear();
-    Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_125_Sig_MMCU_ParkingGearState();
+    Tellib_uint8_t Signal1 = Get_CAN_Num_MMCU_TravelSpeedGear();
+    Tellib_uint8_t Signal2 = Get_CAN_Num_MMCU_ParkingGearState();
     if(Signal2 != 0x1 && Charge_OFF_Flag == 0)
     {
         if (Signal1 == 0x1 || Signal1 == 0x2)
@@ -693,8 +693,8 @@ static void            LED_Tire_pressure_R_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_Gears_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_TravelSpeedGear();
-    Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_125_Sig_MMCU_ParkingGearState();
+    Tellib_uint8_t Signal1 = Get_CAN_Num_MMCU_TravelSpeedGear();
+    Tellib_uint8_t Signal2 = Get_CAN_Num_MMCU_ParkingGearState();
     if(Signal2 != 0x1  && openLED_flag)
     {
         if (Signal1 == 0x1 || Signal1 == 0x2)
@@ -728,9 +728,9 @@ static void            LED_Gears_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_Cutterhead_Gear_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_157_Sig_BMCU_BladeSpeedGear();
-    Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_157_Sig_BMCU_ErrorGrage();
-    if((Signal2 == 0x1 || Signal2 == 0x2 || Signal2 == 0x3 || Signal2 == 0x4)  && openLED_flag)
+    Tellib_uint8_t Signal1 = Get_CAN_Num_BMCU_BladeSpeedGear();
+    Tellib_uint8_t Signal2 = Get_CAN_Num_BMCU_ErrorGrage();
+    if((Signal2 == 0x1 || Signal2 == 0x2 || Signal2 == 0x3 || Signal2 == 0x4)  && openLED_flag && (Get_CAN_Power_State() == READY))
     {
         if(Signal1 == 0x1 || Signal1 == 0x2 || Signal1 == 0x3)
         {
@@ -741,7 +741,7 @@ static Tellib_uint16_t LED_Cutterhead_Gear_Judgement(void)
             LED_STATE = 0;
         }
     }
-    else if (Signal2 == 0x0  && openLED_flag)
+    else if (Signal2 == 0x0  && openLED_flag && (Get_CAN_Power_State() == READY))
     {
         if(Signal1 == 0x1 || Signal1 == 0x2 || Signal1 == 0x3)
         {
@@ -832,8 +832,8 @@ static void            LED_Fault_Codes_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_SystIndicator_R_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_ErrorGrage();
-    Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_134_Sig_SMCU_ErrorGrage();
+    Tellib_uint8_t Signal1 = Get_CAN_Num_MMCU_ErrorGrage();
+    Tellib_uint8_t Signal2 = Get_CAN_Num_SMCU_ErrorGrage();
     Tellib_uint8_t Signal3 = System_Indicator_CANFlag;
     if ((Signal1 == 0x4 || Signal1 == 0x5 ||Signal2 == 0x4 || Signal2 == 0x5 || Signal3 == 1)  && openLED_flag)
     {
@@ -862,7 +862,7 @@ static void            LED_SystIndicator_R_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_P_GEAR_G_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_ParkingGearState();
+    Tellib_uint8_t Signal1 = Get_CAN_Num_MMCU_ParkingGearState();
     Tellib_uint8_t Signal2 = Get_CAN_Power_State();
     if ( Signal1 == 0x1  && openLED_flag && checkself_seg_Flag == 0)
     {
@@ -931,7 +931,7 @@ static void            LED_Fuel_Alarm_W_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_Charging_Connection_R_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattChargeState();
+    Tellib_uint8_t Signal1 = Get_CAN_Num_MBMS_StatBattChargeState();
     if ((Signal1 == 0x1 || Signal1 == 0x2 ||Signal1 == 0x3) && (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF))
     {
         LED_STATE = 1;
@@ -959,7 +959,7 @@ static void            LED_Charging_Connection_R_Execution(Tellib_uint16_t led_s
 static Tellib_uint16_t LED_Power_Battery_Failure_R_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    // Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattChargeState();
+    // Tellib_uint8_t Signal1 = Get_CAN_Num_MBMS_StatBattChargeState();
     // if (Signal1 == 0x1 || Signal1 == 0x2 ||Signal1 == 0x3)
     // {
     //     LED_STATE = 1;

Firmware/Source/System/Sys_Task_List.c

@@ -44,6 +44,7 @@ void Sys_50ms_Tasks(void)
     BU98R10_Update_Request();
     LED_Driver_Scan_Refresh();
     Telltales_Management();
+    Set_CAN_ALL_Signal();
     Gauge_Service();
 }