Skip to content

R
RT_RMR42E
Commit 9b6ee223 authored by 郑萍's avatar 郑萍
Browse files
Options

✨ feat:更改为中微139芯片编译以及增加外发版本号

parent 78f9927d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3236 additions and 111 deletions
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvprojx
View file @ 9b6ee223
......@@ -14,16 +14,16 @@
<uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>BAT32A239KK64FB</Device>
<Device>BAT32G139GK64FB</Device>
<Vendor>Cmsemicon</Vendor>
<PackID>Cmsemicon.BAT32A239.1.0.3</PackID>
<PackID>Cmsemicon.BAT32G139.1.0.1</PackID>
<PackURL>http://www.mcu.com.cn/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x08000) IROM(0x00000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
<StartupFile></StartupFile>
<FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN2 -FF0BAT32A239KK -FS00 -FL040000 -FF1BAT32A239_DataFlash -FS1500200 -FL1A00 -FP0($$Device:BAT32A239KK64FB$Flash\BAT32A239KK.FLM) -FP1($$Device:BAT32A239KK64FB$Flash\BAT32A239_DataFlash.FLM))</FlashDriverDll>
<FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN2 -FF0BAT32G139GK -FS00 -FL040000 -FF1BAT32G139_DataFlash -FS1500200 -FL1A00 -FP0($$Device:BAT32G139GK64FB$Flash\BAT32G139GK.FLM) -FP1($$Device:BAT32G139GK64FB$Flash\BAT32G139_DataFlash.FLM))</FlashDriverDll>
<DeviceId>0</DeviceId>
<RegisterFile>$$Device:BAT32A239KK64FB$Device\Include\BAT32A239.h</RegisterFile>
<RegisterFile>$$Device:BAT32G139GK64FB$Device\Include\BAT32G139.h</RegisterFile>
<MemoryEnv></MemoryEnv>
<Cmp></Cmp>
<Asm></Asm>
......@@ -33,7 +33,7 @@
<SLE66CMisc></SLE66CMisc>
<SLE66AMisc></SLE66AMisc>
<SLE66LinkerMisc></SLE66LinkerMisc>
<SFDFile>$$Device:BAT32A239KK64FB$SVD\BAT32A239.svd</SFDFile>
<SFDFile>$$Device:BAT32G139GK64FB$SVD\BAT32G139.svd</SFDFile>
<bCustSvd>0</bCustSvd>
<UseEnv>0</UseEnv>
<BinPath></BinPath>
......@@ -138,7 +138,7 @@
</Flash1>
<bUseTDR>1</bUseTDR>
<Flash2>BIN\UL2CM3.DLL</Flash2>
<Flash3>"" ()</Flash3>
<Flash3></Flash3>
<Flash4></Flash4>
<pFcarmOut></pFcarmOut>
<pFcarmGrp></pFcarmGrp>
......@@ -276,7 +276,7 @@
<OCR_RVCT4>
<Type>1</Type>
<StartAddress>0x0</StartAddress>
<Size>0x38000</Size>
<Size>0x40000</Size>
</OCR_RVCT4>
<OCR_RVCT5>
<Type>1</Type>
......@@ -301,7 +301,7 @@
<OCR_RVCT9>
<Type>0</Type>
<StartAddress>0x20000000</StartAddress>
<Size>0x3000</Size>
<Size>0x8000</Size>
</OCR_RVCT9>
<OCR_RVCT10>
<Type>0</Type>
......@@ -1039,14 +1039,14 @@
<targetInfo name="RMR42E"/>
</targetInfos>
</component>
<component Cclass="Device" Cgroup="ISR" Cvendor="Cmsemicon" Cversion="1.0.0" condition="BAT32A239 CMSIS-CORE">
<package name="BAT32A239" schemaVersion="1.4" url="http://www.mcu.com.cn/pack/" vendor="Cmsemicon" version="1.0.5"/>
<component Cclass="Device" Cgroup="ISR" Cvendor="Cmsemicon" Cversion="1.0.0" condition="BAT32G139 CMSIS-CORE">
<package name="BAT32G139" schemaVersion="1.4" url="http://www.mcu.com.cn/pack/" vendor="Cmsemicon" version="1.0.1"/>
<targetInfos>
<targetInfo name="RMR42E"/>
</targetInfos>
</component>
<component Cclass="Device" Cgroup="Startup" Cvendor="Cmsemicon" Cversion="1.0.0" condition="BAT32A239 CMSIS-CORE">
<package name="BAT32A239" schemaVersion="1.4" url="http://www.mcu.com.cn/pack/" vendor="Cmsemicon" version="1.0.5"/>
<component Cclass="Device" Cgroup="Startup" Cvendor="Cmsemicon" Cversion="1.0.0" condition="BAT32G139 CMSIS-CORE">
<package name="BAT32G139" schemaVersion="1.4" url="http://www.mcu.com.cn/pack/" vendor="Cmsemicon" version="1.0.1"/>
<targetInfos>
<targetInfo name="RMR42E"/>
</targetInfos>
......@@ -1054,36 +1054,28 @@
</components>
<files>
<file attr="config" category="source" name="Device\Source\isr_BAT32A239.c" version="1.0.0">
<instance index="0">RTE\Device\BAT32A239KK64FB\isr_BAT32A239.c</instance>
<instance index="0" removed="1">RTE\Device\BAT32A239KK64FB\isr_BAT32A239.c</instance>
<component Cclass="Device" Cgroup="ISR" Cvendor="Cmsemicon" Cversion="1.0.0" condition="BAT32A239 CMSIS-CORE"/>
<package name="BAT32A239" schemaVersion="1.4" url="http://www.mcu.com.cn/pack/" vendor="Cmsemicon" version="1.0.3"/>
<targetInfos>
<targetInfo name="RMR42E"/>
</targetInfos>
<targetInfos/>
</file>
<file attr="config" category="source" condition="Startup ARM" name="Device\Source\ARM\startup_BAT32A239.s" version="1.0.0">
<instance index="0">RTE\Device\BAT32A239KK64FB\startup_BAT32A239.s</instance>
<instance index="0" removed="1">RTE\Device\BAT32A239KK64FB\startup_BAT32A239.s</instance>
<component Cclass="Device" Cgroup="Startup" Cvendor="Cmsemicon" Cversion="1.0.0" condition="BAT32A239 CMSIS-CORE"/>
<package name="BAT32A239" schemaVersion="1.4" url="http://www.mcu.com.cn/pack/" vendor="Cmsemicon" version="1.0.3"/>
<targetInfos>
<targetInfo name="RMR42E"/>
</targetInfos>
<targetInfos/>
</file>
<file attr="config" category="source" name="Device\Source\system_BAT32A239.c" version="1.0.0">
<instance index="0">RTE\Device\BAT32A239KK64FB\system_BAT32A239.c</instance>
<instance index="0" removed="1">RTE\Device\BAT32A239KK64FB\system_BAT32A239.c</instance>
<component Cclass="Device" Cgroup="Startup" Cvendor="Cmsemicon" Cversion="1.0.0" condition="BAT32A239 CMSIS-CORE"/>
<package name="BAT32A239" schemaVersion="1.4" url="http://www.mcu.com.cn/pack/" vendor="Cmsemicon" version="1.0.3"/>
<targetInfos>
<targetInfo name="RMR42E"/>
</targetInfos>
<targetInfos/>
</file>
<file attr="config" category="header" name="Device\Source\userdefine.h" version="1.0.0">
<instance index="0">RTE\Device\BAT32A239KK64FB\userdefine.h</instance>
<instance index="0" removed="1">RTE\Device\BAT32A239KK64FB\userdefine.h</instance>
<component Cclass="Device" Cgroup="Startup" Cvendor="Cmsemicon" Cversion="1.0.0" condition="BAT32A239 CMSIS-CORE"/>
<package name="BAT32A239" schemaVersion="1.4" url="http://www.mcu.com.cn/pack/" vendor="Cmsemicon" version="1.0.3"/>
<targetInfos>
<targetInfo name="RMR42E"/>
</targetInfos>
<targetInfos/>
</file>
<file attr="config" category="source" name="Device\Source\isr_BAT32A239.c" version="1.0.0">
<instance index="0" removed="1">RTE\Device\BAT32A239KK80FA\isr_BAT32A239.c</instance>
......@@ -1109,6 +1101,38 @@
<package name="BAT32A239" schemaVersion="1.4" url="http://www.mcu.com.cn/pack/" vendor="Cmsemicon" version="1.0.5"/>
<targetInfos/>
</file>
<file attr="config" category="source" name="Device\Source\isr_BAT32G139.c" version="1.0.0">
<instance index="0">RTE\Device\BAT32G139GK64FB\isr_BAT32G139.c</instance>
<component Cclass="Device" Cgroup="ISR" Cvendor="Cmsemicon" Cversion="1.0.0" condition="BAT32G139 CMSIS-CORE"/>
<package name="BAT32G139" schemaVersion="1.4" url="http://www.mcu.com.cn/pack/" vendor="Cmsemicon" version="1.0.1"/>
<targetInfos>
<targetInfo name="RMR42E"/>
</targetInfos>
</file>
<file attr="config" category="source" condition="Startup ARM" name="Device\Source\ARM\startup_BAT32G139.s" version="1.0.0">
<instance index="0">RTE\Device\BAT32G139GK64FB\startup_BAT32G139.s</instance>
<component Cclass="Device" Cgroup="Startup" Cvendor="Cmsemicon" Cversion="1.0.0" condition="BAT32G139 CMSIS-CORE"/>
<package name="BAT32G139" schemaVersion="1.4" url="http://www.mcu.com.cn/pack/" vendor="Cmsemicon" version="1.0.1"/>
<targetInfos>
<targetInfo name="RMR42E"/>
</targetInfos>
</file>
<file attr="config" category="source" name="Device\Source\system_BAT32G139.c" version="1.0.0">
<instance index="0">RTE\Device\BAT32G139GK64FB\system_BAT32G139.c</instance>
<component Cclass="Device" Cgroup="Startup" Cvendor="Cmsemicon" Cversion="1.0.0" condition="BAT32G139 CMSIS-CORE"/>
<package name="BAT32G139" schemaVersion="1.4" url="http://www.mcu.com.cn/pack/" vendor="Cmsemicon" version="1.0.1"/>
<targetInfos>
<targetInfo name="RMR42E"/>
</targetInfos>
</file>
<file attr="config" category="header" name="Device\Source\userdefine.h" version="1.0.0">
<instance index="0">RTE\Device\BAT32G139GK64FB\userdefine.h</instance>
<component Cclass="Device" Cgroup="Startup" Cvendor="Cmsemicon" Cversion="1.0.0" condition="BAT32G139 CMSIS-CORE"/>
<package name="BAT32G139" schemaVersion="1.4" url="http://www.mcu.com.cn/pack/" vendor="Cmsemicon" version="1.0.1"/>
<targetInfos>
<targetInfo name="RMR42E"/>
</targetInfos>
</file>
</files>
</RTE>
......
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RTE/_RMR42E/RTE_Components.h
View file @ 9b6ee223
......@@ -14,7 +14,7 @@
/*
* Define the Device Header File:
*/
#define CMSIS_device_header "BAT32A239.h"
#define CMSIS_device_header "BAT32G139.h"
......
Firmware/Source/Application/BackLight/BackLight.c
View file @ 9b6ee223
......@@ -6,10 +6,12 @@
#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))
uint8_t interact_PWM_Low_Duty = 0;
void BackLight_Process(void)
{
if (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF && Charge_OFF_Flag != 2)
if (openLED_flag && Charge_OFF_Flag != 2)
{
TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, BACK_LIGHT_DAY);
//电量
......@@ -40,7 +42,7 @@ void BackLight_Process(void)
void BackLight_Clock_All_Process(void)
{
if (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF && Charge_OFF_Flag == 0)
if (openLED_flag && Charge_OFF_Flag == 0)
{
//总计时间
if (Get_Clock_All_lenth() == 2|| checkself_seg_Flag == 1)
......@@ -69,7 +71,7 @@ void BackLight_Clock_All_Process(void)
void Interact_Light_Process(void)
{
if (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF && Charge_OFF_Flag == 0)
if (openLED_flag && Charge_OFF_Flag == 0)
{
TimerM_PWM_set_duty(TIMERM_COUNTER0, TIMERM_CHD, interact_PWM_Low_Duty * 10);
}
......
Firmware/Source/Application/CAN_User/Can_App.c
View file @ 9b6ee223
......@@ -79,10 +79,10 @@ void Can_Set_Buff_393(canlib_uint8_t CopyData[])
if (p393 != (void *)0)
{
p393->Sig.ICU_HardVer = 1;
p393->Sig.ICU_SubHardVer = 1;
p393->Sig.ICU_SubHardVer = 0;
p393->Sig.ICU_SoftVer = 1;
p393->Sig.ICU_SubSoftVer = 1;
p393->Sig.ICU_SoftPhaseVer = 1;
p393->Sig.ICU_SubSoftVer = 0;
p393->Sig.ICU_SoftPhaseVer = 0;
p393->Sig.Res0 = 0x0;
p393->Sig.ICU_ProtoVer = 0;
p393->Sig.ICU_ProtoSubVer = 7;
......
Firmware/Source/Application/CommonInterface/CommonInterface.c
View file @ 9b6ee223
......@@ -9,23 +9,13 @@ uint8_t Power_CheckSelf = 0;
static uint32_t PowerSocTimeLine;
static COMMON_PowerStatus_t PowerSts; /*1 ON ; 0 OFF*/
static uint16_t Act_V_Speed; /*实际值,十倍的*/
static uint16_t Disp_V_Speed; /*显示值,十倍的*/
static DataValid_t PowerSts_Valid;
volatile static DataValid_t Act_V_Speed_Valid;
static DataValid_t Disp_V_Speed_Valid;
// static uint16_t u16SelfCheckTime;
/*每次唤醒调用*/
void Common_DataInit(void)
{
PowerSts = COMMON_POWER_UNKNOW;
Act_V_Speed = 0xffffu;
Disp_V_Speed = 0xffffu;
PowerSts_Valid = COMMON_Valid_UNKNOW;
Act_V_Speed_Valid = COMMON_Valid_UNKNOW;
Disp_V_Speed_Valid = COMMON_Valid_UNKNOW;
PowerIgnOnTimeLine = 0x0ul;
PowerIgnOffTimeLine = 0x0ul;
PowerSocTimeLine = 0x0ul;
......@@ -40,18 +30,6 @@ uint8_t Common_Get_IG_Sts(void)
return (uint8_t)PowerSts;
}
uint16_t Common_Get_Act_V_Speed(void)
{
return Act_V_Speed;
}
uint16_t Common_Get_Act_V_Speed_ODO(void)
{
return Act_V_Speed * 101 / 100;
}
// uint16_t Common_Get_Disp_V_Speed(void)
// {
// return Disp_V_Speed;
// }
uint16_t Common_Get_TireSize(void)
{
......@@ -62,46 +40,16 @@ void Common_Set_IG_Sts(COMMON_PowerStatus_t Val)
{
PowerSts = Val;
}
void Common_Set_Act_V_Speed(uint16_t Val)
{
Act_V_Speed = Val;
}
void Common_Set_Disp_V_Speed(uint16_t Val)
{
Disp_V_Speed = Val;
}
DataValid_t Common_Get_IG_Sts_Valid(void)
{
return PowerSts_Valid;
}
DataValid_t Common_Get_Act_V_Speed_Valid(void)
{
return Act_V_Speed_Valid;
}
// DataValid_t Common_Get_Disp_V_Speed_Valid(void)
// {
// return Disp_V_Speed_Valid;
// }
void Common_Set_IG_Sts_Valid(DataValid_t Val)
{
PowerSts_Valid = Val;
}
void Common_Set_Act_V_Speed_Valid(DataValid_t Val)
{
Act_V_Speed_Valid = Val;
}
void Common_Set_Disp_V_Speed_Valid(DataValid_t Val)
{
Disp_V_Speed_Valid = Val;
}
// uint16_t Common_Get_DispSpeed(void)
// {
// uint16_t m_Res;
// return m_Res;
// }
void Common_Input_Para(void)
{
......
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @ 9b6ee223
......@@ -20,12 +20,14 @@ uint8_t checkself_seg_Flag = 0;
_Fun_Res SEG_SET_Frame(uint8_t m_Flag)
{
_Fun_Res m_Res = EX_ERR;
if (m_Flag == 1)
{
/*边框*/
IC2_SEG040 = IC_SEG_ON;
IC2_SEG140 = IC_SEG_ON;
IC1_SEG086 = IC_SEG_ON;
m_Res = EX_OK;
}
else
{
......@@ -33,7 +35,9 @@ _Fun_Res SEG_SET_Frame(uint8_t m_Flag)
IC2_SEG040 = IC_SEG_OFF;
IC2_SEG140 = IC_SEG_OFF;
IC1_SEG086 = IC_SEG_OFF;
m_Res = EX_OK;
}
return m_Res;
}
/**@brief 指示灯显示函数
......@@ -302,6 +306,7 @@ _Fun_Res SEG_SET_GEAR(uint8_t m_Gear_Flag, uint8_t m_Gear, uint8_t checkself)
{
/*挡位符号*/
uint8_t m8 = 0;
_Fun_Res Res = EX_ERR;
if (m_Gear_Flag == 1u)
{
IC2_SEG094 = IC_SEG_ON;
......@@ -388,6 +393,7 @@ _Fun_Res SEG_SET_GEAR(uint8_t m_Gear_Flag, uint8_t m_Gear, uint8_t checkself)
IC2_SEG099 = IC_SEG_OFF;
IC2_SEG146 = IC_SEG_OFF;
}
Res = EX_OK;
}
else
{
......@@ -457,6 +463,7 @@ _Fun_Res SEG_SET_GEAR(uint8_t m_Gear_Flag, uint8_t m_Gear, uint8_t checkself)
IC2_SEG142 = IC_SEG_OFF;
}
}
Res = EX_OK;
}
else
{
......@@ -481,7 +488,9 @@ _Fun_Res SEG_SET_GEAR(uint8_t m_Gear_Flag, uint8_t m_Gear, uint8_t checkself)
IC2_SEG146 = IC_SEG_OFF;
IC2_SEG142 = IC_SEG_OFF;
IC2_SEG150 = IC_SEG_OFF;
Res = EX_ERR;
}
return Res;
}
// /**@brief 燃油表盘显示函数
// * @param[in] m_Flag 段与数字是否显示 -1 显示 -0 不显示
......@@ -2674,6 +2683,3 @@ void Checkself_SEG_Display(void)
// }
}
void TYW_Check_Count(void)
{
}
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @ 9b6ee223
......@@ -54,13 +54,14 @@ static void Power_KL30_Init(void)
LINE_IN_Init();
LED_Driver_Init_Example();//注意顺序2
LED_Driver_Service_Immediate();
Telltales_Init();
TimerM_PWM_counter_Output_Init(TIMERM_COUNTER0, 400, 64000000);
TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
TimerM_PWM_CH_Output_init(TIMERM_COUNTER0, TIMERM_CHB, ActiveLevel_High);
TimerM_PWM_CH_Output_init(TIMERM_COUNTER0, TIMERM_CHC, ActiveLevel_High);
TimerM_PWM_CH_Output_init(TIMERM_COUNTER0, TIMERM_CHD, ActiveLevel_High);
TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
Telltales_Init();
g_stRTCInformation.u8RTCSecond = 0;
g_stRTCInformation.u8RTCMinute = 0;
g_stRTCInformation.u8RTCHour = 0;
......@@ -84,6 +85,7 @@ static void Power_Wakeup_Init(void)
Sys_WakeUp_Init();
LINE_IN_Init();
Line_In_KL15_ON_Init();
LED_Driver_Init_Example();//注意顺序2
TimerM_PWM_counter_Output_Init(TIMERM_COUNTER0, 400, 64000000);
TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
TimerM_PWM_CH_Output_init(TIMERM_COUNTER0, TIMERM_CHD, ActiveLevel_High);
......@@ -111,17 +113,13 @@ static void Power_IG_ON_Init(void)
{
Checkself_Init();
Line_In_KL15_ON_Init();
Telltales_KL15_Init();
LED_Driver_Service_Immediate();
}
static void Power_Sleep_Init(void)
{
TimerM_PWM_counter_Output_Init(TIMERM_COUNTER0, 0, 0);
TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 0, 0);
//TimerM_PWM_CH_Output_init(TIMERM_COUNTER0, TIMERM_CHB, ActiveLevel_High);
//TimerM_PWM_CH_Output_init(TIMERM_COUNTER0, TIMERM_CHC, ActiveLevel_High);
//TimerM_PWM_CH_Output_init(TIMERM_COUNTER0, TIMERM_CHD, ActiveLevel_High);
//TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
//RTC_Stop();
rte_can_deinit(CAN_CH_0);
TMM0_Stop();
......@@ -238,8 +236,12 @@ static Power_Status_em Power_Stay_Protect(void)
CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
return u8PowerSts;
}
if ( SYS_OPR_STAT_IGN_OFF )
{
break;
}
}
}
}
static Power_Status_em Power_Stay_Sleep(void)
{
......
Firmware/Source/Component/Telltales/Telltales_user.c
View file @ 9b6ee223
......@@ -373,7 +373,7 @@ static Tellib_uint16_t LED_Battery_Charging_Judgement(void)
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 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))
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 ((Signal1 == 0x1 || Signal1 == 0x0 ) && Signal2 == 0X1)
{
......@@ -561,7 +561,7 @@ static void LED_Engine_Works_Execution(Tellib_uint16_t led_status)
}
static Tellib_uint16_t LED_Bluetooth_Connection_Judgement(void)
{
// Tellib_uint16_t LED_STATE = 0u;
Tellib_uint16_t LED_STATE = 0u;
// Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_3A2_Sig_ICU_BluetoothConnectState();
// if (Signal1)
// {
......@@ -571,7 +571,7 @@ static Tellib_uint16_t LED_Bluetooth_Connection_Judgement(void)
// {
// LED_STATE = 0;
// }
// return LED_STATE;
return LED_STATE;
}
static void LED_Bluetooth_Connection_Execution(Tellib_uint16_t led_status)
{
......@@ -932,7 +932,7 @@ 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();
if ((Signal1 == 0x1 || Signal1 == 0x2 ||Signal1 == 0x3) && openLED_flag)
if ((Signal1 == 0x1 || Signal1 == 0x2 ||Signal1 == 0x3) && (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF))
{
LED_STATE = 1;
}
......
Firmware/Source/System/Sys_Task_List.c
View file @ 9b6ee223
......@@ -33,15 +33,10 @@ void Sys_10ms_Tasks(void)
Line_In_Debounce_Service(10u);
Can_BusOff_Recover(10u);
Data_CumulativeWorkHours_EEPROM_Write();
TYW_Check_Count();
}
void Sys_20ms_Tasks(void)
{
// Key_Clear_Time();
// Key_Auto_Save();
// Data_Vehicle_Speed_Processing_Service();
// Data_Engine_Speed_Processing_Service();
}
void Sys_50ms_Tasks(void)
......@@ -50,7 +45,6 @@ void Sys_50ms_Tasks(void)
LED_Driver_Scan_Refresh();
Telltales_Management();
Gauge_Service();
// Key_Check_Service();
}
void Sys_75ms_Tasks(void)
......
Firmware/Source/UDS/UDS_ISO14229_Services.c
View file @ 9b6ee223
......@@ -27,13 +27,13 @@ extern void UDS_Service_Response(uint8_t si, uint8_t RspType, uint16_t A_TA_type
/*诊断使用, 判断App一致性, 禁止修改（内部版本号除外）*/
extern const ProjectInfoStruct ProjectInfo __attribute__((section(".ARM.__at_0x00007800"))) =
{
"HaoJin232", // 豪进232
"HJYB-5",
"BAT32A239KK64FB", // 中微芯片
"RMR42E", // 豪进232
"RYB-1",
"BAT32A139KK64FB", // 中微芯片
{
"CAN_STD",
"CAN_CH_0",
"CAN_500Kbps",
"CAN_250Kbps",
{DIAG_ID_Tx, DIAG_ID_Rx_PHY, DIAG_ID_Rx_FUN}
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment