From 748e84eba0b5d27b681652df9e23f9d5a28e9b9b Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 04 十一月 2020 18:41:09 +0800
Subject: [PATCH] V2.7 医院发货的下一次版本，增加5v输入不休眠
---
MDK-ARM/L051.uvoptx | 209 +++++++--------------------------------------------
1 files changed, 30 insertions(+), 179 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index 22c1677..5014736 100644
--- a/MDK-ARM/L051.uvoptx
+++ b/MDK-ARM/L051.uvoptx
@@ -125,7 +125,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name>d</Name>
+ <Name></Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -162,9 +162,9 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>232</LineNumber>
+ <LineNumber>827</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134254650</Address>
+ <Address>134244930</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
@@ -173,12 +173,28 @@
<BreakIfRCount>1</BreakIfRCount>
<Filename>../Src/main.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/main.c\232</Expression>
+ <Expression>\\L051\../Src/main.c\827</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
- <LineNumber>233</LineNumber>
+ <LineNumber>828</LineNumber>
+ <EnabledFlag>1</EnabledFlag>
+ <Address>0</Address>
+ <ByteObject>0</ByteObject>
+ <HtxType>0</HtxType>
+ <ManyObjects>0</ManyObjects>
+ <SizeOfObject>0</SizeOfObject>
+ <BreakByAccess>0</BreakByAccess>
+ <BreakIfRCount>0</BreakIfRCount>
+ <Filename>../Src/main.c</Filename>
+ <ExecCommand></ExecCommand>
+ <Expression></Expression>
+ </Bp>
+ <Bp>
+ <Number>2</Number>
+ <Type>0</Type>
+ <LineNumber>830</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
@@ -196,192 +212,22 @@
<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>
- </Ww>
- <Ww>
- <count>4</count>
- <WinNumber>1</WinNumber>
- <ItemText>mainbase_lost_count</ItemText>
- </Ww>
- <Ww>
- <count>5</count>
- <WinNumber>1</WinNumber>
- <ItemText>trygetnearmsg_times</ItemText>
- </Ww>
- <Ww>
- <count>6</count>
- <WinNumber>1</WinNumber>
- <ItemText>changemainbase_count</ItemText>
- </Ww>
- <Ww>
- <count>7</count>
- <WinNumber>1</WinNumber>
- <ItemText>mainbase_dist,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>8</count>
- <WinNumber>1</WinNumber>
- <ItemText>true_nearbase_distlist</ItemText>
- </Ww>
- <Ww>
- <count>9</count>
- <WinNumber>1</WinNumber>
- <ItemText>recbase_num</ItemText>
- </Ww>
- <Ww>
- <count>10</count>
- <WinNumber>1</WinNumber>
- <ItemText>mainbase_lost_count</ItemText>
- </Ww>
- <Ww>
- <count>11</count>
- <WinNumber>1</WinNumber>
- <ItemText>tx_near_msg</ItemText>
- </Ww>
- <Ww>
- <count>12</count>
- <WinNumber>1</WinNumber>
- <ItemText>recbase_num</ItemText>
- </Ww>
- <Ww>
- <count>13</count>
- <WinNumber>1</WinNumber>
- <ItemText>mainbase_id</ItemText>
- </Ww>
- <Ww>
- <count>14</count>
- <WinNumber>1</WinNumber>
- <ItemText>status_reg</ItemText>
- </Ww>
- <Ww>
- <count>15</count>
- <WinNumber>1</WinNumber>
- <ItemText>nearbaseid_list</ItemText>
- </Ww>
- <Ww>
- <count>16</count>
- <WinNumber>1</WinNumber>
- <ItemText>nearbase_distlist,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>17</count>
- <WinNumber>1</WinNumber>
- <ItemText>true_nearbase_distlist[0],0x0A</ItemText>
- </Ww>
- <Ww>
- <count>18</count>
- <WinNumber>1</WinNumber>
- <ItemText>mainbase_dist,0x0A</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>
- </Ww>
- <Ww>
- <count>28</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
- </Ww>
- <Ww>
- <count>29</count>
- <WinNumber>1</WinNumber>
- <ItemText>tagslotpos</ItemText>
- </Ww>
- <Ww>
- <count>30</count>
- <WinNumber>1</WinNumber>
- <ItemText>tag_state</ItemText>
- </Ww>
- <Ww>
- <count>31</count>
- <WinNumber>1</WinNumber>
- <ItemText>mainbase_id</ItemText>
- </Ww>
- <Ww>
- <count>32</count>
- <WinNumber>1</WinNumber>
- <ItemText>current_slotnum</ItemText>
- </Ww>
- <Ww>
- <count>33</count>
- <WinNumber>1</WinNumber>
- <ItemText>bigslot_num</ItemText>
- </Ww>
- <Ww>
- <count>34</count>
- <WinNumber>1</WinNumber>
- <ItemText>current_slotnum</ItemText>
- </Ww>
- <Ww>
- <count>35</count>
- <WinNumber>1</WinNumber>
- <ItemText>target_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>36</count>
- <WinNumber>1</WinNumber>
- <ItemText>target_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>37</count>
- <WinNumber>1</WinNumber>
- <ItemText>bigslot_num,0x0A</ItemText>
+ <ItemText>motor_ontime</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
@@ -390,6 +236,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