From 810560554f3be7c23dabd7d484ef2b2822c2ae46 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期二, 15 十二月 2020 10:43:57 +0800 Subject: [PATCH] 同步稳定性 --- MDK-ARM/L051.uvoptx | 89 +++++++++++++------------------------------- 1 files changed, 27 insertions(+), 62 deletions(-) diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx index 024a2c8..c4578bd 100644 --- a/MDK-ARM/L051.uvoptx +++ b/MDK-ARM/L051.uvoptx @@ -120,12 +120,12 @@ <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 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name> + <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> - <Name>d</Name> + <Name></Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -163,142 +163,102 @@ <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>tag_state</ItemText> + <ItemText>recbase_num</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>nearbase_num</ItemText> + <ItemText>true_nearbase_idlist</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>nearbaseid_list</ItemText> + <ItemText>mainbase_id</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>mainbase_id</ItemText> + <ItemText>motor_ontime</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>mainbase_lost_count</ItemText> + <ItemText>nomove_count</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>trygetnearmsg_times</ItemText> + <ItemText>tag_state</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>changemainbase_count</ItemText> + <ItemText>module_power,0x0A</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>mainbase_dist,0x0A</ItemText> + <ItemText>target_time,0x0A</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_distlist</ItemText> + <ItemText>slotpos_intoatl,0x0A</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>recbase_num</ItemText> + <ItemText>key_keeptime</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>mainbase_lost_count</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>tx_near_msg</ItemText> + <ItemText>nearbaseid_list</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>recbase_num</ItemText> + <ItemText>mainbase_id</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>mainbase_id</ItemText> + <ItemText>minid</ItemText> </Ww> <Ww> <count>14</count> <WinNumber>1</WinNumber> - <ItemText>status_reg</ItemText> + <ItemText>temp_dist,0x0A</ItemText> </Ww> <Ww> <count>15</count> <WinNumber>1</WinNumber> - <ItemText>nearbaseid_list</ItemText> + <ItemText>nearbase_switchdistlist,0x0A</ItemText> </Ww> <Ww> <count>16</count> <WinNumber>1</WinNumber> - <ItemText>nearbase_distlist,0x0A</ItemText> + <ItemText>tag_state</ItemText> </Ww> <Ww> <count>17</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_distlist[0],0x0A</ItemText> + <ItemText>nearbase_distlist,0x0A</ItemText> </Ww> <Ww> <count>18</count> <WinNumber>1</WinNumber> - <ItemText>mainbase_dist,0x0A</ItemText> + <ItemText>rec_nearbaseid</ItemText> </Ww> <Ww> <count>19</count> <WinNumber>1</WinNumber> - <ItemText>nomove_count</ItemText> - </Ww> - <Ww> - <count>20</count> - <WinNumber>1</WinNumber> - <ItemText>target_time,0x0A</ItemText> - </Ww> - <Ww> - <count>21</count> - <WinNumber>1</WinNumber> - <ItemText>lptime,0x0A</ItemText> - </Ww> - <Ww> - <count>22</count> - <WinNumber>1</WinNumber> - <ItemText>lpcount,0x0A</ItemText> - </Ww> - <Ww> - <count>23</count> - <WinNumber>1</WinNumber> - <ItemText>current_slotnum*bigslot_num,0x0A</ItemText> - </Ww> - <Ww> - <count>24</count> - <WinNumber>1</WinNumber> - <ItemText>bigslot_num,0x0A</ItemText> - </Ww> - <Ww> - <count>25</count> - <WinNumber>1</WinNumber> - <ItemText>(current_slotnum*bigslot_num+slotpos)*SLOTTIME_MS</ItemText> - </Ww> - <Ww> - <count>26</count> - <WinNumber>1</WinNumber> - <ItemText>current_slotnum</ItemText> - </Ww> - <Ww> - <count>27</count> - <WinNumber>1</WinNumber> - <ItemText>sync_timer,0x0A</ItemText> + <ItemText>mainbase_lost_count</ItemText> </Ww> </WatchWindow1> <WatchWindow2> @@ -307,6 +267,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