From 76c6f753fae3cc84ebb0f129d10aff2fb5c9720f Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 08 八月 2025 16:56:23 +0800
Subject: [PATCH] 免布线基站V1.13，修改电量百分比算法，使能显示到100%
---
keil/Objects/uwb_simple_example.build_log.htm | 130 +++++++++++++++++++++++++++++-------------
1 files changed, 89 insertions(+), 41 deletions(-)
diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm
index fc28ee5..d91b4d7 100644
--- a/keil/Objects/uwb_simple_example.build_log.htm
+++ b/keil/Objects/uwb_simple_example.build_log.htm
@@ -21,8 +21,8 @@
Dialog DLL: TARMCM1.DLL V1.14.2.0
<h2>Project:</h2>
-D:\project chen\ChinaUWBProject_tag_URT\keil\uwb_simple_example.uvprojx
-Project File Date: 09/13/2024
+D:\project_chen\ChinaUWBProject_URT no UWB\ChinaUWBProject\keil\uwb_simple_example.uvprojx
+Project File Date: 08/08/2025
<h2>Output:</h2>
*** Using Compiler 'V6.14', folder: 'd:\Keil_v5\ARM\ARMCLANG\Bin'
@@ -33,40 +33,64 @@
include/main/main.c(57): note: declare 'static' if the variable is not intended to be used outside of this translation unit
uint8_t trx_buf[10] = {0};
^
-include/main/main.c(67): warning: no previous extern declaration for non-static variable 'test_uart_cfg' [-Wmissing-variable-declarations]
+include/main/main.c(72): warning: no previous extern declaration for non-static variable 'test_uart_cfg' [-Wmissing-variable-declarations]
struct UART_CFG_T test_uart_cfg =
^
-include/main/main.c(67): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+include/main/main.c(72): note: declare 'static' if the variable is not intended to be used outside of this translation unit
struct UART_CFG_T test_uart_cfg =
^
-include/main/main.c(106): warning: no previous extern declaration for non-static variable 'state5v' [-Wmissing-variable-declarations]
-uint8_t state5v = 1;
+include/main/main.c(97): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ ASSERT(status, "WDT TIMEOUT<A3><AC><B3><CC><D0><F2><B8><B4>位");
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+./include/drivers\mk_trace.h(144): note: expanded from macro 'ASSERT'
+ trace_assert_dump(__FILE__, __FUNCTION__, __LINE__, str, ##__VA_ARGS__)
+ ^~~
+include/main/main.c(114): warning: no previous extern declaration for non-static variable 'app_wdt_cfg' [-Wmissing-variable-declarations]
+ struct WDT_CFG_T app_wdt_cfg = {
+ ^
+include/main/main.c(114): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+ struct WDT_CFG_T app_wdt_cfg = {
+ ^
+include/main/main.c(121): warning: no previous extern declaration for non-static variable 'state5v' [-Wmissing-variable-declarations]
+uint8_t state5v = 0;
^
-include/main/main.c(106): note: declare 'static' if the variable is not intended to be used outside of this translation unit
-uint8_t state5v = 1;
+include/main/main.c(121): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+uint8_t state5v = 0;
^
-include/main/main.c(107): warning: no previous extern declaration for non-static variable 'bat_percent' [-Wmissing-variable-declarations]
+include/main/main.c(122): warning: no previous extern declaration for non-static variable 'bat_percent' [-Wmissing-variable-declarations]
uint8_t bat_percent=0,g_start_send_flag=1;
^
-include/main/main.c(107): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+include/main/main.c(122): note: declare 'static' if the variable is not intended to be used outside of this translation unit
uint8_t bat_percent=0,g_start_send_flag=1;
^
-include/main/main.c(107): warning: no previous extern declaration for non-static variable 'g_start_send_flag' [-Wmissing-variable-declarations]
+include/main/main.c(122): warning: no previous extern declaration for non-static variable 'g_start_send_flag' [-Wmissing-variable-declarations]
uint8_t bat_percent=0,g_start_send_flag=1;
^
-include/main/main.c(107): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+include/main/main.c(122): note: declare 'static' if the variable is not intended to be used outside of this translation unit
uint8_t bat_percent=0,g_start_send_flag=1;
^
-include/main/main.c(165): warning: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char') [-Wimplicit-int-conversion]
+include/main/main.c(136): warning: no previous extern declaration for non-static variable 'sleep_limit_time' [-Wmissing-variable-declarations]
+uint8_t sleep_limit_time=1;
+ ^
+include/main/main.c(136): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+uint8_t sleep_limit_time=1;
+^
+include/main/main.c(172): warning: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char') [-Wimplicit-int-conversion]
+ bat_percent = ((fVoltage_mv - 3000) /3);
+ ~ ~~~~~~~~~~~~~~~~~~~~~^~
+include/main/main.c(179): warning: unused variable 'lost_jumpcount' [-Wunused-variable]
+ static uint8_t lost_jumpcount=0;
+ ^
+include/main/main.c(226): warning: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char') [-Wimplicit-int-conversion]
bat_percent = ((fVoltage_mv - 3300) /8);
~ ~~~~~~~~~~~~~~~~~~~~~^~
-include/main/main.c(178): warning: implicit conversion loses integer precision: 'uint16_t' (aka 'unsigned short') to 'uint8_t' (aka 'unsigned char') [-Wimplicit-int-conversion]
+include/main/main.c(240): warning: implicit conversion loses integer precision: 'uint16_t' (aka 'unsigned short') to 'uint8_t' (aka 'unsigned char') [-Wimplicit-int-conversion]
group_id=g_com_map[GROUP_ID];
~^~~~~~~~~~~~~~~~~~~
-include/main/main.c(180): warning: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char') [-Wimplicit-int-conversion]
-tag_frequence=1000/g_com_map[COM_INTERVAL];
+include/main/main.c(242): warning: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char') [-Wimplicit-int-conversion]
+tag_frequency=1000/g_com_map[COM_INTERVAL];
~~~~~^~~~~~~~~~~~~~~~~~~~~~~~
-include/main/main.c(182): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+include/main/main.c(244): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
LOG_INFO(TRACE_MODULE_APP,"<C9>璞窱D: %x .\r\n",dev_id);
^~~~
./include/drivers\mk_trace.h(170): note: expanded from macro 'LOG_INFO'
@@ -75,66 +99,90 @@
./include/drivers\mk_trace.h(132): note: expanded from macro 'TRACE'
#define TRACE(module, level, str, ...) trace_printf((module), (level), (str), ##__VA_ARGS__)
^~~
-include/main/main.c(183): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
-LOG_INFO(TRACE_MODULE_APP,"<B9>碳<FE><B0>姹�:UWB-<B1><EA>签 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
- ^~~~~~~~~~~~ ~~~~~~~~
+include/main/main.c(245): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+LOG_INFO(TRACE_MODULE_APP,"<B9>碳<FE><B0>姹�:UWB-<C3>獠�<CF><DF><D0>疟<EA> V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+ ^~~~~~~~~~~~ ~~~~ ~~~~~~~~~~~~ ~~~~
./include/drivers\mk_trace.h(170): note: expanded from macro 'LOG_INFO'
#define LOG_INFO(LOG_MODULE, str, ...) TRACE(LOG_MODULE, TRACE_LEVEL_INFO, str, ##__VA_ARGS__)
^~~
./include/drivers\mk_trace.h(132): note: expanded from macro 'TRACE'
#define TRACE(module, level, str, ...) trace_printf((module), (level), (str), ##__VA_ARGS__)
^~~
-include/main/main.c(226): warning: implicit declaration of function 'reset_cause_get' is invalid in C99 [-Wimplicit-function-declaration]
+include/main/main.c(291): warning: implicit declaration of function 'reset_cause_get' is invalid in C99 [-Wimplicit-function-declaration]
reset_cause_get();
^
-include/main/main.c(227): warning: implicit declaration of function 'reset_cause_clear' is invalid in C99 [-Wimplicit-function-declaration]
+include/main/main.c(292): warning: implicit declaration of function 'reset_cause_clear' is invalid in C99 [-Wimplicit-function-declaration]
reset_cause_clear();
^
-include/main/main.c(65): warning: no previous extern declaration for non-static variable 'enable_sleep_count' [-Wmissing-variable-declarations]
+include/main/main.c(333): warning: implicit declaration of function 'Tag_uwb_init' is invalid in C99 [-Wimplicit-function-declaration]
+ Tag_uwb_init();
+ ^
+include/main/main.c(358): warning: implicit declaration of function 'LoraUp_Poll' is invalid in C99 [-Wimplicit-function-declaration]
+ LoraUp_Poll();
+ ^
+include/main/main.c(68): warning: no previous extern declaration for non-static variable 'enable_sleep_count' [-Wmissing-variable-declarations]
uint8_t enable_sleep_count,sleep_flag;
^
-include/main/main.c(65): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+include/main/main.c(68): note: declare 'static' if the variable is not intended to be used outside of this translation unit
uint8_t enable_sleep_count,sleep_flag;
^
-include/main/main.c(65): warning: no previous extern declaration for non-static variable 'sleep_flag' [-Wmissing-variable-declarations]
+include/main/main.c(68): warning: no previous extern declaration for non-static variable 'sleep_flag' [-Wmissing-variable-declarations]
uint8_t enable_sleep_count,sleep_flag;
^
-include/main/main.c(65): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+include/main/main.c(68): note: declare 'static' if the variable is not intended to be used outside of this translation unit
uint8_t enable_sleep_count,sleep_flag;
^
-include/main/main.c(108): warning: no previous extern declaration for non-static variable 'fVoltage_mv' [-Wmissing-variable-declarations]
+include/main/main.c(69): warning: no previous extern declaration for non-static variable 'battery_get_count' [-Wmissing-variable-declarations]
+uint32_t battery_get_count;
+ ^
+include/main/main.c(69): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+uint32_t battery_get_count;
+^
+include/main/main.c(71): warning: no previous extern declaration for non-static variable 'reboot_num' [-Wmissing-variable-declarations]
+uint32_t reboot_num;
+ ^
+include/main/main.c(71): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+uint32_t reboot_num;
+^
+include/main/main.c(123): warning: no previous extern declaration for non-static variable 'fVoltage_mv' [-Wmissing-variable-declarations]
int16_t fVoltage_mv;
^
-include/main/main.c(108): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+include/main/main.c(123): note: declare 'static' if the variable is not intended to be used outside of this translation unit
int16_t fVoltage_mv;
^
-include/main/main.c(112): warning: no previous extern declaration for non-static variable 'tag_frequence' [-Wmissing-variable-declarations]
-uint8_t tag_frequence;
+include/main/main.c(128): warning: no previous extern declaration for non-static variable 'tag_frequency' [-Wmissing-variable-declarations]
+uint8_t tag_frequency;
^
-include/main/main.c(112): note: declare 'static' if the variable is not intended to be used outside of this translation unit
-uint8_t tag_frequence;
+include/main/main.c(128): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+uint8_t tag_frequency;
^
-include/main/main.c(91): warning: unused variable 'sample' [-Wunused-variable]
+include/main/main.c(247): warning: no previous extern declaration for non-static variable 'test1' [-Wmissing-variable-declarations]
+uint8_t test1;
+ ^
+include/main/main.c(247): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+uint8_t test1;
+^
+include/main/main.c(100): warning: unused variable 'sample' [-Wunused-variable]
static uint32_t sample[NUM_SAMPLES] = {0};
^
-include/main/main.c(92): warning: unused variable 'usr_adc_cfg' [-Wunused-variable]
+include/main/main.c(101): warning: unused variable 'usr_adc_cfg' [-Wunused-variable]
static struct ADC_CFG_T usr_adc_cfg = {
^
-include/main/main.c(146): warning: unused function 'adc_callback' [-Wunused-function]
+include/main/main.c(207): warning: unused function 'adc_callback' [-Wunused-function]
static void adc_callback(void *data, uint32_t number)
^
-include/main/main.c(170): warning: unused function 'voltage_input_handler' [-Wunused-function]
+include/main/main.c(232): warning: unused function 'voltage_input_handler' [-Wunused-function]
static void voltage_input_handler(enum IO_PIN_T pin)
^
-20 warnings generated.
+30 warnings generated.
compiling main.c...
linking...
.\include\devices\MK800X\Source\ARM\MK800X_ac6_copy.sct(25): warning: L6314W: No section matches pattern *(.XIP_SECTION).
-Program Size: Code=47104 RO-data=7260 RW-data=1272 ZI-data=25020
+Program Size: Code=52788 RO-data=7296 RW-data=1284 ZI-data=26988
Finished: 0 information, 1 warning and 0 error messages.
FromELF: creating hex file...
-After Build - User command #1: fromelf.exe --bincombined -o "Output\uwb_simple_example.bin" "D:\project chen\ChinaUWBProject_tag_URT\keil\Objects\uwb_simple_example.axf"
-".\Objects\uwb_simple_example.axf" - 0 Error(s), 21 Warning(s).
+After Build - User command #1: fromelf.exe --bincombined -o "Output\uwb_simple_example.bin" "D:\project_chen\ChinaUWBProject_URT no UWB\ChinaUWBProject\keil\Objects\uwb_simple_example.axf"
+".\Objects\uwb_simple_example.axf" - 0 Error(s), 31 Warning(s).
<h2>Software Packages used:</h2>
@@ -148,7 +196,7 @@
d:\Users\xookk\AppData\Local\Arm\Packs\MKSEMI\MK800X_DFP\1.0.3\Device\Include
<h2>Collection of Component Files used:</h2>
-Build Time Elapsed: 00:00:02
+Build Time Elapsed: 00:00:09
</pre>
</body>
</html>
--
Gitblit v1.9.3