From 9daeefcf11512b152329b2bcf5a54de06397f42b Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期五, 05 八月 2022 11:45:37 +0800 Subject: [PATCH] V1.31 增加蜂鸣器逻辑 --- MDK-ARM/L051.uvoptx | 160 ++++++++++++---------------------------------------- 1 files changed, 38 insertions(+), 122 deletions(-) diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx index 29db2ac..ca973d1 100644 --- a/MDK-ARM/L051.uvoptx +++ b/MDK-ARM/L051.uvoptx @@ -26,7 +26,7 @@ <ToolsetNumber>0x4</ToolsetNumber> <ToolsetName>ARM-ADS</ToolsetName> <TargetOption> - <CLKADS>32000000</CLKADS> + <CLKADS>8000000</CLKADS> <OPTTT> <gFlags>1</gFlags> <BeepAtEnd>1</BeepAtEnd> @@ -103,7 +103,7 @@ <bEvRecOn>1</bEvRecOn> <bSchkAxf>0</bSchkAxf> <bTchkAxf>0</bTchkAxf> - <nTsel>6</nTsel> + <nTsel>4</nTsel> <sDll></sDll> <sDllPa></sDllPa> <sDlgDll></sDlgDll> @@ -117,6 +117,11 @@ <pMon>Segger\JL2CM3.dll</pMon> </DebugOpt> <TargetDriverDllRegistry> + <SetRegEntry> + <Number>0</Number> + <Key>CMSIS_AGDI</Key> + <Name>-X"Any" -UAny -O206 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name> + </SetRegEntry> <SetRegEntry> <Number>0</Number> <Key>DLGUARM</Key> @@ -157,41 +162,9 @@ <Bp> <Number>0</Number> <Type>0</Type> - <LineNumber>25</LineNumber> + <LineNumber>143</LineNumber> <EnabledFlag>1</EnabledFlag> - <Address>134265926</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>1</BreakIfRCount> - <Filename>..\Src\application\global_param.c</Filename> - <ExecCommand></ExecCommand> - <Expression>\\L051\../Src/application/global_param.c\25</Expression> - </Bp> - <Bp> - <Number>1</Number> - <Type>0</Type> - <LineNumber>57</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>134266026</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>1</BreakIfRCount> - <Filename>..\Src\application\global_param.c</Filename> - <ExecCommand></ExecCommand> - <Expression>\\L051\../Src/application/global_param.c\57</Expression> - </Bp> - <Bp> - <Number>2</Number> - <Type>0</Type> - <LineNumber>255</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>134257582</Address> + <Address>134250562</Address> <ByteObject>0</ByteObject> <HtxType>0</HtxType> <ManyObjects>0</ManyObjects> @@ -200,186 +173,124 @@ <BreakIfRCount>1</BreakIfRCount> <Filename>../Src/main.c</Filename> <ExecCommand></ExecCommand> - <Expression>\\L051\../Src/main.c\255</Expression> - </Bp> - <Bp> - <Number>3</Number> - <Type>0</Type> - <LineNumber>47</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>134265994</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>1</BreakIfRCount> - <Filename>..\Src\application\global_param.c</Filename> - <ExecCommand></ExecCommand> - <Expression>\\L051\../Src/application/global_param.c\47</Expression> - </Bp> - <Bp> - <Number>4</Number> - <Type>0</Type> - <LineNumber>45</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>134265986</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>1</BreakIfRCount> - <Filename>..\Src\application\global_param.c</Filename> - <ExecCommand></ExecCommand> - <Expression>\\L051\../Src/application/global_param.c\45</Expression> + <Expression>\\L051\../Src/main.c\143</Expression> </Bp> </Breakpoint> <WatchWindow1> <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>last_nearbase_num</ItemText> + <ItemText>recbase_num</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>nearbaseid_list</ItemText> + <ItemText>true_nearbase_idlist</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>tyncpoll_time,0x0A</ItemText> + <ItemText>mainbase_id</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>lptime,0x0A</ItemText> + <ItemText>motor_ontime</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>lpcount,0x0A</ItemText> + <ItemText>nomove_count</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>count_offset,0x0A</ItemText> + <ItemText>tag_state</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>offset,0x0A</ItemText> + <ItemText>module_power,0x0A</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>ancsync_time,0x0A</ItemText> + <ItemText>target_time,0x0A</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>offsettimeus,0x0A</ItemText> + <ItemText>slotpos_intoatl,0x0A</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>target_time,0x0A</ItemText> + <ItemText>key_keeptime</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>current_slotnum,0x0A</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>sync_timer,0x0A</ItemText> + <ItemText>nearbaseid_list</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>end_count,0x0A</ItemText> + <ItemText>mainbase_id</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>lastsync_timer,0x0A</ItemText> + <ItemText>minid</ItemText> </Ww> <Ww> <count>14</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_distlist</ItemText> + <ItemText>temp_dist,0x0A</ItemText> </Ww> <Ww> <count>15</count> <WinNumber>1</WinNumber> - <ItemText>bat_percent,0x0A</ItemText> + <ItemText>nearbase_switchdistlist,0x0A</ItemText> </Ww> <Ww> <count>16</count> <WinNumber>1</WinNumber> - <ItemText>bat_volt</ItemText> + <ItemText>tag_state</ItemText> </Ww> <Ww> <count>17</count> <WinNumber>1</WinNumber> - <ItemText>nomove_count</ItemText> + <ItemText>nearbase_distlist,0x0A</ItemText> </Ww> <Ww> <count>18</count> <WinNumber>1</WinNumber> - <ItemText>rx_buffer</ItemText> + <ItemText>rec_nearbaseid</ItemText> </Ww> <Ww> <count>19</count> <WinNumber>1</WinNumber> - <ItemText>motor_state</ItemText> + <ItemText>mainbase_lost_count</ItemText> </Ww> <Ww> <count>20</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map</ItemText> + <ItemText>motor_state</ItemText> </Ww> <Ww> <count>21</count> <WinNumber>1</WinNumber> - <ItemText>tyncpoll_time,0x0A</ItemText> + <ItemText>motor_keeptime</ItemText> </Ww> <Ww> <count>22</count> <WinNumber>1</WinNumber> - <ItemText>slottime,0x0A</ItemText> - </Ww> - <Ww> - <count>23</count> - <WinNumber>1</WinNumber> - <ItemText>lpcount,0x0A</ItemText> - </Ww> - <Ww> - <count>24</count> - <WinNumber>1</WinNumber> - <ItemText>target_time,0x0A</ItemText> - </Ww> - <Ww> - <count>25</count> - <WinNumber>1</WinNumber> - <ItemText>current_slotnum,0x0A</ItemText> - </Ww> - <Ww> - <count>26</count> - <WinNumber>1</WinNumber> - <ItemText>hadc</ItemText> - </Ww> - <Ww> - <count>27</count> - <WinNumber>1</WinNumber> - <ItemText>tx_near_msg</ItemText> - </Ww> - <Ww> - <count>28</count> - <WinNumber>1</WinNumber> - <ItemText>g_com_map</ItemText> + <ItemText>nomove_count</ItemText> </Ww> </WatchWindow1> <WatchWindow2> @@ -388,6 +299,11 @@ <WinNumber>2</WinNumber> <ItemText>current_slotnum</ItemText> </Ww> + <Ww> + <count>1</count> + <WinNumber>2</WinNumber> + <ItemText>current_slotnum</ItemText> + </Ww> </WatchWindow2> <MemoryWindow1> <Mm> -- Gitblit v1.9.3