From 797fccdda3b17dda578a5e15e59958cd67dd180b Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期一, 13 二月 2023 10:35:36 +0800 Subject: [PATCH] V1.45 V2.12 免布线标签必须搭配免布线基站1.44使用 1.通过4G可以下发标签可以读取和修改免布线基站参数,(看文档$readpara_anchor $writepara_anchor). 2.增加基站频率动态修改功能(基站默认频率1HZ,如果周围标签,则按照频率最高的标签测距,没有标签后30秒变回1hz) 3.修改升级和恢复出厂设置逻辑,只能串口通讯才能触发。 --- Src/OnChipDevices/ADC.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/Src/OnChipDevices/ADC.c b/Src/OnChipDevices/ADC.c index de06e6d..9b34737 100644 --- a/Src/OnChipDevices/ADC.c +++ b/Src/OnChipDevices/ADC.c @@ -29,6 +29,41 @@ last_value = 100; if(last_value<0) last_value = 0; + }else{ + last_value=0; + } + return last_value; +} + +uint16_t verfint_cal,adc_val; +uint8_t Get_VDDVlotage(void) +{ static float last_value = 100; + static uint8_t first=1; + static uint16_t bat_count = 0; + if(bat_count++%600==0) + { + MX_ADC_Init(); + HAL_Delay(30); + adc_val = Get_ADC_Value(); + MX_ADC_DeInit(); + //temp_voltage = (float)Get_ADC_Value()/621; //(value/4096*3.3*2-3.5)/0.7 + verfint_cal = *(__IO uint16_t *)(0X1FF80078); + bat_volt = 3*(float)verfint_cal/adc_val+0.13; + if(bat_volt>=3.0) + { + if(first) + { + first = 0; + last_value =(bat_volt-3.0)*167;//(bat_volt-3.5)/0.6*100 + } + last_value = 0.9*last_value + (bat_volt-3.0)*16.7; + if(last_value>100) + last_value = 100; + if(last_value<0) + last_value = 0; + }else{ + last_value=0; + } } return last_value; } \ No newline at end of file -- Gitblit v1.9.3