From b97fe0e1006e09399214e49b8acc0ce10f4ffd0d Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期五, 13 九月 2024 09:44:19 +0800 Subject: [PATCH] 1.28,修复标签心跳包发送网关收不到的bug。兼容焊没焊uwb的两种板子 --- MDK-ARM/L051.uvoptx | 67 ++++++++++----------------------- 1 files changed, 21 insertions(+), 46 deletions(-) diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx index 4688917..1e6d913 100644 --- a/MDK-ARM/L051.uvoptx +++ b/MDK-ARM/L051.uvoptx @@ -145,7 +145,7 @@ <SetRegEntry> <Number>0</Number> <Key>JL2CM3</Key> - <Name>-U20090928 -O70 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name> + <Name>-U20090928 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -163,122 +163,97 @@ <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>wg_report_id</ItemText> + <ItemText>result</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>wg_state</ItemText> + <ItemText>report_ancnum</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>Height</ItemText> + <ItemText>time</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>wg_lost_count</ItemText> + <ItemText>report_ancdist[0],0x0A</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>lora_sendbuffer</ItemText> + <ItemText>gps_chafenlingqi</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>wg_lost_count,0x0A</ItemText> + <ItemText>buffer</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>RX_Buffer</ItemText> + <ItemText>wg_report_sf</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>GPS_Close_time</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>debugnum</ItemText> + <ItemText>lora_irq_flag</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>yuyinzidongguan_time</ItemText> + <ItemText>irq_num,0x0A</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>l_stGPSRecv</ItemText> + <ItemText>uwb_rx_remaintime_ms</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>fangzhijinrushuimian_flag</ItemText> + <ItemText>buffer</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>GPS_GGAdate</ItemText> + <ItemText>OperatingMode</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>test111</ItemText> + <ItemText>report_ancdist,0x0A</ItemText> </Ww> <Ww> <count>14</count> <WinNumber>1</WinNumber> - <ItemText>test111</ItemText> + <ItemText>report_ancid</ItemText> </Ww> <Ww> <count>15</count> <WinNumber>1</WinNumber> - <ItemText>wg_report_freq,0x0A</ItemText> + <ItemText>debugnum</ItemText> </Ww> <Ww> <count>16</count> <WinNumber>1</WinNumber> - <ItemText>nomove_count</ItemText> + <ItemText>wg_report_id</ItemText> </Ww> <Ww> <count>17</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map</ItemText> + <ItemText>wg_report_id</ItemText> </Ww> <Ww> <count>18</count> <WinNumber>1</WinNumber> - <ItemText>recv_end_time,0x0A</ItemText> - </Ww> - <Ww> - <count>19</count> - <WinNumber>1</WinNumber> - <ItemText>delaytime,0x0A</ItemText> - </Ww> - <Ww> - <count>20</count> - <WinNumber>1</WinNumber> - <ItemText>test_num</ItemText> - </Ww> - <Ww> - <count>21</count> - <WinNumber>1</WinNumber> - <ItemText>datalen_offset,0x0A</ItemText> - </Ww> - <Ww> - <count>22</count> - <WinNumber>1</WinNumber> - <ItemText>delaytime,0x0A</ItemText> - </Ww> - <Ww> - <count>23</count> - <WinNumber>1</WinNumber> - <ItemText>power,0x0A</ItemText> + <ItemText>xiafayuyin_data</ItemText> </Ww> </WatchWindow1> <MemoryWindow1> @@ -319,7 +294,7 @@ <DebugFlag> <trace>0</trace> <periodic>1</periodic> - <aLwin>1</aLwin> + <aLwin>0</aLwin> <aCover>0</aCover> <aSer1>0</aSer1> <aSer2>0</aSer2> -- Gitblit v1.9.3