Commit 7c8b0454 authored by 杨真东's avatar 杨真东

Merge branch 'shihao' into 'dev'

Shihao

See merge request !7
parents 527bd6ab 899b069d
...@@ -467,18 +467,27 @@ void Power_KL15_Init(void) ...@@ -467,18 +467,27 @@ void Power_KL15_Init(void)
void Sys_Stop_Task(void) void Sys_Stop_Task(void)
{ {
static uint8_t Delaycnt; static uint8_t Delaycnt;
static uint8_t i;
/*关闭所有外设功能,只保留AD采集,电源状态切换*/ /*关闭所有外设功能,只保留AD采集,电源状态切换*/
{ {
/*关闭电机待添加*/ /*关闭电机待添加*/
/*关闭扬声器待添加*/ /*关闭扬声器待添加*/
BackLight_Sleep_Init( ); /*关闭背光*/ BackLight_Sleep_Init( ); /*关闭背光*/
for(i = 0; i < 36; i++)
{
LED_Driver_Channel_Set(0, i, 0);
}
LED_Driver_Scan_Refresh();
CAN_TX_SetEnable(0);
BU98R10_Shutdown();
} }
Delaycnt = 0u; Delaycnt = 0u;
for ( ;; ) for ( ;; )
{ {
/*喂狗*/ /*喂狗*/
WDT_Clear( ); WDT_Clear( );
LED_Driver_Service();
/*一定周期调用2ms*/ /*一定周期调用2ms*/
Delay_Ms(2U); Delay_Ms(2U);
...@@ -497,6 +506,8 @@ void Sys_Stop_Task(void) ...@@ -497,6 +506,8 @@ void Sys_Stop_Task(void)
// StepMotor_Reset(0u); // StepMotor_Reset(0u);
// StepMotor_Limit_Init(); // StepMotor_Limit_Init();
RTE_PWM_Start( ); RTE_PWM_Start( );
CAN_TX_SetEnable(0x55);
Power_Wakeup_Init();
return; return;
} }
} }
......
...@@ -397,7 +397,7 @@ static void System_Fun_Process(void) ...@@ -397,7 +397,7 @@ static void System_Fun_Process(void)
SysFun_KL30Monitor.DebounceTimer++; SysFun_KL30Monitor.DebounceTimer++;
DebpounceTimer = 0u; DebpounceTimer = 0u;
/*计时累计时间1000*2ms*/ /*计时累计时间1000*2ms*/
if ( SysFun_KL30Monitor.DebounceTimer >= 1000U )/*40202-8*/ if ( SysFun_KL30Monitor.DebounceTimer >= 30000U )/*40202-8*/
{ {
SysFun_KL30Monitor.DebounceTimer = 0U; SysFun_KL30Monitor.DebounceTimer = 0U;
...@@ -432,6 +432,10 @@ static void System_Fun_Process(void) ...@@ -432,6 +432,10 @@ static void System_Fun_Process(void)
} }
} }
if ((SysFun_KL30Monitor.FinalSts == 1u) || (SysFun_KL30Monitor.FinalSts >= 7u))
{
SysFun_KL30Monitor.FinalSts = m8;
}
} }
else else
{ {
......
...@@ -86,7 +86,7 @@ extern MonitorStruct SysNM_KL15Monitor; ...@@ -86,7 +86,7 @@ extern MonitorStruct SysNM_KL15Monitor;
#define EXIT_HIGH_Y_RANGE 16000U #define EXIT_HIGH_Y_RANGE 16000U
#define ENTER_HIGH_Y_RANGE 16500U #define ENTER_HIGH_Y_RANGE 18000U
#define EXIT_HIGH_N_RANGE 18500U #define EXIT_HIGH_N_RANGE 18500U
......
Updata.bin是一键升级小盒专用程序 LE19_2023-11-29-19-00_SV001.002_HV001.001_BOOTSW103_updata是一键升级小盒专用程序
ALL是烧写器烧写的程序 LE19_2023-11-29-19-00_SV001.002_HV001.001_BOOTSW103_ALL是烧写器烧写的程序
APP是诊断工具升级的程序 LE19_2023-11-29-19-00_SV001.002_HV001.001_BOOTSW103_APP是诊断工具升级的程序
\ No newline at end of file \ No newline at end of file
LE19_2023-12-04-10-00_SV001.002_HV001.001_BOOTSW103_Updata是一键升级小盒专用程序
LE19_2023-12-04-10-00_SV001.002_HV001.001_BOOTSW103_ALL是烧写器烧写的程序
LE19_2023-12-04-10-00_SV001.002_HV001.001_BOOTSW103_APP是诊断工具升级的程序
\ No newline at end of file
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