From f39c69839382ee3890906e96211527dcb2eaeb51 Mon Sep 17 00:00:00 2001 From: zhangbo <zhangbo@qq.com> Date: 星期六, 28 六月 2025 15:19:51 +0800 Subject: [PATCH] 修改语音上传bug,新增4G下发指令 --- keil/uwb_simple_example.uvoptx | 150 ++------------------------------------------------ 1 files changed, 6 insertions(+), 144 deletions(-) diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx index a2465fb..8602ac7 100644 --- a/keil/uwb_simple_example.uvoptx +++ b/keil/uwb_simple_example.uvoptx @@ -120,7 +120,7 @@ <SetRegEntry> <Number>0</Number> <Key>DLGUARM</Key> - <Name></Name> + <Name>d</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -148,40 +148,7 @@ <Name></Name> </SetRegEntry> </TargetDriverDllRegistry> - <Breakpoint> - <Bp> - <Number>0</Number> - <Type>0</Type> - <LineNumber>528</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>44626</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>1</BreakIfRCount> - <Filename>D:\zhangbo\2024\Code\ChinaUWB\楠炲灝鎼辩粔缁橆槻\ChinaUWBProject\keil\include\src\TCPClient.c</Filename> - <ExecCommand></ExecCommand> - <Expression>\\uwb_simple_example\include/src/TCPClient.c\528</Expression> - </Bp> - <Bp> - <Number>1</Number> - <Type>0</Type> - <LineNumber>672</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>12880</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>1</BreakIfRCount> - <Filename>D:\zhangbo\2024\Code\ChinaUWB\楠炲灝鎼辩粔缁橆槻\ChinaUWBProject\keil\include\src\GPS.c</Filename> - <ExecCommand></ExecCommand> - <Expression>\\uwb_simple_example\include/src/GPS.c\672</Expression> - </Bp> - </Breakpoint> + <Breakpoint/> <WatchWindow1> <Ww> <count>0</count> @@ -378,127 +345,22 @@ <Ww> <count>0</count> <WinNumber>2</WinNumber> - <ItemText>tag_id_recv</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>2</WinNumber> - <ItemText>tagid_list</ItemText> + <ItemText>apcSplitStr</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>2</WinNumber> - <ItemText>tagdist_list</ItemText> + <ItemText>apcSplitStr</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>2</WinNumber> - <ItemText>tagid_list</ItemText> - </Ww> - <Ww> - <count>4</count> - <WinNumber>2</WinNumber> - <ItemText>group_id,0x0A</ItemText> - </Ww> - <Ww> - <count>5</count> - <WinNumber>2</WinNumber> - <ItemText>rx_buf</ItemText> - </Ww> - <Ww> - <count>6</count> - <WinNumber>2</WinNumber> - <ItemText>tagofflinetime,0x0A</ItemText> - </Ww> - <Ww> - <count>7</count> - <WinNumber>2</WinNumber> - <ItemText>taglist_num</ItemText> - </Ww> - <Ww> - <count>8</count> - <WinNumber>2</WinNumber> - <ItemText>nomove_count</ItemText> - </Ww> - <Ww> - <count>9</count> - <WinNumber>2</WinNumber> - <ItemText>tag_id_recv</ItemText> - </Ww> - <Ww> - <count>10</count> - <WinNumber>2</WinNumber> - <ItemText>group_id</ItemText> - </Ww> - <Ww> - <count>11</count> - <WinNumber>2</WinNumber> - <ItemText>group_id</ItemText> - </Ww> - <Ww> - <count>12</count> - <WinNumber>2</WinNumber> - <ItemText>rec_nearbase_num</ItemText> - </Ww> - <Ww> - <count>13</count> - <WinNumber>2</WinNumber> - <ItemText>uwb_offtime_count,0x0A</ItemText> - </Ww> - <Ww> - <count>14</count> - <WinNumber>2</WinNumber> - <ItemText>current_state</ItemText> - </Ww> - <Ww> - <count>15</count> - <WinNumber>2</WinNumber> - <ItemText>_u32Event</ItemText> - </Ww> - <Ww> - <count>16</count> - <WinNumber>2</WinNumber> - <ItemText>elapsed_time_jibu</ItemText> - </Ww> - <Ww> - <count>17</count> - <WinNumber>2</WinNumber> - <ItemText>state_start_time,0x0A</ItemText> - </Ww> - <Ww> - <count>18</count> - <WinNumber>2</WinNumber> - <ItemText>uwb_time_count,0x0A</ItemText> - </Ww> - <Ww> - <count>19</count> - <WinNumber>2</WinNumber> - <ItemText>uwb_offtime_count,0x0A</ItemText> - </Ww> - <Ww> - <count>20</count> - <WinNumber>2</WinNumber> - <ItemText>state_start_time,0x0A</ItemText> - </Ww> - <Ww> - <count>21</count> - <WinNumber>2</WinNumber> - <ItemText>step_count,0x0A</ItemText> - </Ww> - <Ww> - <count>22</count> - <WinNumber>2</WinNumber> - <ItemText>uwb_time_count,0x0A</ItemText> - </Ww> - <Ww> - <count>23</count> - <WinNumber>2</WinNumber> - <ItemText>state_start_time_jibu</ItemText> - </Ww> - <Ww> - <count>24</count> - <WinNumber>2</WinNumber> - <ItemText>current_state</ItemText> + <ItemText>apcSplitStr</ItemText> </Ww> </WatchWindow2> <MemoryWindow1> -- Gitblit v1.9.3