From fb9febbd6dd16a8cbcba1e578b52cf2d69e33975 Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期四, 11 四月 2024 11:30:53 +0800 Subject: [PATCH] V1.16,整合一下,7800起始地址目前。 --- MDK-ARM/L051.uvguix.WXK | 20 ++-- Src/main.c | 2 MDK-ARM/L051/L051_L051.dep | 12 +- MDK-ARM/L051/L051.build_log.htm | 2 MDK-ARM/L051/L051.map | 154 +++++++++++++++++++------------------- MDK-ARM/L051.uvprojx | 4 MDK-ARM/L051/L051.htm | 4 MDK-ARM/L051.uvoptx | 2 8 files changed, 100 insertions(+), 100 deletions(-) diff --git a/MDK-ARM/L051.uvguix.WXK b/MDK-ARM/L051.uvguix.WXK index fdd4315..b079854 100644 --- a/MDK-ARM/L051.uvguix.WXK +++ b/MDK-ARM/L051.uvguix.WXK @@ -1805,8 +1805,8 @@ <RegID>59392</RegID> <Name>File</Name> <Buttons> - <Len>2966</Len> - <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000004353030309600000000000000140004353030300D66616E67636861695F666C616713675F636F6D5F6D61705B47524F55505F49445D05373030303204656E756D0F4A54383038436C69656E745F475053104346475F4A545F4445564943455F494404696D65691570726F746F636F6C5F6A745F7061636B5F686561647273746174696320766F69642070726F746F636F6C5F6A745F7061636B5F686561642875696E74385F74202A70646174612C2075696E7431365F74202A6964782C2075696E7431365F74206C656E2C2075696E7431365F7420746F74616C2C2075696E7431365F7420706172745F6E756D20291550524F544F434F4C5F4845414445525F4A5438303806686561646572087265676973746572053832343034106C5F7533325158706F7765725469636B08B5E7C1BFB9FDB5CD04313837320C7577625F6170705F706F6C6C0849646C655461736B16675F636F6D5F6D61705B434E545F524553544152545D0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> + <Len>2958</Len> + <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000435303030960000000000000014000437383030124D41585F5245504F52545F414E435F4E554D04353030300D66616E67636861695F666C616713675F636F6D5F6D61705B47524F55505F49445D05373030303204656E756D0F4A54383038436C69656E745F475053104346475F4A545F4445564943455F494404696D65691570726F746F636F6C5F6A745F7061636B5F686561647273746174696320766F69642070726F746F636F6C5F6A745F7061636B5F686561642875696E74385F74202A70646174612C2075696E7431365F74202A6964782C2075696E7431365F74206C656E2C2075696E7431365F7420746F74616C2C2075696E7431365F7420706172745F6E756D20291550524F544F434F4C5F4845414445525F4A5438303806686561646572087265676973746572053832343034106C5F7533325158706F7765725469636B08B5E7C1BFB9FDB5CD04313837320C7577625F6170705F706F6C6C0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> </Buttons> <OriginalItems> <Len>1423</Len> @@ -3606,9 +3606,9 @@ <ActiveTab>0</ActiveTab> <Doc> <Name>../Src/main.c</Name> - <ColumnNumber>35</ColumnNumber> - <TopLine>300</TopLine> - <CurrentLine>309</CurrentLine> + <ColumnNumber>23</ColumnNumber> + <TopLine>294</TopLine> + <CurrentLine>308</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> @@ -3705,7 +3705,7 @@ </Doc> <Doc> <Name>..\Src\application\dw_app.c</Name> - <ColumnNumber>16</ColumnNumber> + <ColumnNumber>21</ColumnNumber> <TopLine>132</TopLine> <CurrentLine>139</CurrentLine> <Folding>1</Folding> @@ -3759,7 +3759,7 @@ </Doc> <Doc> <Name>..\Src\application\serial_at_cmd_app.c</Name> - <ColumnNumber>61</ColumnNumber> + <ColumnNumber>91</ColumnNumber> <TopLine>104</TopLine> <CurrentLine>113</CurrentLine> <Folding>1</Folding> @@ -3867,9 +3867,9 @@ </Doc> <Doc> <Name>../Src/system_stm32l0xx.c</Name> - <ColumnNumber>6</ColumnNumber> - <TopLine>76</TopLine> - <CurrentLine>87</CurrentLine> + <ColumnNumber>4</ColumnNumber> + <TopLine>28</TopLine> + <CurrentLine>34</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx index bf60b5d..235d1e0 100644 --- a/MDK-ARM/L051.uvoptx +++ b/MDK-ARM/L051.uvoptx @@ -103,7 +103,7 @@ <bEvRecOn>1</bEvRecOn> <bSchkAxf>0</bSchkAxf> <bTchkAxf>0</bTchkAxf> - <nTsel>4</nTsel> + <nTsel>6</nTsel> <sDll></sDll> <sDllPa></sDllPa> <sDlgDll></sDlgDll> diff --git a/MDK-ARM/L051.uvprojx b/MDK-ARM/L051.uvprojx index 82b62eb..766bb93 100644 --- a/MDK-ARM/L051.uvprojx +++ b/MDK-ARM/L051.uvprojx @@ -10,13 +10,13 @@ <TargetName>L051</TargetName> <ToolsetNumber>0x4</ToolsetNumber> <ToolsetName>ARM-ADS</ToolsetName> - <pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed> + <pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed> <uAC6>0</uAC6> <TargetOption> <TargetCommonOption> <Device>STM32L071RBTx</Device> <Vendor>STMicroelectronics</Vendor> - <PackID>Keil.STM32L0xx_DFP.2.1.0</PackID> + <PackID>Keil.STM32L0xx_DFP.2.2.0</PackID> <PackURL>http://www.keil.com/pack/</PackURL> <Cpu>IRAM(0x20000000-0x20001FFF) IROM(0x8000000-0x800FFFF) CLOCK(8000000) CPUTYPE("Cortex-M0+")</Cpu> <FlashUtilSpec></FlashUtilSpec> diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm index 1f62644..3e1407f 100644 --- a/MDK-ARM/L051/L051.build_log.htm +++ b/MDK-ARM/L051/L051.build_log.htm @@ -65,7 +65,7 @@ static void SystemPower_Config(void) ../Src/main.c: 17 warnings, 0 errors linking... -Program Size: Code=38272 RO-data=820 RW-data=672 ZI-data=8216 +Program Size: Code=38268 RO-data=820 RW-data=672 ZI-data=8216 FromELF: creating hex file... "L051\L051.axf" - 0 Error(s), 17 Warning(s). diff --git a/MDK-ARM/L051/L051.htm b/MDK-ARM/L051/L051.htm index 4a35fad..a84a99e 100644 --- a/MDK-ARM/L051/L051.htm +++ b/MDK-ARM/L051/L051.htm @@ -3,7 +3,7 @@ <title>Static Call Graph - [L051\L051.axf]</title></head> <body><HR> <H1>Static Call Graph for image L051\L051.axf</H1><HR> -<BR><P>#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Thu Apr 11 11:11:29 2024 +<BR><P>#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Thu Apr 11 11:30:13 2024 <BR><P> <H3>Maximum Stack Usage = 480 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3> Call chain for Maximum Stack Depth:</H3> @@ -3612,7 +3612,7 @@ </UL> <BR>[Address Reference Count : 1]<UL><LI> entry9a.o(.ARM.Collect$$$$0000000B) </UL> -<P><STRONG><a name="[13b]"></a>parameter_init</STRONG> (Thumb, 108 bytes, Stack size 8 bytes, global_param.o(i.parameter_init)) +<P><STRONG><a name="[13b]"></a>parameter_init</STRONG> (Thumb, 104 bytes, Stack size 8 bytes, global_param.o(i.parameter_init)) <BR><BR>[Stack]<UL><LI>Max Depth = 104<LI>Call Chain = parameter_init ⇒ save_com_map_to_flash ⇒ FLASH_Prepare ⇒ HAL_FLASHEx_Erase ⇒ FLASH_WaitForLastOperation ⇒ FLASH_SetErrorCode </UL> <BR>[Calls]<UL><LI><a href="#[136]">>></a> save_com_map_to_flash diff --git a/MDK-ARM/L051/L051.map b/MDK-ARM/L051/L051.map index b150dd4..9f45572 100644 --- a/MDK-ARM/L051/L051.map +++ b/MDK-ARM/L051/L051.map @@ -3732,27 +3732,27 @@ i.fputc 0x08010b28 Section 0 usart.o(i.fputc) i.main 0x08010b40 Section 0 main.o(i.main) i.parameter_init 0x08010c94 Section 0 global_param.o(i.parameter_init) - i.readfromspi 0x08010d0c Section 0 spi.o(i.readfromspi) - i.resp_msg_set_ts 0x08010d64 Section 0 dw_mbx_tag.o(i.resp_msg_set_ts) - resp_msg_set_ts 0x08010d65 Thumb Code 30 dw_mbx_tag.o(i.resp_msg_set_ts) - i.rint 0x08010d82 Section 0 rint.o(i.rint) - i.save_com_map_to_flash 0x08010d8c Section 0 global_param.o(i.save_com_map_to_flash) - i.w28delay 0x08010de0 Section 0 ws2812.o(i.w28delay) - i.writetospi 0x08010dec Section 0 spi.o(i.writetospi) - .constdata 0x08010e40 Section 8 deca_params_init.o(.constdata) - .constdata 0x08010e48 Section 24 deca_params_init.o(.constdata) - .constdata 0x08010e60 Section 8 deca_params_init.o(.constdata) - .constdata 0x08010e68 Section 12 deca_params_init.o(.constdata) - .constdata 0x08010e74 Section 4 deca_params_init.o(.constdata) - .constdata 0x08010e78 Section 32 deca_params_init.o(.constdata) - .constdata 0x08010e98 Section 50 deca_params_init.o(.constdata) - .constdata 0x08010eca Section 25 system_stm32l0xx.o(.constdata) - .constdata 0x08010ee3 Section 8 system_stm32l0xx.o(.constdata) - .constdata 0x08010eec Section 108 radio.o(.constdata) - .constdata 0x08010f58 Section 180 radio.o(.constdata) - .constdata 0x0801100c Section 129 ctype_o.o(.constdata) - .constdata 0x08011090 Section 4 ctype_o.o(.constdata) - table 0x08011090 Data 4 ctype_o.o(.constdata) + i.readfromspi 0x08010d08 Section 0 spi.o(i.readfromspi) + i.resp_msg_set_ts 0x08010d60 Section 0 dw_mbx_tag.o(i.resp_msg_set_ts) + resp_msg_set_ts 0x08010d61 Thumb Code 30 dw_mbx_tag.o(i.resp_msg_set_ts) + i.rint 0x08010d7e Section 0 rint.o(i.rint) + i.save_com_map_to_flash 0x08010d88 Section 0 global_param.o(i.save_com_map_to_flash) + i.w28delay 0x08010ddc Section 0 ws2812.o(i.w28delay) + i.writetospi 0x08010de8 Section 0 spi.o(i.writetospi) + .constdata 0x08010e3c Section 8 deca_params_init.o(.constdata) + .constdata 0x08010e44 Section 24 deca_params_init.o(.constdata) + .constdata 0x08010e5c Section 8 deca_params_init.o(.constdata) + .constdata 0x08010e64 Section 12 deca_params_init.o(.constdata) + .constdata 0x08010e70 Section 4 deca_params_init.o(.constdata) + .constdata 0x08010e74 Section 32 deca_params_init.o(.constdata) + .constdata 0x08010e94 Section 50 deca_params_init.o(.constdata) + .constdata 0x08010ec6 Section 25 system_stm32l0xx.o(.constdata) + .constdata 0x08010edf Section 8 system_stm32l0xx.o(.constdata) + .constdata 0x08010ee8 Section 108 radio.o(.constdata) + .constdata 0x08010f54 Section 180 radio.o(.constdata) + .constdata 0x08011008 Section 129 ctype_o.o(.constdata) + .constdata 0x0801108c Section 4 ctype_o.o(.constdata) + table 0x0801108c Data 4 ctype_o.o(.constdata) .data 0x20000000 Section 10 lis3dh_driver.o(.data) ODR_old_value 0x20000000 Data 1 lis3dh_driver.o(.data) .data 0x2000000a Section 1 deca_device.o(.data) @@ -4321,28 +4321,28 @@ floor 0x08010a61 Thumb Code 180 floor.o(i.floor) fputc 0x08010b29 Thumb Code 18 usart.o(i.fputc) main 0x08010b41 Thumb Code 304 main.o(i.main) - parameter_init 0x08010c95 Thumb Code 108 global_param.o(i.parameter_init) - readfromspi 0x08010d0d Thumb Code 82 spi.o(i.readfromspi) - rint 0x08010d83 Thumb Code 8 rint.o(i.rint) - save_com_map_to_flash 0x08010d8d Thumb Code 70 global_param.o(i.save_com_map_to_flash) - w28delay 0x08010de1 Thumb Code 12 ws2812.o(i.w28delay) - writetospi 0x08010ded Thumb Code 78 spi.o(i.writetospi) - chan_idx 0x08010e40 Data 8 deca_params_init.o(.constdata) - tx_config 0x08010e48 Data 24 deca_params_init.o(.constdata) - agc_config 0x08010e60 Data 8 deca_params_init.o(.constdata) - sftsh 0x08010e68 Data 12 deca_params_init.o(.constdata) - dtune1 0x08010e74 Data 4 deca_params_init.o(.constdata) - digital_bb_config 0x08010e78 Data 32 deca_params_init.o(.constdata) - lde_replicaCoeff 0x08010e98 Data 50 deca_params_init.o(.constdata) - AHBPrescTable 0x08010eca Data 16 system_stm32l0xx.o(.constdata) - PLLMulTable 0x08010eda Data 9 system_stm32l0xx.o(.constdata) - APBPrescTable 0x08010ee3 Data 8 system_stm32l0xx.o(.constdata) - Radio 0x08010eec Data 108 radio.o(.constdata) - Bandwidths 0x08010f58 Data 3 radio.o(.constdata) - FskBandwidths 0x08010f5c Data 176 radio.o(.constdata) - __ctype_table 0x0801100c Data 129 ctype_o.o(.constdata) - Region$$Table$$Base 0x08011094 Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x080110b4 Number 0 anon$$obj.o(Region$$Table) + parameter_init 0x08010c95 Thumb Code 104 global_param.o(i.parameter_init) + readfromspi 0x08010d09 Thumb Code 82 spi.o(i.readfromspi) + rint 0x08010d7f Thumb Code 8 rint.o(i.rint) + save_com_map_to_flash 0x08010d89 Thumb Code 70 global_param.o(i.save_com_map_to_flash) + w28delay 0x08010ddd Thumb Code 12 ws2812.o(i.w28delay) + writetospi 0x08010de9 Thumb Code 78 spi.o(i.writetospi) + chan_idx 0x08010e3c Data 8 deca_params_init.o(.constdata) + tx_config 0x08010e44 Data 24 deca_params_init.o(.constdata) + agc_config 0x08010e5c Data 8 deca_params_init.o(.constdata) + sftsh 0x08010e64 Data 12 deca_params_init.o(.constdata) + dtune1 0x08010e70 Data 4 deca_params_init.o(.constdata) + digital_bb_config 0x08010e74 Data 32 deca_params_init.o(.constdata) + lde_replicaCoeff 0x08010e94 Data 50 deca_params_init.o(.constdata) + AHBPrescTable 0x08010ec6 Data 16 system_stm32l0xx.o(.constdata) + PLLMulTable 0x08010ed6 Data 9 system_stm32l0xx.o(.constdata) + APBPrescTable 0x08010edf Data 8 system_stm32l0xx.o(.constdata) + Radio 0x08010ee8 Data 108 radio.o(.constdata) + Bandwidths 0x08010f54 Data 3 radio.o(.constdata) + FskBandwidths 0x08010f58 Data 176 radio.o(.constdata) + __ctype_table 0x08011008 Data 129 ctype_o.o(.constdata) + Region$$Table$$Base 0x08011090 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x080110b0 Number 0 anon$$obj.o(Region$$Table) lisidtemp 0x20000001 Data 1 lis3dh_driver.o(.data) lisid 0x20000002 Data 1 lis3dh_driver.o(.data) lis2dhdata 0x20000004 Data 6 lis3dh_driver.o(.data) @@ -4508,9 +4508,9 @@ Image Entry point : 0x080078c1 - Load Region LR_IROM1 (Base: 0x08007800, Size: 0x00009b54, Max: 0x00010000, ABSOLUTE, COMPRESSED[0x00009968]) + Load Region LR_IROM1 (Base: 0x08007800, Size: 0x00009b50, Max: 0x00010000, ABSOLUTE, COMPRESSED[0x00009964]) - Execution Region ER_IROM1 (Exec base: 0x08007800, Load base: 0x08007800, Size: 0x000098b4, Max: 0x00010000, ABSOLUTE) + Execution Region ER_IROM1 (Exec base: 0x08007800, Load base: 0x08007800, Size: 0x000098b0, Max: 0x00010000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -4949,33 +4949,33 @@ 0x08010a60 0x08010a60 0x000000c8 Code RO 6547 i.floor m_ps.l(floor.o) 0x08010b28 0x08010b28 0x00000018 Code RO 1396 i.fputc usart.o 0x08010b40 0x08010b40 0x00000154 Code RO 2023 i.main main.o - 0x08010c94 0x08010c94 0x00000078 Code RO 1528 i.parameter_init global_param.o - 0x08010d0c 0x08010d0c 0x00000058 Code RO 1309 i.readfromspi spi.o - 0x08010d64 0x08010d64 0x0000001e Code RO 1837 i.resp_msg_set_ts dw_mbx_tag.o - 0x08010d82 0x08010d82 0x00000008 Code RO 6560 i.rint m_ps.l(rint.o) - 0x08010d8a 0x08010d8a 0x00000002 PAD - 0x08010d8c 0x08010d8c 0x00000054 Code RO 1529 i.save_com_map_to_flash global_param.o - 0x08010de0 0x08010de0 0x0000000c Code RO 1725 i.w28delay ws2812.o - 0x08010dec 0x08010dec 0x00000054 Code RO 1310 i.writetospi spi.o - 0x08010e40 0x08010e40 0x00000008 Data RO 1237 .constdata deca_params_init.o - 0x08010e48 0x08010e48 0x00000018 Data RO 1238 .constdata deca_params_init.o - 0x08010e60 0x08010e60 0x00000008 Data RO 1239 .constdata deca_params_init.o - 0x08010e68 0x08010e68 0x0000000c Data RO 1240 .constdata deca_params_init.o - 0x08010e74 0x08010e74 0x00000004 Data RO 1241 .constdata deca_params_init.o - 0x08010e78 0x08010e78 0x00000020 Data RO 1242 .constdata deca_params_init.o - 0x08010e98 0x08010e98 0x00000032 Data RO 1243 .constdata deca_params_init.o - 0x08010eca 0x08010eca 0x00000019 Data RO 2445 .constdata system_stm32l0xx.o - 0x08010ee3 0x08010ee3 0x00000008 Data RO 2446 .constdata system_stm32l0xx.o - 0x08010eeb 0x08010eeb 0x00000001 PAD - 0x08010eec 0x08010eec 0x0000006c Data RO 2568 .constdata radio.o - 0x08010f58 0x08010f58 0x000000b4 Data RO 2569 .constdata radio.o - 0x0801100c 0x0801100c 0x00000081 Data RO 6967 .constdata mc_p.l(ctype_o.o) - 0x0801108d 0x0801108d 0x00000003 PAD - 0x08011090 0x08011090 0x00000004 Data RO 6968 .constdata mc_p.l(ctype_o.o) - 0x08011094 0x08011094 0x00000020 Data RO 7011 Region$$Table anon$$obj.o + 0x08010c94 0x08010c94 0x00000074 Code RO 1528 i.parameter_init global_param.o + 0x08010d08 0x08010d08 0x00000058 Code RO 1309 i.readfromspi spi.o + 0x08010d60 0x08010d60 0x0000001e Code RO 1837 i.resp_msg_set_ts dw_mbx_tag.o + 0x08010d7e 0x08010d7e 0x00000008 Code RO 6560 i.rint m_ps.l(rint.o) + 0x08010d86 0x08010d86 0x00000002 PAD + 0x08010d88 0x08010d88 0x00000054 Code RO 1529 i.save_com_map_to_flash global_param.o + 0x08010ddc 0x08010ddc 0x0000000c Code RO 1725 i.w28delay ws2812.o + 0x08010de8 0x08010de8 0x00000054 Code RO 1310 i.writetospi spi.o + 0x08010e3c 0x08010e3c 0x00000008 Data RO 1237 .constdata deca_params_init.o + 0x08010e44 0x08010e44 0x00000018 Data RO 1238 .constdata deca_params_init.o + 0x08010e5c 0x08010e5c 0x00000008 Data RO 1239 .constdata deca_params_init.o + 0x08010e64 0x08010e64 0x0000000c Data RO 1240 .constdata deca_params_init.o + 0x08010e70 0x08010e70 0x00000004 Data RO 1241 .constdata deca_params_init.o + 0x08010e74 0x08010e74 0x00000020 Data RO 1242 .constdata deca_params_init.o + 0x08010e94 0x08010e94 0x00000032 Data RO 1243 .constdata deca_params_init.o + 0x08010ec6 0x08010ec6 0x00000019 Data RO 2445 .constdata system_stm32l0xx.o + 0x08010edf 0x08010edf 0x00000008 Data RO 2446 .constdata system_stm32l0xx.o + 0x08010ee7 0x08010ee7 0x00000001 PAD + 0x08010ee8 0x08010ee8 0x0000006c Data RO 2568 .constdata radio.o + 0x08010f54 0x08010f54 0x000000b4 Data RO 2569 .constdata radio.o + 0x08011008 0x08011008 0x00000081 Data RO 6967 .constdata mc_p.l(ctype_o.o) + 0x08011089 0x08011089 0x00000003 PAD + 0x0801108c 0x0801108c 0x00000004 Data RO 6968 .constdata mc_p.l(ctype_o.o) + 0x08011090 0x08011090 0x00000020 Data RO 7011 Region$$Table anon$$obj.o - Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x080110b4, Size: 0x000022b8, Max: 0x00005000, ABSOLUTE, COMPRESSED[0x000000b4]) + Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x080110b0, Size: 0x000022b8, Max: 0x00005000, ABSOLUTE, COMPRESSED[0x000000b4]) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -5042,7 +5042,7 @@ 94 4 0 0 0 4486 dw_driver.o 1570 158 0 96 1150 13047 dw_mbx_tag.o 150 8 0 2 0 3340 flash.o - 204 26 0 0 600 1792 global_param.o + 200 26 0 0 600 1788 global_param.o 984 136 0 1 264 9930 gps.o 956 48 0 10 0 366032 lis3dh_driver.o 2068 282 0 52 976 11848 lora.o @@ -5077,7 +5077,7 @@ 776 34 0 0 0 6475 ws2812.o ---------------------------------------------------------------------- - 30886 2656 684 664 8216 673602 Object Totals + 30882 2656 684 664 8216 673598 Object Totals 0 0 32 0 0 0 (incl. Generated) 50 0 1 16 2 0 (incl. Padding) @@ -5167,15 +5167,15 @@ Code (inc. data) RO Data RW Data ZI Data Debug - 38272 2928 820 672 8216 667894 Grand Totals - 38272 2928 820 180 8216 667894 ELF Image Totals (compressed) - 38272 2928 820 180 0 0 ROM Totals + 38268 2928 820 672 8216 667890 Grand Totals + 38268 2928 820 180 8216 667890 ELF Image Totals (compressed) + 38268 2928 820 180 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 39092 ( 38.18kB) + Total RO Size (Code + RO Data) 39088 ( 38.17kB) Total RW Size (RW Data + ZI Data) 8888 ( 8.68kB) - Total ROM Size (Code + RO Data + RW Data) 39272 ( 38.35kB) + Total ROM Size (Code + RO Data + RW Data) 39268 ( 38.35kB) ============================================================================== diff --git a/MDK-ARM/L051/L051_L051.dep b/MDK-ARM/L051/L051_L051.dep index d873d9f..826ba09 100644 --- a/MDK-ARM/L051/L051_L051.dep +++ b/MDK-ARM/L051/L051_L051.dep @@ -400,7 +400,7 @@ I (../Src/OnChipDevices/ADC.h)(0x6475A95E) I (../Src/algorithm/TrackingDiff.h)(0x6475A95E) I (../Src/application/global_param.h)(0x660267F1) -F (..\Src\application\global_param.c)(0x6602323B)(--c99 -c --cpu Cortex-M0+ -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L0xx/Include -I ../Drivers/CMSIS/Include -I ../Drivers/ExternlDrivers -I ../Src/decadriver -I ../Src/ExternalDevices -I ../Src/OnChipDevices -I ../Src/algorithm -I ../Src/application -I ../Src/radio -I ../Middlewares/HIDOLibrary/Include -I.\RTE\_L051 -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32L0xx_DFP\2.2.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include -D__UVISION_VERSION="530" -D_RTE_ -DSTM32L071xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32L071xx -DUSE_GPS -D_USE_BAR -o l051\global_param.o --omf_browse l051\global_param.crf --depend l051\global_param.d) +F (..\Src\application\global_param.c)(0x6617557E)(--c99 -c --cpu Cortex-M0+ -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L0xx/Include -I ../Drivers/CMSIS/Include -I ../Drivers/ExternlDrivers -I ../Src/decadriver -I ../Src/ExternalDevices -I ../Src/OnChipDevices -I ../Src/algorithm -I ../Src/application -I ../Src/radio -I ../Middlewares/HIDOLibrary/Include -I.\RTE\_L051 -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32L0xx_DFP\2.2.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include -D__UVISION_VERSION="530" -D_RTE_ -DSTM32L071xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32L071xx -DUSE_GPS -D_USE_BAR -o l051\global_param.o --omf_browse l051\global_param.crf --depend l051\global_param.d) I (..\Src\application\global_param.h)(0x660267F1) I (../Inc/main.h)(0x65F7A403) I (../Drivers/STM32L0xx_HAL_Driver/Inc/stm32l0xx_hal.h)(0x64D0ABC5) @@ -739,7 +739,7 @@ I (../Src/decadriver/deca_regs.h)(0x64B4E204) I (../Src/ExternalDevices/dw_driver.h)(0x6600E539) I (../Src/OnChipDevices/Spi.h)(0x6475A95E) -I (../Src/radio/lora.h)(0x66038CF5) +I (../Src/radio/lora.h)(0x6617557E) I (C:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5E53505C) I (../Src/radio/radio.h)(0x604C860C) I (..\Src\application\WS2812.h)(0x65D556AE) @@ -803,7 +803,7 @@ I (../Src/decadriver/deca_device_api.h)(0x64B4E204) I (../Src/decadriver/deca_regs.h)(0x64B4E204) I (../Src/ExternalDevices/dw_driver.h)(0x6600E539) -F (../Src/main.c)(0x661754E0)(--c99 -c --cpu Cortex-M0+ -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L0xx/Include -I ../Drivers/CMSIS/Include -I ../Drivers/ExternlDrivers -I ../Src/decadriver -I ../Src/ExternalDevices -I ../Src/OnChipDevices -I ../Src/algorithm -I ../Src/application -I ../Src/radio -I ../Middlewares/HIDOLibrary/Include -I.\RTE\_L051 -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32L0xx_DFP\2.2.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include -D__UVISION_VERSION="530" -D_RTE_ -DSTM32L071xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32L071xx -DUSE_GPS -D_USE_BAR -o l051\main.o --omf_browse l051\main.crf --depend l051\main.d) +F (../Src/main.c)(0x66175943)(--c99 -c --cpu Cortex-M0+ -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L0xx/Include -I ../Drivers/CMSIS/Include -I ../Drivers/ExternlDrivers -I ../Src/decadriver -I ../Src/ExternalDevices -I ../Src/OnChipDevices -I ../Src/algorithm -I ../Src/application -I ../Src/radio -I ../Middlewares/HIDOLibrary/Include -I.\RTE\_L051 -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32L0xx_DFP\2.2.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include -D__UVISION_VERSION="530" -D_RTE_ -DSTM32L071xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32L071xx -DUSE_GPS -D_USE_BAR -o l051\main.o --omf_browse l051\main.crf --depend l051\main.d) I (../Inc/main.h)(0x65F7A403) I (../Drivers/STM32L0xx_HAL_Driver/Inc/stm32l0xx_hal.h)(0x64D0ABC5) I (../Inc/stm32l0xx_hal_conf.h)(0x65F3C1E4) @@ -867,7 +867,7 @@ I (../Src/application/dw_mbx_tag.h)(0x6600E69D) I (../Src/decadriver/deca_regs.h)(0x64B4E204) I (../Src/OnChipDevices/Spi.h)(0x6475A95E) -I (../Src/radio/lora.h)(0x66038CF5) +I (../Src/radio/lora.h)(0x6617557E) I (../Src/application/GPS.h)(0x66022EB8) I (../Middlewares/HIDOLibrary/Include/HIDO_TypeDef.h)(0x66022EB8) F (../Src/stm32l0xx_it.c)(0x65F7A403)(--c99 -c --cpu Cortex-M0+ -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L0xx/Include -I ../Drivers/CMSIS/Include -I ../Drivers/ExternlDrivers -I ../Src/decadriver -I ../Src/ExternalDevices -I ../Src/OnChipDevices -I ../Src/algorithm -I ../Src/application -I ../Src/radio -I ../Middlewares/HIDOLibrary/Include -I.\RTE\_L051 -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32L0xx_DFP\2.2.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include -D__UVISION_VERSION="530" -D_RTE_ -DSTM32L071xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32L071xx -DUSE_GPS -D_USE_BAR -o l051\stm32l0xx_it.o --omf_browse l051\stm32l0xx_it.crf --depend l051\stm32l0xx_it.d) @@ -1155,7 +1155,7 @@ I (C:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x5E53505C) I (..\Src\radio\sx126x-board.h)(0x64F18E2B) I (..\Src\radio\delay.h)(0x64F14193) -I (..\Src\radio\Lora.h)(0x66038CF5) +I (..\Src\radio\Lora.h)(0x6617557E) I (../Drivers/CMSIS/Device/ST/STM32L0xx/Include/stm32l0xx.h)(0x661749D1) I (../Drivers/CMSIS/Device/ST/STM32L0xx/Include/stm32l071xx.h)(0x64D0ABC5) I (../Drivers/CMSIS/Include/core_cm0plus.h)(0x66027CDA) @@ -1208,7 +1208,7 @@ I (../Src/decadriver/deca_regs.h)(0x64B4E204) I (../Src/ExternalDevices/dw_driver.h)(0x6600E539) I (../Src/OnChipDevices/Spi.h)(0x6475A95E) -I (../Src/radio/lora.h)(0x66038CF5) +I (../Src/radio/lora.h)(0x6617557E) I (../Src/OnChipDevices/Flash.h)(0x660283F8) F (../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_adc.c)(0x64D0ABC5)(--c99 -c --cpu Cortex-M0+ -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L0xx/Include -I ../Drivers/CMSIS/Include -I ../Drivers/ExternlDrivers -I ../Src/decadriver -I ../Src/ExternalDevices -I ../Src/OnChipDevices -I ../Src/algorithm -I ../Src/application -I ../Src/radio -I ../Middlewares/HIDOLibrary/Include -I.\RTE\_L051 -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32L0xx_DFP\2.2.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include -D__UVISION_VERSION="530" -D_RTE_ -DSTM32L071xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32L071xx -DUSE_GPS -D_USE_BAR -o l051\stm32l0xx_hal_adc.o --omf_browse l051\stm32l0xx_hal_adc.crf --depend l051\stm32l0xx_hal_adc.d) I (../Drivers/STM32L0xx_HAL_Driver/Inc/stm32l0xx_hal.h)(0x64D0ABC5) diff --git a/Src/main.c b/Src/main.c index a33f031..7d8312a 100644 --- a/Src/main.c +++ b/Src/main.c @@ -306,7 +306,7 @@ hardware_pici = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2); hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4); //deca_sleep(1000); - g_com_map[VERSION] = (1<<8)|15; + g_com_map[VERSION] = (1<<8)|16; // g_com_map[DEV_ID]=1158; // #ifdef DEBUG_MODE // // g_com_map[GROUP_ID]=21; -- Gitblit v1.9.3