From 61b5220eefbec3fff8df2fa0ff13d216626df280 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期六, 07 十一月 2020 17:40:07 +0800 Subject: [PATCH] Revert "Revert "Revert "V1.34 增加滤波 防撞1对10发货""" --- 源码/核心板/MDK-ARM/Project.uvoptx | 62 +++++------------------------- 1 files changed, 11 insertions(+), 51 deletions(-) diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" index a47d0b6..0bd7aa2 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" @@ -163,97 +163,57 @@ <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>nearbase_num</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_idlist</ItemText> + <ItemText>tyncpoll_time,0x0A</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>exsistbase_list</ItemText> + <ItemText>true_nearbase_distlist</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>last_nearbase_num</ItemText> + <ItemText>true_nearbase_idlist</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>next_nearbase_num</ItemText> + <ItemText>true_exsistbase_list</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>nearbaseid_list</ItemText> + <ItemText>status_reg</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_distlist,0x0A</ItemText> + <ItemText>dw1000local</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_idlist</ItemText> + <ItemText>rx_buffer</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>status_reg</ItemText> + <ItemText>pwtag</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>tagdist_list</ItemText> + <ItemText>mUsartReceivePack</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>tagid_list</ItemText> - </Ww> - <Ww> - <count>11</count> - <WinNumber>1</WinNumber> - <ItemText>QUIT_SLOT_TIME</ItemText> - </Ww> - <Ww> - <count>12</count> - <WinNumber>1</WinNumber> - <ItemText>taglist_num</ItemText> - </Ww> - <Ww> - <count>13</count> - <WinNumber>1</WinNumber> - <ItemText>synclost_timer,0x0A</ItemText> - </Ww> - <Ww> - <count>14</count> - <WinNumber>1</WinNumber> - <ItemText>tyncpoll_time,0x0A</ItemText> - </Ww> - <Ww> - <count>15</count> - <WinNumber>1</WinNumber> - <ItemText>sync_timer,0x0A</ItemText> - </Ww> - <Ww> - <count>16</count> - <WinNumber>1</WinNumber> - <ItemText>true_nearbase_idlist[j]</ItemText> - </Ww> - <Ww> - <count>17</count> - <WinNumber>1</WinNumber> - <ItemText>nearbase_distlist</ItemText> - </Ww> - <Ww> - <count>18</count> - <WinNumber>1</WinNumber> - <ItemText>rx_buffer</ItemText> + <ItemText>g_com_map</ItemText> </Ww> </WatchWindow1> <MemoryWindow1> -- Gitblit v1.9.3