diff --git a/checher_slave.uvoptx b/checher_slave.uvoptx
index f518321..2d0fd03 100644
--- a/checher_slave.uvoptx
+++ b/checher_slave.uvoptx
@@ -327,7 +327,7 @@
1
0
0
- 6
+ 4
@@ -338,13 +338,13 @@
- STLink\ST-LINKIII-KEIL_SWO.dll
+ Segger\JL2CM3.dll
0
ST-LINKIII-KEIL_SWO
- -U52FF6E065266545441081687 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)
+ -U52FF6E065266545441081687 -O206 -SF500 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)
0
@@ -359,7 +359,7 @@
0
DLGUARM
- (105=-1,-1,-1,-1,0)
+ d
0
@@ -459,12 +459,6 @@
-
-
- System Viewer\DAC
- 35905
-
-
1
1
@@ -1965,7 +1959,7 @@
coder
- 0
+ 1
0
0
0
diff --git a/source/ReadMe.txt b/source/ReadMe.txt
index e0690a9..43b6d5d 100644
--- a/source/ReadMe.txt
+++ b/source/ReadMe.txt
@@ -228,3 +228,5 @@
解决检测后立即赋码会直接返回成功的bug
2023.10.26
版本号2.03，JQ_UID_PWD_Bind 不注码时返回成功
+2023.10.27
+ 添加 HARD_VERSION 宏，根据硬件版本不同来确定power参数
diff --git a/source/elec_det/base/define.h b/source/elec_det/base/define.h
index e501666..7ca3759 100644
--- a/source/elec_det/base/define.h
+++ b/source/elec_det/base/define.h
@@ -14,6 +14,38 @@
#include "stm32f10x_tim.h"
#include "stm32f10x_dac.h"
#include "stm32f10x_i2c.h"
+
+
+
+// 设置硬件版本
+#define HARD_VERSION 2
+
+
+#if HARD_VERSION==1
+// 电压倍数，旧板子21 新板子11
+#define V_PARAM_1 21
+// 参数2 旧板子143 新板子178
+#define V_PARAM_2 143
+// 电阻放大倍数 旧板子16 新板子79.7
+#define RES_MULTIPLE 16
+
+#elif HARD_VERSION==2
+// 电压倍数，旧板子21 新板子11
+#define V_PARAM_1 11
+// 参数2 旧板子143 新板子178
+#define V_PARAM_2 178
+// 电阻放大倍数 旧板子16 新板子79.7
+#define RES_MULTIPLE 79.7
+
+#endif
+
+
+
+
+
+
+
+
#define UNUSED(X) (void)X
#define SoftVersion 0x000D
diff --git a/source/elec_det/elec_det.c b/source/elec_det/elec_det.c
index 6467a9d..a80f885 100644
--- a/source/elec_det/elec_det.c
+++ b/source/elec_det/elec_det.c
@@ -139,7 +139,8 @@ array_def *elec_bootinfo(void)
Ye_BoardCheck();
board_st.hard_v=sys_param()->hard_version;
board_st.resistor_diff=sys_param()->resistor_diff;
- board_st.hard_v=rt_tick_get()/1000;
+ //board_st.hard_v=rt_tick_get()/1000;
+ board_st.hard_v=HARD_VERSION;
board_st.soft_v=(int)(str_atof(SOFT_VERSION)*100);
array_def *r=arr_creat();
arr_append(r,0);
diff --git a/source/elec_det/hardware/adc_cfg.c b/source/elec_det/hardware/adc_cfg.c
index c18c673..5d3a4cb 100644
--- a/source/elec_det/hardware/adc_cfg.c
+++ b/source/elec_det/hardware/adc_cfg.c
@@ -8,6 +8,8 @@ volatile uint16_t ad0_adc_sample[AD_SCAN_SAMPLE*AD_SCAN_COUNT];
#define ADC1_SAMPLE_BUF_LEN 200
#define ADC1_SAMPLE_BUF_LEN2 20
+
+
volatile uint16_t FireBus_ADC_Buf[FIREBUS_ADC_BUF_LEN];
@@ -499,7 +501,7 @@ void AD_SampleResistor(uint16_t* channels_re)
uint16_t aus_sample[32];
uint8_t uc_index = 0;
const static float resistor_cur = 2.49f;
- const static float res_mutli = 79.7;
+ const static float res_mutli = RES_MULTIPLE;
/*
Gpio_ResistorSwitch
@param 0 全关
diff --git a/source/elec_det/hardware/power.c b/source/elec_det/hardware/power.c
index 0b8f8be..a1cf293 100644
--- a/source/elec_det/hardware/power.c
+++ b/source/elec_det/hardware/power.c
@@ -12,6 +12,7 @@ static volatile float f_cur_b;
static volatile uint8_t uc_power_cal_flag = 0;
volatile PowerInfo_st powerinfo_arrayst[POWER_SET_COUNT] ;
+
/*
@brief 获取内部基准1.2V电压对应的AD
*/
@@ -77,7 +78,7 @@ uint32_t Power_GetHPowerV()
Bubble_Sort_u16(adv_buf,10);
adv = (adv_buf[4]+adv_buf[5]+adv_buf[6]+adv_buf[7])>>2;
adv = Power_ADVGetCalVal_106(adv);
- adv = adv*11/100000;
+ adv = adv*V_PARAM_1/100000;
return adv;
}
@@ -128,7 +129,7 @@ uint32_t Power_GetMPowerV()
Bubble_Sort_u16(adv_buf,10);
adv = (adv_buf[4]+adv_buf[5]+adv_buf[6]+adv_buf[7])>>2;
adv = Power_ADVGetCalVal_106(adv);
- adv = adv*11/100000;
+ adv = adv*V_PARAM_1/100000;
return adv;
}
@@ -340,7 +341,7 @@ void PowerCalibration(PowerInfo_st* info_st)
vlp = info_st->V_LAH;
vlp /= 10;
//(VLP-1.229V)/178K + (VDAC-1.229V)/20K = 0.1229mA
- v_adc_h =( 0.1229- (vlp-1.229)/178)*20+1.229;
+ v_adc_h =( 0.1229- (vlp-1.229)/V_PARAM_2)*20+1.229;
us_timeout = 80;
info_st->V_LAH_DAC = 0;
us_basedac_h = (uint16_t)( v_adc_h/3.3 * 4096);
diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h
index 67c4729..e017d40 100644
--- a/source/main/compiler_info.h
+++ b/source/main/compiler_info.h
@@ -6,7 +6,7 @@
-#define BUILD_DATE "2023-10-26 17:51:06"
+#define BUILD_DATE "2023-10-27 18:16:13"
#define SOFT_VERSION "2.03"