ソースを参照

上次提交少了几个文件,这次补齐

Chenyingjia 2 年 前
コミット
175be92f2e

ファイルの差分が大きいため隠しています
+ 0 - 0
pca10040/s132/arm5_no_packs/_build/ble_app_uart_c_pca10040_s132_Shoes_FW_APP.dep


BIN
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.axf


+ 164 - 6
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.build_log.htm

@@ -5,7 +5,7 @@
 <h2>Tool Versions:</h2>
 IDE-Version: ¦ÌVision V5.30.0.0
 Copyright (C) 2020 ARM Ltd and ARM Germany GmbH. All rights reserved.
-License Information: Ou Administrator, 11, LIC=EXJT4-FD1MZ-JJG6S-L29G4-S14VJ-CPP65
+License Information: 1 Administrator, 1, LIC=47GLQ-N3Q3H-NMN9F-61XY7-CULXR-M74X3
  
 Tool Versions:
 Toolchain:       MDK-ARM Plus  Version: 5.30.0.0
@@ -21,13 +21,171 @@ Target DLL:      Segger\JL2CM3.dll V2.99.38.0
 Dialog DLL:      TCM.DLL V1.42.0.0
  
 <h2>Project:</h2>
-D:\Git_Project\shoes\smart_shoes\nRF5_SDK_17.0.0_9d13099\examples\Shoes1.3\shoe_mcu\pca10040\s132\arm5_no_packs\ble_app_uart_c_pca10040_s132.uvprojx
+F:\Lzhucong\nRF5_SDK_17.0.0_9d13099\examples\gitproject\shoe_mcu\pca10040\s132\arm5_no_packs\ble_app_uart_c_pca10040_s132.uvprojx
 Project File Date:  07/28/2022
 
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
-Build target 'Shoes_FW_APP'
-".\_build\nrf52832_xxaa.axf" - 0 Error(s), 0 Warning(s).
+Rebuild target 'Shoes_FW_APP'
+compiling system.c...
+compiling main.c...
+compiling usr.c...
+compiling exception.c...
+compiling app_overturn.c...
+..\..\..\app\app_overturn.c(192): warning:  #177-D: variable "qma_data"  was declared but never referenced
+  		qma_data_t 	qma_data={0};
+..\..\..\app\app_overturn.c: 1 warning, 0 errors
+compiling app_client_step.c...
+compiling app_host.c...
+compiling app_step.c...
+compiling app_game.c...
+compiling app_ota.c...
+compiling app_client.c...
+compiling app_connect_manage.c...
+compiling app_switchimu.c...
+compiling app_math.c...
+compiling app_losspack.c...
+compiling app_flash.c...
+compiling app_data_transfer.c...
+compiling app_safe.c...
+compiling app_power.c...
+compiling app_charge.c...
+compiling app_detectIsHost.c...
+compiling app_pair_chargerpin.c...
+compiling app_Authen.c...
+..\..\..\app\app_Authen.c(43): warning:  #177-D: variable "data"  was declared but never referenced
+  	bll_imu_data_t data= {0};
+..\..\..\app\app_Authen.c(44): warning:  #177-D: variable "LIFE_SIGNAL"  was declared but never referenced
+  	static uint8_t LIFE_SIGNAL =0;
+..\..\..\app\app_Authen.c: 2 warnings, 0 errors
+compiling app_one_wire.c...
+compiling app_chargerpin_conn_detect.c...
+compiling hal_ble_host.c...
+compiling hal_mt.c...
+compiling hal_ble_client.c...
+compiling hal_dfu.c...
+compiling hal_battery_NoPowerEnPin.c...
+compiling hal_wearshoes.c...
+compiling hal_led_ws2812.c...
+compiling hal_minifds.c...
+compiling bll_imu.c...
+compiling fml_imu.c...
+compiling hal_qma.c...
+compiling hal_charge.c...
+compiling MahonyAHRS.c...
+compiling bsp_wdt.c...
+compiling bsp_time.c...
+compiling bsp_pwm.c...
+compiling bsp_flash.c...
+compiling nrfx_prs.c...
+compiling bsp_adc.c...
+compiling tool.c...
+compiling drv_iic_back.c...
+compiling bsp_spi.c...
+compiling lsm6ds3tr-c_reg.c...
+compiling drv_qma7981.c...
+compiling drv_qmc6310_v2.c...
+compiling drv_lsm6ds3tr_c.c...
+compiling drv_iic_middle.c...
+compiling slave.c...
+compiling cli.c...
+compiling host.c...
+compiling queue.c...
+compiling ringframe.c...
+compiling press_down_detect.c...
+compiling matrixOperations.c...
+compiling dtalige.c...
+compiling ekfPDR.c...
+compiling special_motion.c...
+..\..\..\motion\special_motion.c(262): warning:  #550-D: variable "back_mag_left_norm"  was set but never used
+  	static float back_mag_left_norm;
+..\..\..\motion\special_motion.c(266): warning:  #550-D: variable "back_mag_right_norm"  was set but never used
+  	static float back_mag_right_norm;
+..\..\..\motion\special_motion.c: 2 warnings, 0 errors
+compiling process_result.c...
+compiling footPDR.c...
+compiling detect_step_by_acc_gyr.c...
+compiling detect_step_by_acc.c...
+compiling utf.c...
+compiling detect_zero_vel.c...
+..\..\..\motion\detect_zero_vel.c(237): warning:  #550-D: variable "last_back_zupt"  was set but never used
+  	static int16_t last_back_zupt;
+..\..\..\motion\detect_zero_vel.c(240): warning:  #177-D: variable "back_zupt_wait"  was declared but never referenced
+  	static int16_t back_zupt_wait;
+..\..\..\motion\detect_zero_vel.c(250): warning:  #177-D: variable "front_up_wait"  was declared but never referenced
+  	static int16_t front_up_wait;
+..\..\..\motion\detect_zero_vel.c: 3 warnings, 0 errors
+compiling ble_advdata.c...
+compiling detect_step_by_mag.c...
+compiling ble_srv_common.c...
+compiling ble_db_discovery.c...
+compiling nrf_ble_gatt.c...
+compiling ble_advertising.c...
+compiling nrf_ble_scan.c...
+compiling nrf_ble_gq.c...
+compiling ble_link_ctx_manager.c...
+compiling ble_conn_params.c...
+compiling ble_conn_state.c...
+compiling nrf_ble_qwr.c...
+compiling ble_nus_c.c...
+compiling ble_nus.c...
+..\..\..\..\..\..\components\ble\ble_services\ble_nus\ble_nus.c(46): warning:  #47-D: incompatible redefinition of macro "NRF_LOG_MODULE_NAME"  (declared at line 89 of "..\..\..\..\..\..\components\libraries\log\src\nrf_log_internal.h")
+  #define NRF_LOG_MODULE_NAME ble_nus
+..\..\..\..\..\..\components\ble\ble_services\ble_nus\ble_nus.c(52): warning:  #47-D: incompatible redefinition of macro "NRF_LOG_LEVEL"  (declared at line 71 of "..\..\..\..\..\..\components\libraries\log\nrf_log.h")
+  #define NRF_LOG_LEVEL       0
+..\..\..\..\..\..\components\ble\ble_services\ble_nus\ble_nus.c: 2 warnings, 0 errors
+compiling nrfx_atomic.c...
+compiling nrf_drv_clock.c...
+compiling nrfx_clock.c...
+compiling nrfx_saadc.c...
+compiling nrfx_rtc.c...
+compiling nrfx_pwm.c...
+compiling nrfx_spi.c...
+compiling nrfx_wdt.c...
+compiling nrf_drv_spi.c...
+compiling app_error_handler_keil.c...
+compiling app_error_weak.c...
+compiling nrfx_spim.c...
+compiling app_util_platform.c...
+compiling app_scheduler.c...
+compiling hardfault_implementation.c...
+compiling nrf_assert.c...
+compiling nrf_atfifo.c...
+compiling nrf_atomic.c...
+compiling nrf_balloc.c...
+compiling nrf_memobj.c...
+compiling nrf_queue.c...
+compiling nrf_pwr_mgmt.c...
+compiling nrf_section_iter.c...
+compiling nrf_sortlist.c...
+compiling nrf_ringbuf.c...
+compiling nrf_fstorage.c...
+compiling nrf_strerror.c...
+compiling nrf_atflags.c...
+compiling crc16.c...
+compiling app_error.c...
+compiling drv_rtc.c...
+compiling app_timer2.c...
+compiling nrf_log_backend_rtt.c...
+compiling nrf_log_backend_serial.c...
+compiling nrf_log_frontend.c...
+compiling nrf_log_default_backends.c...
+compiling nrf_log_str_formatter.c...
+compiling SEGGER_RTT_printf.c...
+compiling SEGGER_RTT.c...
+compiling nrf_sdh.c...
+compiling nrf_sdh_soc.c...
+compiling nrf_sdh_ble.c...
+compiling ble_dfu.c...
+compiling nrf_dfu_svci.c...
+assembling arm_startup_nrf52.s...
+compiling ble_dfu_unbonded.c...
+compiling ble_dfu_bonded.c...
+compiling system_nrf52.c...
+linking...
+Program Size: Code=137072 RO-data=3860 RW-data=3520 ZI-data=26992  
+FromELF: creating hex file...
+".\_build\nrf52832_xxaa.axf" - 0 Error(s), 10 Warning(s).
 
 <h2>Software Packages used:</h2>
 
@@ -53,11 +211,11 @@ Package Vendor: NordicSemiconductor
    * Component: ARM::CMSIS:CORE:5.3.0
 
    * Component: NordicSemiconductor::Device:Startup:8.32.1
+      Source file:   Device\Source\arm\arm_startup_nrf52.s
       Source file:   Device\Source\system_nrf52.c
       Include file:  Device\Include\system_nrf52.h
-      Source file:   Device\Source\arm\arm_startup_nrf52.s
       Include file:  Device\Include\system_nrf.h
-Build Time Elapsed:  00:00:01
+Build Time Elapsed:  00:01:05
 </pre>
 </body>
 </html>

ファイルの差分が大きいため隠しています
+ 313 - 313
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.hex


ファイルの差分が大きいため隠しています
+ 584 - 575
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.htm


+ 2 - 0
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.lnp

@@ -22,6 +22,8 @@
 ".\_build\app_detectishost.o"
 ".\_build\app_pair_chargerpin.o"
 ".\_build\app_authen.o"
+".\_build\app_chargerpin_conn_detect.o"
+".\_build\app_one_wire.o"
 ".\_build\hal_ble_client.o"
 ".\_build\hal_ble_host.o"
 ".\_build\hal_mt.o"

ファイルの差分が大きいため隠しています
+ 2 - 2
pca10040/s132/arm5_no_packs/ble_app_uart_c_pca10040_s132.uvguix.Administrator


+ 24 - 4
pca10040/s132/arm5_no_packs/ble_app_uart_c_pca10040_s132.uvprojx

@@ -513,6 +513,16 @@
               <FileType>1</FileType>
               <FilePath>..\..\..\app\app_Authen.c</FilePath>
             </File>
+            <File>
+              <FileName>app_chargerpin_conn_detect.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\app\app_chargerpin_conn_detect.c</FilePath>
+            </File>
+            <File>
+              <FileName>app_one_wire.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\app\app_one_wire.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -3517,6 +3527,16 @@
               <FileType>1</FileType>
               <FilePath>..\..\..\app\app_Authen.c</FilePath>
             </File>
+            <File>
+              <FileName>app_chargerpin_conn_detect.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\app\app_chargerpin_conn_detect.c</FilePath>
+            </File>
+            <File>
+              <FileName>app_one_wire.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\app\app_one_wire.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -6144,8 +6164,8 @@
     <files>
       <file attr="config" category="source" condition="ARM Compiler" name="Device\Source\arm\arm_startup_nrf52.s" version="8.32.1">
         <instance index="0">RTE\Device\nRF52832_xxAA\arm_startup_nrf52.s</instance>
-        <component Cclass="Device" Cgroup="Startup" Cvendor="NordicSemiconductor" Cversion="8.32.1" condition="nRF52832 Device and CMSIS"/>
-        <package license="License/license.txt" name="nRF_DeviceFamilyPack" schemaVersion="1.3" url="http://developer.nordicsemi.com/nRF5_SDK/pieces/nRF_DeviceFamilyPack/" vendor="NordicSemiconductor" version="8.32.1"/>
+        <component Cclass="Device" Cgroup="Startup" Cvendor="NordicSemiconductor" Cversion="8.35.0" condition="nRF52832 Device and CMSIS"/>
+        <package license="License/license.txt" name="nRF_DeviceFamilyPack" schemaVersion="1.3" url="http://developer.nordicsemi.com/nRF5_SDK/pieces/nRF_DeviceFamilyPack/" vendor="NordicSemiconductor" version="8.35.0"/>
         <targetInfos>
           <targetInfo name="Shoes_FW_APP"/>
           <targetInfo excluded="1" name="flash_s132_nrf52_7.0.1_softdevice"/>
@@ -6153,8 +6173,8 @@
       </file>
       <file attr="config" category="source" name="Device\Source\system_nrf52.c" version="8.32.1">
         <instance index="0">RTE\Device\nRF52832_xxAA\system_nrf52.c</instance>
-        <component Cclass="Device" Cgroup="Startup" Cvendor="NordicSemiconductor" Cversion="8.32.1" condition="nRF52832 Device and CMSIS"/>
-        <package license="License/license.txt" name="nRF_DeviceFamilyPack" schemaVersion="1.3" url="http://developer.nordicsemi.com/nRF5_SDK/pieces/nRF_DeviceFamilyPack/" vendor="NordicSemiconductor" version="8.32.1"/>
+        <component Cclass="Device" Cgroup="Startup" Cvendor="NordicSemiconductor" Cversion="8.35.0" condition="nRF52832 Device and CMSIS"/>
+        <package license="License/license.txt" name="nRF_DeviceFamilyPack" schemaVersion="1.3" url="http://developer.nordicsemi.com/nRF5_SDK/pieces/nRF_DeviceFamilyPack/" vendor="NordicSemiconductor" version="8.35.0"/>
         <targetInfos>
           <targetInfo name="Shoes_FW_APP"/>
           <targetInfo excluded="1" name="flash_s132_nrf52_7.0.1_softdevice"/>

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません