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 | 256 ++++++--------------------------------------------
1 files changed, 32 insertions(+), 224 deletions(-)
diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 86d9f0d..7584a37 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -21,238 +21,46 @@
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/04/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'.
-assembling startup_stm32l051xx.s...
-compiling deca_range_tables.c...
-compiling deca_params_init.c...
-compiling dps310.c...
-..\Src\ExternalDevices\dps310.c(264): warning: #223-D: function "test_read_block" declared implicitly
- ret = test_read_block(IFX_DPS310_PSR_TMP_READ_REG_ADDR,
-..\Src\ExternalDevices\dps310.c: 1 warning, 0 errors
-compiling global_param.c...
-../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\application\global_param.c(17): warning: #223-D: function "printf" declared implicitly
- printf("进入升级模式\r\n");
-..\Src\application\global_param.c(20): warning: #223-D: function "delay_ms" declared implicitly
- delay_ms(100);
-..\Src\application\global_param.c(49): warning: #68-D: integer conversion resulted in a change of sign
- g_com_map[DIST_OFFSET]=-31;
-..\Src\application\global_param.c: 4 warnings, 0 errors
-compiling Usart.c...
-compiling Flash.c...
-..\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\OnChipDevices\Flash.c: 1 warning, 0 errors
-compiling Spi.c...
-..\Src\OnChipDevices\Spi.c(28): warning: #223-D: function "printf" declared implicitly
- printf("LORA_cs_error\r\n");
-..\Src\OnChipDevices\Spi.c(50): warning: #177-D: variable "stat" was declared but never referenced
- decaIrqStatus_t stat ;
-..\Src\OnChipDevices\Spi.c(101): warning: #177-D: variable "stat" was declared but never referenced
- decaIrqStatus_t stat ;
-..\Src\OnChipDevices\Spi.c: 3 warnings, 0 errors
-compiling ADC.c...
-..\Src\OnChipDevices\ADC.c(11): warning: #940-D: missing return statement at end of non-void function "Get_ADC_Value"
- }
-..\Src\OnChipDevices\ADC.c(36): warning: #1-D: last line of file ends without a newline
- }
-..\Src\OnChipDevices\ADC.c: 2 warnings, 0 errors
-compiling dw_driver.c...
-..\Src\ExternalDevices\dw_driver.c(9): warning: #223-D: function "delay_us" declared implicitly
- delay_us(i);
-..\Src\ExternalDevices\dw_driver.c: 1 warning, 0 errors
-compiling CRC.c...
-..\Src\application\CRC.c(44): warning: #1-D: last line of file ends without a newline
- }
-..\Src\application\CRC.c: 1 warning, 0 errors
-compiling serial_at_cmd_app.c...
-..\Src\application\serial_at_cmd_app.c(11): warning: #47-D: incompatible redefinition of macro "EUART_RX_BUF_SIZE" (declared at line 40 of "../Src/OnChipDevices/Usart.h")
- #define EUART_RX_BUF_SIZE 100
-..\Src\application\serial_at_cmd_app.c(52): warning: #223-D: function "FLASH_Prepare" declared implicitly
- result = FLASH_Prepare(0x8004A38, 128);
-..\Src\application\serial_at_cmd_app.c(54): warning: #223-D: function "FLASH_Write" declared implicitly
- result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2);
-..\Src\application\serial_at_cmd_app.c(59): warning: #223-D: function "delay_ms" declared implicitly
- delay_ms(100);
-..\Src\application\serial_at_cmd_app.c(69): warning: #223-D: function "delay_ms" declared implicitly
- delay_ms(100);
-..\Src\application\serial_at_cmd_app.c(76): warning: #223-D: function "delay_ms" declared implicitly
- delay_ms(100);
-..\Src\application\serial_at_cmd_app.c(112): warning: #223-D: function "delay_ms" declared implicitly
- delay_ms(100);
-..\Src\application\serial_at_cmd_app.c: 7 warnings, 0 errors
-compiling dps368_test.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\ExternalDevices\dps368_test.c(45): warning: #177-D: variable "temp" was declared but never referenced
- uint32_t temp=0;
-..\Src\ExternalDevices\dps368_test.c(67): warning: #940-D: missing return statement at end of non-void function "test_write_byte"
- }
-..\Src\ExternalDevices\dps368_test.c(158): warning: #1-D: last line of file ends without a newline
- }
-..\Src\ExternalDevices\dps368_test.c(145): warning: #550-D: variable "ret" was set but never used
- { u8 ret;
-..\Src\ExternalDevices\dps368_test.c: 5 warnings, 0 errors
-compiling dw_app.c...
-..\Src\application\dw_app.c(145): warning: #223-D: function "delay_us" declared implicitly
- delay_us(600);
-..\Src\application\dw_app.c: 1 warning, 0 errors
-compiling stm32l0xx_it.c...
-../Src/stm32l0xx_it.c(162): warning: #223-D: function "UsartInit" declared implicitly
- UsartInit();
-../Src/stm32l0xx_it.c: 1 warning, 0 errors
-compiling lis3dh_driver.c...
-..\Drivers\ExternlDrivers\lis3dh_driver.h(67): warning: #1295-D: Deprecated declaration LIS3DH_ENTER_STY_Init - give arg types
- void LIS3DH_ENTER_STY_Init();
-..\Drivers\ExternlDrivers\lis3dh_driver.c(123): warning: #177-D: variable "lisid" was declared but never referenced
- uint8_t lisid,response;
-..\Drivers\ExternlDrivers\lis3dh_driver.c(123): warning: #177-D: variable "response" was declared but never referenced
- uint8_t lisid,response;
-..\Drivers\ExternlDrivers\lis3dh_driver.c(124): warning: #177-D: variable "lisidtemp" was declared but never referenced
- uint8_t lisidtemp;
-..\Drivers\ExternlDrivers\lis3dh_driver.c(162): warning: #177-D: variable "angle_x" was declared but never referenced
- float angle_x, angle_y, angle_z, angle_xyz;
-..\Drivers\ExternlDrivers\lis3dh_driver.c(162): warning: #177-D: variable "angle_y" was declared but never referenced
- float angle_x, angle_y, angle_z, angle_xyz;
-..\Drivers\ExternlDrivers\lis3dh_driver.c(162): warning: #177-D: variable "angle_xyz" was declared but never referenced
- float angle_x, angle_y, angle_z, angle_xyz;
-..\Drivers\ExternlDrivers\lis3dh_driver.c(163): warning: #177-D: variable "data" was declared but never referenced
- int8_t data[6];
-..\Drivers\ExternlDrivers\lis3dh_driver.c(164): warning: #177-D: variable "i" was declared but never referenced
- uint8_t i;
-..\Drivers\ExternlDrivers\lis3dh_driver.c(165): warning: #550-D: variable "lisid" was set but never used
- uint8_t lisid,response;
-..\Drivers\ExternlDrivers\lis3dh_driver.c: 10 warnings, 0 errors
-compiling dw_mbx_tag.c...
-..\Src\application\dw_mbx_tag.c(97): warning: #940-D: missing return statement at end of non-void function "Anchor_RecNearPoll"
- }
-..\Src\application\dw_mbx_tag.c(102): 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(170): warning: #177-D: variable "target_tagi" was declared but never referenced
- {uint8_t target_tagi;
-..\Src\application\dw_mbx_tag.c(159): warning: #177-D: variable "tag_recv_interval" was declared but never referenced
- uint16_t tag_recv_interval;
-..\Src\application\dw_mbx_tag.c(160): warning: #177-D: variable "temp_tagpos" was declared but never referenced
- float temp_tagpos;
-..\Src\application\dw_mbx_tag.c(133): warning: #177-D: variable "send_len" was declared but never referenced
- u8 send_len,i;
-..\Src\application\dw_mbx_tag.c(135): warning: #177-D: variable "rec_syncid" was declared but never referenced
- uint32_t rec_syncid,status_reg;
-..\Src\application\dw_mbx_tag.c(136): warning: #177-D: variable "checksum" was declared but never referenced
- uint16_t checksum;
-..\Src\application\dw_mbx_tag.c(137): warning: #177-D: variable "kk" was declared but never referenced
- uint8_t kk;
-..\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: 17 warnings, 0 errors
-compiling deca_device.c...
-..\Src\decadriver\deca_device.c(1557): warning: #223-D: function "delay_ms" declared implicitly
- deca_sleep(10);
-..\Src\decadriver\deca_device.c(1642): warning: #223-D: function "delay_ms" declared implicitly
- deca_sleep(1);
-..\Src\decadriver\deca_device.c(1847): warning: #223-D: function "delay_ms" declared implicitly
- deca_sleep(1);
-..\Src\decadriver\deca_device.c(2004): warning: #223-D: function "delay_ms" declared implicitly
- deca_sleep(5);
-..\Src\decadriver\deca_device.c(2070): warning: #223-D: function "delay_ms" declared implicitly
- deca_sleep(1); // Allow time for code to upload (should take up to 120 us)
-..\Src\decadriver\deca_device.c(2866): warning: #177-D: variable "stat" was declared but never referenced
- decaIrqStatus_t stat ;
-..\Src\decadriver\deca_device.c(3088): warning: #177-D: variable "stat" was declared but never referenced
- decaIrqStatus_t stat ;
-..\Src\decadriver\deca_device.c(3230): warning: #223-D: function "delay_ms" declared implicitly
- deca_sleep(1);
-..\Src\decadriver\deca_device.c(3420): warning: #223-D: function "delay_ms" declared implicitly
- deca_sleep(1); // If using PLL clocks(and fast SPI rate) then this sleep is needed
-..\Src\decadriver\deca_device.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/main.c(291): warning: #186-D: pointless comparison of unsigned integer with zero
- if(module_power<0)
-../Src/main.c(242): warning: #177-D: variable "temp" was declared but never referenced
- { float temp;
-../Src/main.c(243): warning: #177-D: variable "temp2" was declared but never referenced
- uint16_t temp2;
-../Src/main.c(244): warning: #177-D: variable "i" was declared but never referenced
- uint16_t i;
-../Src/main.c(322): warning: #177-D: variable "bat_count" was declared but never referenced
- static uint16_t bat_count = 0;
-../Src/main.c(361): warning: #223-D: function "RadioIrqProcess" declared implicitly
- RadioIrqProcess();
-../Src/main.c(833): warning: #223-D: function "Usart1InitVariables" declared implicitly
- Usart1InitVariables();
-../Src/main.c(1138): warning: #223-D: function "delay_ms" declared implicitly
- delay_ms(100);
-../Src/main.c(1141): warning: #223-D: function "delay_ms" declared implicitly
- delay_ms(10);
-../Src/main.c(300): warning: #177-D: function "SystemPower_Config" was declared but never referenced
- static void SystemPower_Config(void)
-../Src/main.c(376): warning: #177-D: variable "send_frame1" was declared but never referenced
- static uint8_t send_frame1[EUART_RX_BUF_SIZE];
-../Src/main.c: 13 warnings, 0 errors
-compiling crc.c...
-compiling sx126x.c...
-compiling delay.c...
-compiling system_stm32l0xx.c...
-compiling stm32l0xx_hal_msp.c...
-compiling radio.c...
-compiling stm32l0xx_hal_adc_ex.c...
-compiling sx126x-board.c...
-..\Src\radio\sx126x-board.c(41): warning: #223-D: function "printf" declared implicitly
- printf("uwb_cs_error\r\n");
-..\Src\radio\sx126x-board.c(66): warning: #223-D: function "delay_us" declared implicitly
- delay_us( 2000 );
-..\Src\radio\sx126x-board.c: 2 warnings, 0 errors
-compiling stm32l0xx_hal.c...
-compiling stm32l0xx_hal_adc.c...
+<<<<<<< HEAD
+"L051\L051.axf" - 0 Error(s), 0 Warning(s).
+=======
compiling Lora.c...
-compiling stm32l0xx_hal_i2c_ex.c...
-compiling stm32l0xx_hal_rcc.c...
-compiling stm32l0xx_hal_i2c.c...
-compiling stm32l0xx_hal_flash_ramfunc.c...
-compiling stm32l0xx_hal_flash_ex.c...
-compiling stm32l0xx_hal_dma.c...
-compiling stm32l0xx_hal_flash.c...
-compiling stm32l0xx_hal_gpio.c...
-compiling stm32l0xx_hal_rcc_ex.c...
-compiling stm32l0xx_hal_cortex.c...
-compiling stm32l0xx_hal_pwr.c...
-compiling stm32l0xx_hal_pwr_ex.c...
-compiling stm32l0xx_hal_iwdg.c...
-compiling stm32l0xx_hal_uart_ex.c...
-compiling stm32l0xx_hal_lptim.c...
-compiling stm32l0xx_hal_uart.c...
-compiling stm32l0xx_hal_spi.c...
-compiling stm32l0xx_hal_tim_ex.c...
-compiling stm32l0xx_hal_tim.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/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/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.c(20): warning: #1295-D: Deprecated declaration LoraUp_Poll - give arg types
+ void LoraUp_Poll();
+..\Src\radio\Lora.c(475): warning: #223-D: function "delay_ms" declared implicitly
+ delay_ms(200);
+..\Src\radio\Lora.c(459): warning: #177-D: variable "result" was declared but never referenced
+ { uint16_t result ;
+..\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
linking...
-Program Size: Code=28904 RO-data=684 RW-data=676 ZI-data=6924
+Program Size: Code=30116 RO-data=684 RW-data=692 ZI-data=7420
FromELF: creating hex file...
-"L051\L051.axf" - 0 Error(s), 78 Warning(s).
+"L051\L051.axf" - 0 Error(s), 9 Warning(s).
+>>>>>>> c8cbb8205d69b4120122a7d0923edcca611399ef
<h2>Software Packages used:</h2>
@@ -275,7 +83,7 @@
<h2>Collection of Component Files used:</h2>
* Component: ARM::CMSIS:CORE:5.5.0
-Build Time Elapsed: 00:00:06
+Build Time Elapsed: 00:00:02
</pre>
</body>
</html>
--
Gitblit v1.9.3