From 8bbea3a147358a19a3d3e7189eaa74c6b22fd9a5 Mon Sep 17 00:00:00 2001 From: zsx <1543588107@qq.com> Date: Sat, 26 Apr 2025 09:42:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=B5=E9=87=8F=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E8=A7=84=E5=88=99=EF=BC=8C=E6=B7=BB=E5=8A=A0LED?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8A=9F=E8=83=BD=20zsxfly20250426?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/blezongkong/mdk/zhongkong.uvoptx | 101 ++------------------- projects/blezongkong/mdk/zhongkong.uvprojx | 11 ++- projects/blezongkong/src/app_bat.c | 7 +- projects/blezongkong/src/app_bat.h | 6 +- projects/blezongkong/src/app_modbus.c | 3 + projects/blezongkong/src/sys_config.h | 2 +- 6 files changed, 31 insertions(+), 99 deletions(-) diff --git a/projects/blezongkong/mdk/zhongkong.uvoptx b/projects/blezongkong/mdk/zhongkong.uvoptx index f23e271..f2d4bfc 100644 --- a/projects/blezongkong/mdk/zhongkong.uvoptx +++ b/projects/blezongkong/mdk/zhongkong.uvoptx @@ -22,7 +22,7 @@ - uartTest + OTA 0x4 ARM-ADS @@ -30,8 +30,8 @@ 1 1 - 0 - 1 + 1 + 0 0 @@ -89,7 +89,7 @@ 1 1 1 - 1 + 0 1 1 1 @@ -117,106 +117,25 @@ Segger\JL2CM3.dll - - 0 - UL2CM3 - UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000) - 0 JL2CM3 - -U20090928 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8001 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO11 -FD20003000 -FC5000 -FN1 -FF0B6x_256kB_PY_D.FLM -FS018000000 -FL040000 -FP0($$Device:B6x$.\Flash\B6x_256kB_PY_D.FLM) - - - 0 - ARMRTXEVENTFLAGS - -L70 -Z18 -C0 -M0 -T1 - - - 0 - DLGTARM - (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0) - - - 0 - ARMDBGFLAGS - + -U20090928 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO31 -FD20003000 -FC5000 -FN1 -FF0B6x_256kB_PY_D.FLM -FS018000000 -FL040000 -FP0($$Device:B6x$.\Flash\B6x_256kB_PY_D.FLM) - - - 0 - 0 - 0 - 1 -
402735504
- 0 - 0 - 0 - 0 - 0 - 1 - - - 0x18014190 - - - 1 - 0 - 0 - 1 -
402735500
- 0 - 0 - 0 - 0 - 0 - 1 - - - 0x1801418C - - - 2 - 0 - 0 - 1 -
402735502
- 0 - 0 - 0 - 0 - 0 - 1 - - - 0x1801418E - - - - - 0 - 1 - gBleSleep - - - 1 - 1 - DMA_RX_BUFF - - + 0 0 - 1 - 1 + 0 + 0 0 0 0 0 - 1 + 0 0 0 0 @@ -424,7 +343,7 @@ 2 14 1 - 0 + 1 0 0 ..\src\sys_config.c diff --git a/projects/blezongkong/mdk/zhongkong.uvprojx b/projects/blezongkong/mdk/zhongkong.uvprojx index 21acb58..fdd1125 100644 --- a/projects/blezongkong/mdk/zhongkong.uvprojx +++ b/projects/blezongkong/mdk/zhongkong.uvprojx @@ -48,7 +48,7 @@ 1 .\output\ - OTA_V2_7 + OTA_V2_8 1 0 1 @@ -655,4 +655,13 @@ + + + + zhongkong + 1 + + + + diff --git a/projects/blezongkong/src/app_bat.c b/projects/blezongkong/src/app_bat.c index 310d753..59d5b58 100644 --- a/projects/blezongkong/src/app_bat.c +++ b/projects/blezongkong/src/app_bat.c @@ -67,6 +67,7 @@ uint8_t pmu_voltage_to_percent(uint32_t volt){//电压转百分比 return 0; } +uint8_t LED_control =0,LED_control_last =0; static tmr_tk_t BAT_Message_Handle(tmr_id_t id) { uint16_t in_acc_percent= get_in_acc_percent(); @@ -118,11 +119,11 @@ static tmr_tk_t BAT_Message_Handle(tmr_id_t id) { WS2812_GRBs.GRBs=GRB_WHITE; } - if((Bat_STA_Last != BAT_Message.Bat_STA) || GRB_Door_lock_updata != Get_Status(OUT_Door_lock)){ + if((Bat_STA_Last != BAT_Message.Bat_STA) || (GRB_Door_lock_updata != Get_Status(OUT_Door_lock)) || (LED_control != LED_control_last)){ GRB_Door_lock_updata=Get_Status(OUT_Door_lock); - + LED_control_last =LED_control; Bat_STA_Last =BAT_Message.Bat_STA; - if( Get_Status(OUT_Door_lock)){ + if( Get_Status(OUT_Door_lock) || (LED_control != 0)){ if(BAT_Message.Bat_STA & Bat_Charge_STA){ Time_Event_Blink(GRB_WS2812_Event,500,500,0xffff,NULL); }else{ diff --git a/projects/blezongkong/src/app_bat.h b/projects/blezongkong/src/app_bat.h index e5fb043..82a29ec 100644 --- a/projects/blezongkong/src/app_bat.h +++ b/projects/blezongkong/src/app_bat.h @@ -29,9 +29,9 @@ #define BAT_LEVEL_50PERCENT_VOLT BAT_VOLT(115) // 50% #define BAT_LEVEL_60PERCENT_VOLT BAT_VOLT(117) // 60% #define BAT_LEVEL_70PERCENT_VOLT BAT_VOLT(119) // 70% -#define BAT_LEVEL_80PERCENT_VOLT BAT_VOLT(121) // 80% -#define BAT_LEVEL_90PERCENT_VOLT BAT_VOLT(123) // 90% -#define BAT_LEVEL_100PERCENT_VOLT BAT_VOLT(144) //100% +#define BAT_LEVEL_80PERCENT_VOLT BAT_VOLT(123) // 80% +#define BAT_LEVEL_90PERCENT_VOLT BAT_VOLT(127) // 90% +#define BAT_LEVEL_100PERCENT_VOLT BAT_VOLT(134) //100% // 充电状态 diff --git a/projects/blezongkong/src/app_modbus.c b/projects/blezongkong/src/app_modbus.c index 0c02407..54595d3 100644 --- a/projects/blezongkong/src/app_modbus.c +++ b/projects/blezongkong/src/app_modbus.c @@ -61,6 +61,8 @@ void FunctionalCode_01(uint16_t reg_addr){//ID寄存器地址//返回7字节 } } +extern uint8_t LED_control; + // 03 功能码 # 读 - 保持寄存器 // 06 功能码 # 写 - 单个寄存器 void FunctionalCode_03_06(uint8_t CMDCode, uint16_t reg_addr , uint16_t reg_val_num){//寄存器地址//返回8字节或15字节 @@ -255,6 +257,7 @@ void FunctionalCode_03_06(uint8_t CMDCode, uint16_t reg_addr , uint16_t reg_val_ // Time_Event_DelayOff(Pmode_Timeout_Event ,1000 * Pmode_Timeout ,NULL); // } sys_sta.Pmode =reg_val_num & 0x03; + LED_control = (0 ==(reg_val_num & 0x80))?0:1; MODBUS_Sent_BUF[len_count++] =reg_val_num >> 8; MODBUS_Sent_BUF[len_count++] =sys_sta.Pmode & 0xff; break; diff --git a/projects/blezongkong/src/sys_config.h b/projects/blezongkong/src/sys_config.h index 1f251ff..8b69db0 100644 --- a/projects/blezongkong/src/sys_config.h +++ b/projects/blezongkong/src/sys_config.h @@ -57,7 +57,7 @@ void conf_init(void); /**************************系统版本**************************/ // 软件本号 -#define SW_VERSION (7) +#define SW_VERSION (8) // 硬件本号 #define HW_VERSION (2) // 版本类型：0：0x04000；1：0x20000//不可修改