Merge branch 'zhengping' into 'dev'

Zhengping

See merge request !17

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvprojx

@@ -275,7 +275,7 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x8000</StartAddress>
+                <StartAddress>0x0</StartAddress>
                 <Size>0x40000</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RTE/Device/BAT32G139GK64FB/userdefine.h

@@ -16,7 +16,7 @@ User definitions
 ***********************************************************************************************************************/
 #ifndef __TYPEDEF__
 
-#define HAS_BOOTLOADER (1u) // 仅仿真App时设置为0
+#define HAS_BOOTLOADER (0u) // 仅仿真App时设置为0
 #define APP_BASE (0x00008000ul)
 
 typedef unsigned short 	MD_STATUS;

Firmware/Source/Application/CAN_User/Can_RX_User.c

@@ -241,10 +241,8 @@ uint8_t Get_CAN_Power_State(void)
     case 0x6:
         state = CHRGEND;
         break;
-    case 0x7:
-        state = POWER_CHECK_NULL;
-        break;
     default:
+        state = POWER_CHECK_NULL;
         break;
     }
     return state;

Firmware/Source/Application/GUI_Display/GUI_Display.c

@@ -81,6 +81,10 @@ void Gauge_Cutterhead_Gear_Display(void)
         {
             SEG_SET_Cutterhead(1, Signal1, 0);
         }
+        else
+        {
+            SEG_SET_Cutterhead(0, Signal1, 0);
+        }
     }
     else
     {
@@ -485,6 +489,20 @@ void Gauge_Service(void)
                 Buzzer_time++;
             }
         }
+        else
+        {
+            if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x125_Msg)) == CAN_SIG_NORMAL)
+            {
+                BUZZER_Init();
+                poweroff_time = 0;
+                Clear_Bu98();
+                interact_PWM_Low_Duty = 100;
+                for (i = 0; i < LampCh0_MAX; i++)
+                {
+                    LED_Driver_Channel_Set(LampChannel_0, i, LED_OFF);
+                }
+            }
+        }
     }
     else
     {

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -169,10 +169,10 @@ static Power_Status_em Power_Stay_OFF(void)
         {
             u8PowerSts = EM_IGN_OFF;
         }
-        else
-        {
-            u8PowerSts = EM_IGN_Sleep_Init;
-        }
+        // else
+        // {
+        //     u8PowerSts = EM_IGN_Sleep_Init;
+        // }
     }
 
     return u8PowerSts;

Firmware/Source/Component/Telltales/Telltales_user.c

@@ -471,7 +471,7 @@ static void LED_Cutterhead_Switch_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_GEAR_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    if((Charge_OFF_Flag == 0) && (System_Indicator_CANFlag != 1))
+    if((Charge_OFF_Flag == 0) && (System_Indicator_CANFlag != 1) && (Get_CAN_Power_State() != POWER_CHECK_NULL))
     {
         LED_STATE = 1;
     }

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -310,7 +310,7 @@
 #define CheckSumErr       7    // Checksum Error
 #define UnknownPartID     8    // Unknown Part ID
 
-#define SWV 0x103 // 0x100 = 1.00 software version 软件版本号
+#define SWV 0x104 // 0x100 = 1.00 software version 软件版本号
 #define HWV 0x100 // 0x100 = 1.00 hardware version 硬件版本号
 #define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
 #define INTLV 0x101 // 0x100 = 1.00 internal version 内部版本号