diff --git a/checher_slave.uvoptx b/checher_slave.uvoptx
index 08f7f77..d349984 100644
--- a/checher_slave.uvoptx
+++ b/checher_slave.uvoptx
@@ -299,7 +299,7 @@
1
0
- 1
+ 0
18
@@ -523,7 +523,7 @@
1
0
- 0
+ 1
18
diff --git a/source/ReadMe.txt b/source/ReadMe.txt
index 2b618fc..498211a 100644
--- a/source/ReadMe.txt
+++ b/source/ReadMe.txt
@@ -343,3 +343,8 @@
V2.15 屏蔽XT相关代码、开路电流判线改为30、充能统计添加数据记录;
修改写MTP任务写入数据不对的bug;
JQ写三码任务自动使能OTP
+2024.3.11
+ 修改EW升级关总线设置电压方式
+ 检测模式3有方案时会获取方案中的模块芯片信息
+ 调试版本程序开放EW升级相关调试命令
+
diff --git a/source/elec_det/driver/EWDriver.c b/source/elec_det/driver/EWDriver.c
index e1c9001..7292fc4 100644
--- a/source/elec_det/driver/EWDriver.c
+++ b/source/elec_det/driver/EWDriver.c
@@ -856,8 +856,8 @@ uint8_t DMod_FireBusReadDatasV2_RC(uint8_t* buf, uint8_t len, uint32_t time_out)
EW_DIFF_MOD_H;
Power_SetSampleCurrentRange(range);
if(ret){
-// DBG_LOG("cur_idle=%d,high_value=%d,idle_line=%d.",fire_dat.cur_idle, fire_dat.cur_high_value,fire_dat.cur_idle_line);
-// DBG_LOG("cur_max=%d,cur_idle_ad=%d",fire_dat.cur_max,fire_dat.cur_idle_ad);
+ DBG_LOG("cur_idle=%d,high_value=%d,idle_line=%d.",fire_dat.cur_idle, fire_dat.cur_high_value,fire_dat.cur_idle_line);
+ DBG_LOG("cur_max=%d,cur_idle_ad=%d",fire_dat.cur_max,fire_dat.cur_idle_ad);
}
return ret;
}
diff --git a/source/elec_det/elec_det.c b/source/elec_det/elec_det.c
index f4b01a2..f9d9499 100644
--- a/source/elec_det/elec_det.c
+++ b/source/elec_det/elec_det.c
@@ -645,7 +645,10 @@ array_def *elec_check_slot(void)
res=checker_runcfg.power_prapare_exe;
memset(&checker_runcfg,0,sizeof(Checker_RunCfg_st));
checker_runcfg.power_prapare_exe=res;
-
+ if(s->scheme_inited){
+ s->chip_type=(board_st.plan_id >> 12 ) & 0x0F;
+ }
+
checker_runcfg.param_count=1;
checker_runcfg.params[0]=1;
CheckerExt_Slot();
diff --git a/source/elec_det/interface/EWUpdata.c b/source/elec_det/interface/EWUpdata.c
index d922e29..5a7329a 100644
--- a/source/elec_det/interface/EWUpdata.c
+++ b/source/elec_det/interface/EWUpdata.c
@@ -51,7 +51,6 @@ static int cmd_jwt_boot_erase(list_def *argv)
ret=EW_bootErease();
return ret;
}
-//commend_export(jwt_boot_erase,cmd_jwt_boot_erase,"jwt srase in boot")
// 跳转
@@ -71,7 +70,6 @@ static int cmd_jwt_boot_jump(list_def *argv)
ret=EW_bootJump();
return ret;
}
-//commend_export(jwt_boot_jump,cmd_jwt_boot_jump,"jwt jump in boot")
// 充电
@@ -92,7 +90,6 @@ static int cmd_jwt_boot_charg(list_def *argv)
ret=EW_bootCharg();
return ret;
}
-//commend_export(jwt_boot_charg,cmd_jwt_boot_charg,"jwt charg in boot")
@@ -113,7 +110,6 @@ static int cmd_jwt_boot_discharg(list_def *argv)
ret=EW_bootDisCharg();
return ret;
}
-//commend_export(jwt_boot_discharg,cmd_jwt_boot_discharg,"jwt discharg in boot")
@@ -173,7 +169,6 @@ static int cmd_jwt_boot_checkcrc(list_def *argv)
cmd_print("local crc32=0x%04x.",crc);
return ret;
}
-//commend_export(jwt_boot_checkcrc,cmd_jwt_boot_checkcrc,"jwt checkcrc in boot")
@@ -236,7 +231,6 @@ static int cmd_jwt_app_read(list_def *argv)
ret=EW_appRead();
return ret;
}
-//commend_export(jwt_app_read,cmd_jwt_app_read,"jwt read in app")
// app:通信测试
@@ -256,7 +250,6 @@ static int cmd_jwt_app_commtest(list_def *argv)
ret=EW_appCommTest();
return ret;
}
-//commend_export(jwt_app_commtest,cmd_jwt_app_commtest,"jwt commtest in app")
@@ -276,8 +269,17 @@ static int cmd_jwt_app_runboot(list_def *argv)
EW_appRunBoot();
return ret;
}
-//commend_export(jwt_app_runboot,cmd_jwt_app_runboot,"jwt turn to bootloader")
+#ifdef DEBUG
+commend_export(jwt_boot_erase,cmd_jwt_boot_erase,"jwt srase in boot")
+commend_export(jwt_boot_jump,cmd_jwt_boot_jump,"jwt jump in boot")
+commend_export(jwt_boot_charg,cmd_jwt_boot_charg,"jwt charg in boot")
+commend_export(jwt_boot_discharg,cmd_jwt_boot_discharg,"jwt discharg in boot")
+commend_export(jwt_boot_checkcrc,cmd_jwt_boot_checkcrc,"jwt checkcrc in boot")
+commend_export(jwt_app_read,cmd_jwt_app_read,"jwt read in app")
+commend_export(jwt_app_commtest,cmd_jwt_app_commtest,"jwt commtest in app")
+commend_export(jwt_app_runboot,cmd_jwt_app_runboot,"jwt turn to bootloader")
+#endif
@@ -378,6 +380,18 @@ int EW_TurnToBoot(ew_updata_def *e)
}
+void EW_PowerSet(int power)
+{
+ if(power){
+ PowerCalibration_set(200,120);
+ }
+ else{
+ PowerCalibration_set(POWER_DEF_V,45);
+ POWER_OFF;
+ }
+}
+
+
static void EW_ParamPrint(ew_updata_def *e)
{
@@ -420,7 +434,7 @@ void EW_Updata(void)
}
EW_ParamPrint(&ew_updata);
- PowerCalibration_set(200,120);
+ EW_PowerSet(1);
ret=EW_CheckState(&ew_updata);
if(ret==2){
// 在app中
@@ -479,9 +493,9 @@ void EW_Updata(void)
}
DBG_LOG("EW_ReadMTP check success.");
delay_ms(5);
- XTBUS_OFF;
+ EW_PowerSet(0);
delay_os_ms(ew_updata.time_poweroff);
- XTBUS_ON;
+ EW_PowerSet(1);
delay_os_ms(ew_updata.time_loadapp);
ret=EW_appCommTest();
if(ret) {ret=11;goto err;}
diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h
index 48bda05..67d0345 100644
--- a/source/main/compiler_info.h
+++ b/source/main/compiler_info.h
@@ -6,7 +6,7 @@
-#define BUILD_DATE "2024-03-01 16:38:59"
+#define BUILD_DATE "2024-03-08 11:49:38"
#define SOFT_VERSION "2.15"