From 2b07faacf6d1ce3de7ace73af366e5b84e652c14 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 13 十一月 2024 16:37:43 +0800
Subject: [PATCH] Merge branch '免布线标签-lora-泰斗GPS' of http://47.108.70.204:60062/r/XRange_Tag into 免布线标签-lora-泰斗GPS
---
MDK-ARM/L051/L051.build_log.htm | 101 +++++++-------------------------------------------
1 files changed, 15 insertions(+), 86 deletions(-)
diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index c405c25..7584a37 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -21,57 +21,21 @@
Dialog DLL: TARMCM1.DLL V1.14.2.0
<h2>Project:</h2>
+<<<<<<< HEAD
+C:\git\XRange_Tag -Lora-R - GPS\MDK-ARM\L051.uvprojx
+Project File Date: 11/12/2024
+=======
E:\GIT\XRange_Tag\MDK-ARM\L051.uvprojx
-Project File Date: 03/27/2024
+Project File Date: 10/29/2024
+>>>>>>> c8cbb8205d69b4120122a7d0923edcca611399ef
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
Build target 'L051'
Note: source file '..\Src\radio\crc.c' - object file renamed from 'L051\crc.o' to 'L051\crc_1.o'.
-compiling dw_mbx_tag.c...
-../Src/radio/lora.h(46): warning: #1-D: last line of file ends without a newline
- void LoraUp_Poll();
-../Src/radio/lora.h(46): warning: #1295-D: Deprecated declaration LoraUp_Poll - give arg types
- void LoraUp_Poll();
-..\Src\application\dw_mbx_tag.c(99): warning: #940-D: missing return statement at end of non-void function "Anchor_RecNearPoll"
- }
-..\Src\application\dw_mbx_tag.c(104): warning: #177-D: variable "temp" was declared but never referenced
- uint16_t i,j=0,k=0,temp[TAG_NUM_IN_SYS];
-..\Src\application\dw_mbx_tag.c(174): warning: #177-D: variable "target_tagi" was declared but never referenced
- { uint8_t target_tagi;
-..\Src\application\dw_mbx_tag.c(163): warning: #177-D: variable "tag_recv_interval" was declared but never referenced
- uint16_t tag_recv_interval;
-..\Src\application\dw_mbx_tag.c(164): warning: #177-D: variable "temp_tagpos" was declared but never referenced
- float temp_tagpos;
-..\Src\application\dw_mbx_tag.c(135): warning: #177-D: variable "send_len" was declared but never referenced
- u8 send_len,i;
-..\Src\application\dw_mbx_tag.c(137): warning: #177-D: variable "rec_syncid" was declared but never referenced
- uint32_t rec_syncid,status_reg;
-..\Src\application\dw_mbx_tag.c(138): warning: #177-D: variable "checksum" was declared but never referenced
- uint16_t checksum;
-..\Src\application\dw_mbx_tag.c(139): warning: #177-D: variable "kk" was declared but never referenced
- uint8_t kk;
-..\Src\application\dw_mbx_tag.c(319): warning: #177-D: variable "bat" was declared but never referenced
- u8 bat;
-..\Src\application\dw_mbx_tag.c(413): warning: #1-D: last line of file ends without a newline
- }
-..\Src\application\dw_mbx_tag.c(29): warning: #550-D: variable "result" was set but never used
- static u8 frame_len,timeout,rec_nearbase_num,result;
-..\Src\application\dw_mbx_tag.c(33): warning: #550-D: variable "status_reg" was set but never used
- static uint32_t status_reg,resp_tx_time;
-..\Src\application\dw_mbx_tag.c(42): warning: #177-D: variable "ancidlist_rec" was declared but never referenced
- static uint16_t ancidlist_rec[TAG_NUM_IN_SYS],ancidlist_send[TAG_NUM_IN_SYS],rec_ancidlist[TAG_NUM_IN_SYS],rec_ancdistlist[TAG_NUM_IN_SYS];
-..\Src\application\dw_mbx_tag.c(42): warning: #177-D: variable "ancidlist_send" was declared but never referenced
- static uint16_t ancidlist_rec[TAG_NUM_IN_SYS],ancidlist_send[TAG_NUM_IN_SYS],rec_ancidlist[TAG_NUM_IN_SYS],rec_ancdistlist[TAG_NUM_IN_SYS];
-..\Src\application\dw_mbx_tag.c(43): warning: #550-D: variable "frame_seq_nb2" was set but never used
- static u8 frame_seq_nb2,battary,button,uwb_losttimer,taglist_pos;
-..\Src\application\dw_mbx_tag.c(43): warning: #550-D: variable "battary" was set but never used
- static u8 frame_seq_nb2,battary,button,uwb_losttimer,taglist_pos;
-..\Src\application\dw_mbx_tag.c(43): warning: #550-D: variable "button" was set but never used
- static u8 frame_seq_nb2,battary,button,uwb_losttimer,taglist_pos;
-..\Src\application\dw_mbx_tag.c(43): warning: #550-D: variable "uwb_losttimer" was set but never used
- static u8 frame_seq_nb2,battary,button,uwb_losttimer,taglist_pos;
-..\Src\application\dw_mbx_tag.c: 21 warnings, 0 errors
+<<<<<<< HEAD
+"L051\L051.axf" - 0 Error(s), 0 Warning(s).
+=======
compiling Lora.c...
..\Src\radio\Lora.h(46): warning: #1-D: last line of file ends without a newline
void LoraUp_Poll();
@@ -85,53 +49,18 @@
#define FLASH_SIZE (uint32_t)0x10000
..\Src\radio\Lora.c(20): warning: #1295-D: Deprecated declaration LoraUp_Poll - give arg types
void LoraUp_Poll();
-..\Src\radio\Lora.c(464): warning: #223-D: function "delay_ms" declared implicitly
+..\Src\radio\Lora.c(475): warning: #223-D: function "delay_ms" declared implicitly
delay_ms(200);
-..\Src\radio\Lora.c(448): warning: #177-D: variable "result" was declared but never referenced
+..\Src\radio\Lora.c(459): warning: #177-D: variable "result" was declared but never referenced
{ uint16_t result ;
-..\Src\radio\Lora.c(440): warning: #177-D: variable "target_count1" was declared but never referenced
+..\Src\radio\Lora.c(451): warning: #177-D: variable "target_count1" was declared but never referenced
static uint16_t current_count1,target_count1,end_count1,start_count1;
..\Src\radio\Lora.c: 9 warnings, 0 errors
-compiling main.c...
-../Drivers/ExternlDrivers/lis3dh_driver.h(67): warning: #1295-D: Deprecated declaration LIS3DH_ENTER_STY_Init - give arg types
- void LIS3DH_ENTER_STY_Init();
-../Src/OnChipDevices/Flash.h(3): warning: #47-D: incompatible redefinition of macro "FLASH_SIZE" (declared at line 125 of "../Drivers/STM32L0xx_HAL_Driver/Inc/stm32l0xx_hal_flash.h")
- #define FLASH_SIZE (uint32_t)0x10000
-../Src/radio/Lora.h(46): warning: #1-D: last line of file ends without a newline
- void LoraUp_Poll();
-../Src/radio/Lora.h(46): warning: #1295-D: Deprecated declaration LoraUp_Poll - give arg types
- void LoraUp_Poll();
-../Src/radio/lora.h(46): warning: #1-D: last line of file ends without a newline
- void LoraUp_Poll();
-../Src/radio/lora.h(46): warning: #1295-D: Deprecated declaration LoraUp_Poll - give arg types
- void LoraUp_Poll();
-../Src/main.c(262): warning: #186-D: pointless comparison of unsigned integer with zero
- if(module_power<0)
-../Src/main.c(211): warning: #177-D: variable "temp" was declared but never referenced
- { float temp;
-../Src/main.c(212): warning: #177-D: variable "temp2" was declared but never referenced
- uint16_t temp2;
-../Src/main.c(213): warning: #177-D: variable "i" was declared but never referenced
- uint16_t i;
-../Src/main.c(293): warning: #177-D: variable "bat_count" was declared but never referenced
- static uint16_t bat_count = 0;
-../Src/main.c(332): warning: #223-D: function "RadioIrqProcess" declared implicitly
- RadioIrqProcess();
-../Src/main.c(783): warning: #223-D: function "Usart1InitVariables" declared implicitly
- Usart1InitVariables();
-../Src/main.c(1062): warning: #223-D: function "delay_ms" declared implicitly
- delay_ms(100);
-../Src/main.c(1065): warning: #223-D: function "delay_ms" declared implicitly
- delay_ms(10);
-../Src/main.c(271): warning: #177-D: function "SystemPower_Config" was declared but never referenced
- static void SystemPower_Config(void)
-../Src/main.c(347): warning: #177-D: variable "send_frame1" was declared but never referenced
- static uint8_t send_frame1[EUART_RX_BUF_SIZE];
-../Src/main.c: 17 warnings, 0 errors
linking...
-Program Size: Code=30256 RO-data=684 RW-data=700 ZI-data=7420
+Program Size: Code=30116 RO-data=684 RW-data=692 ZI-data=7420
FromELF: creating hex file...
-"L051\L051.axf" - 0 Error(s), 47 Warning(s).
+"L051\L051.axf" - 0 Error(s), 9 Warning(s).
+>>>>>>> c8cbb8205d69b4120122a7d0923edcca611399ef
<h2>Software Packages used:</h2>
--
Gitblit v1.9.3