From 863f8f72d0726c104db21799a8d642f4e04ac93f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 11 十一月 2021 17:40:09 +0800
Subject: [PATCH] Merge branch '定位-临近' into 定位-临近-物资
---
MDK-ARM/L051/L051.build_log.htm | 170 +++++++++++++++++++++++++++++---------------------------
1 files changed, 87 insertions(+), 83 deletions(-)
diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index bca39f9..f13ff71 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -41,6 +41,50 @@
..\Src\OnChipDevices\ADC.c(36): warning: #1-D: last line of file ends without a newline
}
..\Src\OnChipDevices\ADC.c: 3 warnings, 0 errors
+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 serial_at_cmd_app.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\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(75): warning: #223-D: function "delay_ms" declared implicitly
+ delay_ms(100);
+..\Src\application\serial_at_cmd_app.c: 3 warnings, 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(33): warning: #68-D: integer conversion resulted in a change of sign
+ g_com_map[DIST_OFFSET]=-31;
+..\Src\application\global_param.c: 2 warnings, 0 errors
+compiling stm32l0xx_hal_msp.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/stm32l0xx_hal_msp.c: 1 warning, 0 errors
+compiling stm32l0xx_it.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/stm32l0xx_it.c(96): warning: #223-D: function "printf" declared implicitly
+ printf("HardFault_Handler.\r\n");
+../Src/stm32l0xx_it.c(155): warning: #223-D: function "SystemClock_Config" declared implicitly
+ SystemClock_Config();
+../Src/stm32l0xx_it.c(168): warning: #223-D: function "delay_ms" declared implicitly
+ delay_ms(10);
+../Src/stm32l0xx_it.c: 4 warnings, 0 errors
+compiling Spi.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\Spi.c(43): warning: #177-D: variable "stat" was declared but never referenced
+ decaIrqStatus_t stat ;
+..\Src\OnChipDevices\Spi.c(94): warning: #177-D: variable "stat" was declared but never referenced
+ decaIrqStatus_t stat ;
+..\Src\OnChipDevices\Spi.c: 3 warnings, 0 errors
+compiling Usart.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\Usart.c: 1 warning, 0 errors
compiling dps368_test.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
@@ -55,48 +99,6 @@
..\Src\ExternalDevices\dps368_test.c(145): warning: #550-D: variable "ret" was set but never used
{ u8 ret;
..\Src\ExternalDevices\dps368_test.c: 6 warnings, 0 errors
-compiling stm32l0xx_it.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/stm32l0xx_it.c(96): warning: #223-D: function "printf" declared implicitly
- printf("HardFault_Handler.\r\n");
-../Src/stm32l0xx_it.c(167): warning: #223-D: function "delay_ms" declared implicitly
- delay_ms(10);
-../Src/stm32l0xx_it.c: 3 warnings, 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(33): warning: #68-D: integer conversion resulted in a change of sign
- g_com_map[DIST_OFFSET]=-31;
-..\Src\application\global_param.c: 2 warnings, 0 errors
-compiling stm32l0xx_hal_msp.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/stm32l0xx_hal_msp.c: 1 warning, 0 errors
-compiling serial_at_cmd_app.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\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(75): warning: #223-D: function "delay_ms" declared implicitly
- delay_ms(100);
-..\Src\application\serial_at_cmd_app.c: 3 warnings, 0 errors
-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\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\Spi.c(43): warning: #177-D: variable "stat" was declared but never referenced
- decaIrqStatus_t stat ;
-..\Src\OnChipDevices\Spi.c(94): warning: #177-D: variable "stat" was declared but never referenced
- decaIrqStatus_t stat ;
-..\Src\OnChipDevices\Spi.c: 3 warnings, 0 errors
-compiling Usart.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\Usart.c: 1 warning, 0 errors
compiling lis3dh_driver.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
@@ -106,23 +108,23 @@
uint8_t lisid,response;
..\Drivers\ExternlDrivers\lis3dh_driver.c(83): warning: #177-D: variable "response" was declared but never referenced
uint8_t lisid,response;
-..\Drivers\ExternlDrivers\lis3dh_driver.c(121): warning: #177-D: variable "lisid" was declared but never referenced
+..\Drivers\ExternlDrivers\lis3dh_driver.c(128): warning: #177-D: variable "lisid" was declared but never referenced
uint8_t lisid,response;
-..\Drivers\ExternlDrivers\lis3dh_driver.c(121): warning: #177-D: variable "response" was declared but never referenced
+..\Drivers\ExternlDrivers\lis3dh_driver.c(128): warning: #177-D: variable "response" was declared but never referenced
uint8_t lisid,response;
-..\Drivers\ExternlDrivers\lis3dh_driver.c(122): warning: #177-D: variable "lisidtemp" was declared but never referenced
+..\Drivers\ExternlDrivers\lis3dh_driver.c(129): warning: #177-D: variable "lisidtemp" was declared but never referenced
uint8_t lisidtemp;
-..\Drivers\ExternlDrivers\lis3dh_driver.c(160): warning: #177-D: variable "angle_x" was declared but never referenced
+..\Drivers\ExternlDrivers\lis3dh_driver.c(167): 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(160): warning: #177-D: variable "angle_y" was declared but never referenced
+..\Drivers\ExternlDrivers\lis3dh_driver.c(167): 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(160): warning: #177-D: variable "angle_xyz" was declared but never referenced
+..\Drivers\ExternlDrivers\lis3dh_driver.c(167): 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(161): warning: #177-D: variable "data" was declared but never referenced
+..\Drivers\ExternlDrivers\lis3dh_driver.c(168): warning: #177-D: variable "data" was declared but never referenced
int8_t data[6];
-..\Drivers\ExternlDrivers\lis3dh_driver.c(162): warning: #177-D: variable "i" was declared but never referenced
+..\Drivers\ExternlDrivers\lis3dh_driver.c(169): warning: #177-D: variable "i" was declared but never referenced
uint8_t i;
-..\Drivers\ExternlDrivers\lis3dh_driver.c(163): warning: #550-D: variable "lisid" was set but never used
+..\Drivers\ExternlDrivers\lis3dh_driver.c(170): warning: #550-D: variable "lisid" was set but never used
uint8_t lisid,response;
..\Drivers\ExternlDrivers\lis3dh_driver.c: 13 warnings, 0 errors
compiling main.c...
@@ -130,37 +132,39 @@
#define FLASH_SIZE (uint32_t)0x10000
..\Drivers\ExternlDrivers\lis3dh_driver.h(67): warning: #1295-D: Deprecated declaration LIS3DH_ENTER_STY_Init - give arg types
void LIS3DH_ENTER_STY_Init();
-../Src/main.c(231): warning: #223-D: function "printf" declared implicitly
+../Src/main.c(220): warning: #223-D: function "printf" declared implicitly
printf("进入升级模式\r\n");
-../Src/main.c(234): warning: #223-D: function "delay_ms" declared implicitly
+../Src/main.c(223): warning: #223-D: function "delay_ms" declared implicitly
delay_ms(100);
-../Src/main.c(244): warning: #223-D: function "delay_ms" declared implicitly
+../Src/main.c(233): warning: #223-D: function "delay_ms" declared implicitly
delay_ms(100);
-../Src/main.c(251): warning: #223-D: function "delay_ms" declared implicitly
+../Src/main.c(240): warning: #223-D: function "delay_ms" declared implicitly
delay_ms(100);
-../Src/main.c(312): warning: #186-D: pointless comparison of unsigned integer with zero
+../Src/main.c(270): warning: #186-D: pointless comparison of unsigned integer with zero
if(g_com_map[POWER]<0)
-../Src/main.c(317): warning: #177-D: variable "temp" was declared but never referenced
+../Src/main.c(275): warning: #177-D: variable "temp" was declared but never referenced
{ float temp;
-../Src/main.c(318): warning: #177-D: variable "temp2" was declared but never referenced
+../Src/main.c(276): warning: #177-D: variable "temp2" was declared but never referenced
uint16_t temp2;
-../Src/main.c(319): warning: #177-D: variable "i" was declared but never referenced
+../Src/main.c(277): warning: #177-D: variable "i" was declared but never referenced
uint16_t i;
-../Src/main.c(462): warning: #223-D: function "BarInit" declared implicitly
- BarInit();
-../Src/main.c(494): warning: #177-D: variable "blink_count" was declared but never referenced
+../Src/main.c(420): warning: #223-D: function "BarInit" declared implicitly
+ BarInit();
+../Src/main.c(459): warning: #177-D: variable "blink_count" was declared but never referenced
{ static uint16_t blink_count=0;
-../Src/main.c(828): warning: #223-D: function "Usart1InitVariables" declared implicitly
+../Src/main.c(786): warning: #223-D: function "Usart1InitVariables" declared implicitly
Usart1InitVariables();
-../Src/main.c(795): warning: #177-D: variable "GPIO_InitStruct" was declared but never referenced
+../Src/main.c(753): warning: #177-D: variable "GPIO_InitStruct" was declared but never referenced
GPIO_InitTypeDef GPIO_InitStruct = {0};
-../Src/main.c(1007): warning: #223-D: function "delay_ms" declared implicitly
+../Src/main.c(964): warning: #223-D: function "delay_ms" declared implicitly
delay_ms(100);
-../Src/main.c(1010): warning: #223-D: function "delay_ms" declared implicitly
+../Src/main.c(967): warning: #223-D: function "delay_ms" declared implicitly
delay_ms(10);
-../Src/main.c(383): warning: #177-D: function "SystemPower_Config" was declared but never referenced
+../Src/main.c(930): warning: #177-D: variable "i" was declared but never referenced
+ static uint8_t i=0;
+../Src/main.c(340): warning: #177-D: function "SystemPower_Config" was declared but never referenced
static void SystemPower_Config(void)
-../Src/main.c: 17 warnings, 0 errors
+../Src/main.c: 18 warnings, 0 errors
compiling dw_app.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
@@ -184,28 +188,28 @@
u8 i,j,getsync_flag=0;
..\Src\application\dw_app.c(492): warning: #177-D: variable "j" was declared but never referenced
u8 i,j,getsync_flag=0;
-..\Src\application\dw_app.c(630): warning: #177-D: variable "start_poll" was declared but never referenced
+..\Src\application\dw_app.c(711): warning: #177-D: variable "start_poll" was declared but never referenced
u32 start_poll,frame_len;
-..\Src\application\dw_app.c(930): warning: #223-D: function "delay_ms" declared implicitly
+..\Src\application\dw_app.c(1037): warning: #223-D: function "delay_ms" declared implicitly
delay_ms(100);
-..\Src\application\dw_app.c(684): warning: #177-D: variable "temp1" was declared but never referenced
+..\Src\application\dw_app.c(773): warning: #177-D: variable "temp1" was declared but never referenced
uint32_t temp1,temp2,dw_systime,mindist_slavebaseid;
-..\Src\application\dw_app.c(684): warning: #177-D: variable "temp2" was declared but never referenced
+..\Src\application\dw_app.c(773): warning: #177-D: variable "temp2" was declared but never referenced
uint32_t temp1,temp2,dw_systime,mindist_slavebaseid;
-..\Src\application\dw_app.c(684): warning: #177-D: variable "dw_systime" was declared but never referenced
+..\Src\application\dw_app.c(773): warning: #177-D: variable "dw_systime" was declared but never referenced
uint32_t temp1,temp2,dw_systime,mindist_slavebaseid;
-..\Src\application\dw_app.c(687): warning: #177-D: variable "start_poll" was declared but never referenced
+..\Src\application\dw_app.c(776): warning: #177-D: variable "start_poll" was declared but never referenced
u32 start_poll;
-..\Src\application\dw_app.c(688): warning: #177-D: variable "j" was declared but never referenced
+..\Src\application\dw_app.c(777): warning: #177-D: variable "j" was declared but never referenced
u8 i,j,getsync_flag=0,timeout;
-..\Src\application\dw_app.c(688): warning: #177-D: variable "getsync_flag" was declared but never referenced
+..\Src\application\dw_app.c(777): warning: #177-D: variable "getsync_flag" was declared but never referenced
u8 i,j,getsync_flag=0,timeout;
-..\Src\application\dw_app.c(990): warning: #177-D: variable "rec_nearbasepos" was declared but never referenced
+..\Src\application\dw_app.c(1101): warning: #177-D: variable "rec_nearbasepos" was declared but never referenced
{ u16 rec_nearbaseid,rec_nearbasepos;
-..\Src\application\dw_app.c(1037): warning: #223-D: function "delay_us" declared implicitly
+..\Src\application\dw_app.c(1149): warning: #223-D: function "delay_us" declared implicitly
delay_us(700);
-..\Src\application\dw_app.c(1038): warning: #223-D: function "GetPressAndHeight" declared implicitly
- GetPressAndHeight();
+..\Src\application\dw_app.c(1188): warning: #223-D: function "GetPressAndHeight" declared implicitly
+ GetPressAndHeight();
..\Src\application\dw_app.c(107): warning: #177-D: variable "poll_rx_ts" was declared but never referenced
static uint64_t poll_rx_ts;
..\Src\application\dw_app.c(108): warning: #177-D: variable "resp_tx_ts" was declared but never referenced
@@ -240,9 +244,9 @@
deca_sleep(1); // If using PLL clocks(and fast SPI rate) then this sleep is needed
..\Src\decadriver\deca_device.c: 10 warnings, 0 errors
linking...
-Program Size: Code=29836 RO-data=540 RW-data=388 ZI-data=6740
+Program Size: Code=30556 RO-data=540 RW-data=400 ZI-data=6760
FromELF: creating hex file...
-"L051\L051.axf" - 0 Error(s), 92 Warning(s).
+"L051\L051.axf" - 0 Error(s), 94 Warning(s).
<h2>Software Packages used:</h2>
@@ -265,7 +269,7 @@
<h2>Collection of Component Files used:</h2>
* Component: ARM::CMSIS:CORE:5.5.0
-Build Time Elapsed: 00:00:03
+Build Time Elapsed: 00:00:04
</pre>
</body>
</html>
--
Gitblit v1.9.3