From fadf2a684268a36b7d3069f0e4e932147416c481 Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期一, 21 四月 2025 18:23:57 +0800 Subject: [PATCH] 手环V1.16版本,修改gps闪灯状态e后为1时不用状态机控制,修改5s后关闭4g和gps逻辑,初步测试成功,但OTA中途会重连导致升级不了 --- keil/uwb_simple_example.uvoptx | 751 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 705 insertions(+), 46 deletions(-) diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx index 6c89eff..b979a4c 100644 --- a/keil/uwb_simple_example.uvoptx +++ b/keil/uwb_simple_example.uvoptx @@ -89,7 +89,7 @@ <sRfunc>1</sRfunc> <sRbox>1</sRbox> <tLdApp>1</tLdApp> - <tGomain>1</tGomain> + <tGomain>0</tGomain> <tRbreak>1</tRbreak> <tRwatch>1</tRwatch> <tRmem>1</tRmem> @@ -113,19 +113,19 @@ <tDllPa></tDllPa> <tDlgDll></tDlgDll> <tDlgPa></tDlgPa> - <tIfile></tIfile> + <tIfile>.\Loader.ini</tIfile> <pMon>Segger\JL2CM3.dll</pMon> </DebugOpt> <TargetDriverDllRegistry> <SetRegEntry> <Number>0</Number> <Key>DLGUARM</Key> - <Name>d</Name> + <Name>?姝�</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> <Key>JL2CM3</Key> - <Name>-U20090928 -O78 -S5 -ZTIFSpeedSel1000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD2020000 -FC8000 -FN1 -FF0MK800X_512K.FLM -FS00 -FL080000 -FP0($$Device:MK8000$Flash\MK800X_512K.FLM)</Name> + <Name>-U20090928 -O78 -S1 -ZTIFSpeedSel10000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD2020000 -FC8000 -FN1 -FF0MK800X_512K.FLM -FS00 -FL080000 -FP0($$Device:MK8000$Flash\MK800X_512K.FLM)</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -153,47 +153,682 @@ <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>distance,0x0A</ItemText> + <ItemText>rx_rpt,0x10</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>alarm_type</ItemText> + <ItemText>rx_rpt,0x10</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>gps_power_state</ItemText> + <ItemText>rx_buf</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>current_count,0x0A</ItemText> + <ItemText>rec_nearbase_num</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>start_receive_count,0x0A</ItemText> + <ItemText>resp_tx_en_start_u32,0x0A</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>delay_time,0x0A</ItemText> + <ItemText>ancrec_nearbasepos</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>uwb_timer_reload_value,0x0A</ItemText> + <ItemText>rec_ancdistlist</ItemText> + </Ww> + <Ww> + <count>7</count> + <WinNumber>1</WinNumber> + <ItemText>rec_ancidlist</ItemText> + </Ww> + <Ww> + <count>8</count> + <WinNumber>1</WinNumber> + <ItemText>resp_tx_en_start_u32,0x0A</ItemText> + </Ww> + <Ww> + <count>9</count> + <WinNumber>1</WinNumber> + <ItemText>rec_nearbase_num</ItemText> + </Ww> + <Ww> + <count>10</count> + <WinNumber>1</WinNumber> + <ItemText>mUsart2ReceivePack[index]</ItemText> + </Ww> + <Ww> + <count>11</count> + <WinNumber>1</WinNumber> + <ItemText>rec_ancdistlist</ItemText> + </Ww> + <Ww> + <count>12</count> + <WinNumber>1</WinNumber> + <ItemText>poll_tx_en_start_u32,0x0A</ItemText> + </Ww> + <Ww> + <count>13</count> + <WinNumber>1</WinNumber> + <ItemText>resp_rx_ts_i64,0x0A</ItemText> + </Ww> + <Ww> + <count>14</count> + <WinNumber>1</WinNumber> + <ItemText>tof_f,0x0A</ItemText> + </Ww> + <Ww> + <count>15</count> + <WinNumber>1</WinNumber> + <ItemText>distance_tag,0x0A</ItemText> + </Ww> + <Ww> + <count>16</count> + <WinNumber>1</WinNumber> + <ItemText>tround</ItemText> + </Ww> + <Ww> + <count>17</count> + <WinNumber>1</WinNumber> + <ItemText>treply</ItemText> + </Ww> + <Ww> + <count>18</count> + <WinNumber>1</WinNumber> + <ItemText>tround_temp,0x10</ItemText> + </Ww> + <Ww> + <count>19</count> + <WinNumber>1</WinNumber> + <ItemText>treply_temp,0x10</ItemText> + </Ww> + <Ww> + <count>20</count> + <WinNumber>1</WinNumber> + <ItemText>poll_rx_en_start_u32,0x0A</ItemText> + </Ww> + <Ww> + <count>21</count> + <WinNumber>1</WinNumber> + <ItemText>\\uwb_simple_example\../keil/uwb_app.c\resp_tx_en_start_u32,0x0A</ItemText> + </Ww> + <Ww> + <count>22</count> + <WinNumber>1</WinNumber> + <ItemText>resp_rx_timestamp</ItemText> + </Ww> + <Ww> + <count>23</count> + <WinNumber>1</WinNumber> + <ItemText>poll_tx_timestamp</ItemText> + </Ww> + <Ww> + <count>24</count> + <WinNumber>1</WinNumber> + <ItemText>resp_rx_ts_i64</ItemText> + </Ww> + <Ww> + <count>25</count> + <WinNumber>1</WinNumber> + <ItemText>tt,0x0A</ItemText> + </Ww> + <Ww> + <count>26</count> + <WinNumber>1</WinNumber> + <ItemText>rec_ancdistlist[0],0x0A</ItemText> + </Ww> + <Ww> + <count>27</count> + <WinNumber>1</WinNumber> + <ItemText>distance,0x0A</ItemText> + </Ww> + <Ww> + <count>28</count> + <WinNumber>1</WinNumber> + <ItemText>dist_after_offset</ItemText> + </Ww> + <Ww> + <count>29</count> + <WinNumber>1</WinNumber> + <ItemText>tempflag</ItemText> + </Ww> + <Ww> + <count>30</count> + <WinNumber>1</WinNumber> + <ItemText>flag_temp2</ItemText> + </Ww> + <Ww> + <count>31</count> + <WinNumber>1</WinNumber> + <ItemText>rec_ancdistlist[0],0x0A</ItemText> + </Ww> + <Ww> + <count>32</count> + <WinNumber>1</WinNumber> + <ItemText>range_timeout_us,0x0A</ItemText> + </Ww> + <Ww> + <count>33</count> + <WinNumber>1</WinNumber> + <ItemText>index1</ItemText> + </Ww> + <Ww> + <count>34</count> + <WinNumber>1</WinNumber> + <ItemText>index2</ItemText> + </Ww> + <Ww> + <count>35</count> + <WinNumber>1</WinNumber> + <ItemText>index3</ItemText> + </Ww> + <Ww> + <count>36</count> + <WinNumber>1</WinNumber> + <ItemText>flag_4guart_needinit</ItemText> + </Ww> + <Ww> + <count>37</count> + <WinNumber>1</WinNumber> + <ItemText>tt2,0x0A</ItemText> + </Ww> + <Ww> + <count>38</count> + <WinNumber>1</WinNumber> + <ItemText>resp_tx_en_start_u32,0x0A</ItemText> + </Ww> + <Ww> + <count>39</count> + <WinNumber>1</WinNumber> + <ItemText>temp_count1,0x0A</ItemText> + </Ww> + <Ww> + <count>40</count> + <WinNumber>1</WinNumber> + <ItemText>rx_buf,0x10</ItemText> + </Ww> + <Ww> + <count>41</count> + <WinNumber>1</WinNumber> + <ItemText>poll_rx_en_start_u32,0x0A</ItemText> + </Ww> + <Ww> + <count>42</count> + <WinNumber>1</WinNumber> + <ItemText>rec_nearbase_num</ItemText> + </Ww> + <Ww> + <count>43</count> + <WinNumber>1</WinNumber> + <ItemText>rec_ancdistlist[0],0x0A</ItemText> + </Ww> + <Ww> + <count>44</count> + <WinNumber>1</WinNumber> + <ItemText>temp_recdist_before_offset,0x0A</ItemText> + </Ww> + <Ww> + <count>45</count> + <WinNumber>1</WinNumber> + <ItemText>dist</ItemText> + </Ww> + <Ww> + <count>46</count> + <WinNumber>1</WinNumber> + <ItemText>anchordata_dist[0]</ItemText> + </Ww> + <Ww> + <count>47</count> + <WinNumber>1</WinNumber> + <ItemText>dist_temp,0x0A</ItemText> + </Ww> + <Ww> + <count>48</count> + <WinNumber>1</WinNumber> + <ItemText>\\uwb_simple_example\../keil/uwb_app.c\distance,0x0A</ItemText> + </Ww> + <Ww> + <count>49</count> + <WinNumber>1</WinNumber> + <ItemText>rx_buf[FZ_NEARBASENUM_INDEX]</ItemText> + </Ww> + <Ww> + <count>50</count> + <WinNumber>1</WinNumber> + <ItemText>rec_nearbase_num</ItemText> + </Ww> + <Ww> + <count>51</count> + <WinNumber>1</WinNumber> + <ItemText>motor_open_air_flag</ItemText> + </Ww> + <Ww> + <count>52</count> + <WinNumber>1</WinNumber> + <ItemText>flag_temp2</ItemText> + </Ww> + <Ww> + <count>53</count> + <WinNumber>1</WinNumber> + <ItemText>rec_nearbase_num</ItemText> + </Ww> + <Ww> + <count>54</count> + <WinNumber>1</WinNumber> + <ItemText>deep_sleep_flag</ItemText> + </Ww> + <Ww> + <count>55</count> + <WinNumber>1</WinNumber> + <ItemText>data</ItemText> + </Ww> + <Ww> + <count>56</count> + <WinNumber>1</WinNumber> + <ItemText>Voltage_input,0x0A</ItemText> + </Ww> + <Ww> + <count>57</count> + <WinNumber>1</WinNumber> + <ItemText>fVoltage_mv,0x0A</ItemText> + </Ww> + <Ww> + <count>58</count> + <WinNumber>1</WinNumber> + <ItemText>g_com_map[27],0x0A</ItemText> + </Ww> + <Ww> + <count>59</count> + <WinNumber>1</WinNumber> + <ItemText>g_com_map[28],0x0A</ItemText> + </Ww> + <Ww> + <count>60</count> + <WinNumber>1</WinNumber> + <ItemText>acResponse</ItemText> + </Ww> + <Ww> + <count>61</count> + <WinNumber>1</WinNumber> + <ItemText>u32ResponseLen</ItemText> + </Ww> + <Ww> + <count>62</count> + <WinNumber>1</WinNumber> + <ItemText>_u8Data</ItemText> + </Ww> + <Ww> + <count>63</count> + <WinNumber>1</WinNumber> + <ItemText>_u32Len</ItemText> + </Ww> + <Ww> + <count>64</count> + <WinNumber>1</WinNumber> + <ItemText>_u32Len_temp,0x0A</ItemText> + </Ww> + <Ww> + <count>65</count> + <WinNumber>1</WinNumber> + <ItemText>receive_id,0x10</ItemText> + </Ww> + <Ww> + <count>66</count> + <WinNumber>1</WinNumber> + <ItemText>_u32Len_temp,0x0A</ItemText> + </Ww> + <Ww> + <count>67</count> + <WinNumber>1</WinNumber> + <ItemText>gps_wait_count,0x0A</ItemText> + </Ww> + <Ww> + <count>68</count> + <WinNumber>1</WinNumber> + <ItemText>gps_need_data_flag</ItemText> + </Ww> + <Ww> + <count>69</count> + <WinNumber>1</WinNumber> + <ItemText>gps_open_flag</ItemText> + </Ww> + <Ww> + <count>70</count> + <WinNumber>1</WinNumber> + <ItemText>gps_power_state</ItemText> + </Ww> + <Ww> + <count>71</count> + <WinNumber>1</WinNumber> + <ItemText>flag_secondtask</ItemText> + </Ww> + <Ww> + <count>72</count> + <WinNumber>1</WinNumber> + <ItemText>time_count</ItemText> + </Ww> + <Ww> + <count>73</count> + <WinNumber>1</WinNumber> + <ItemText>gga_num,0x0A</ItemText> + </Ww> + <Ww> + <count>74</count> + <WinNumber>1</WinNumber> + <ItemText>gps_wait_count2</ItemText> + </Ww> + <Ww> + <count>75</count> + <WinNumber>1</WinNumber> + <ItemText>u32GGaLenth,0x0A</ItemText> + </Ww> + <Ww> + <count>76</count> + <WinNumber>1</WinNumber> + <ItemText>userkey_state</ItemText> + </Ww> + <Ww> + <count>77</count> + <WinNumber>1</WinNumber> + <ItemText>m_EUART_DMA_RXBuf</ItemText> + </Ww> + <Ww> + <count>78</count> + <WinNumber>1</WinNumber> + <ItemText>gps_first_flag</ItemText> + </Ww> + <Ww> + <count>79</count> + <WinNumber>1</WinNumber> + <ItemText>g_com_map</ItemText> + </Ww> + <Ww> + <count>80</count> + <WinNumber>1</WinNumber> + <ItemText>gps_open_flag</ItemText> + </Ww> + <Ww> + <count>81</count> + <WinNumber>1</WinNumber> + <ItemText>gps_wait_count,0x0A</ItemText> + </Ww> + <Ww> + <count>82</count> + <WinNumber>1</WinNumber> + <ItemText>gps_first_flag</ItemText> + </Ww> + <Ww> + <count>83</count> + <WinNumber>1</WinNumber> + <ItemText>gps_power_state</ItemText> + </Ww> + <Ww> + <count>84</count> + <WinNumber>1</WinNumber> + <ItemText>power_low_flag</ItemText> + </Ww> + <Ww> + <count>85</count> + <WinNumber>1</WinNumber> + <ItemText>apcSplitStr</ItemText> + </Ww> + <Ww> + <count>86</count> + <WinNumber>1</WinNumber> + <ItemText>beepontime,0x0A</ItemText> + </Ww> + <Ww> + <count>87</count> + <WinNumber>1</WinNumber> + <ItemText>beepontime</ItemText> + </Ww> + <Ww> + <count>88</count> + <WinNumber>1</WinNumber> + <ItemText>userkey_state</ItemText> + </Ww> + <Ww> + <count>89</count> + <WinNumber>1</WinNumber> + <ItemText>flag_TCP_reconnectting</ItemText> + </Ww> + <Ww> + <count>90</count> + <WinNumber>1</WinNumber> + <ItemText>link_error_time,0x0A</ItemText> + </Ww> + <Ww> + <count>91</count> + <WinNumber>1</WinNumber> + <ItemText>GGA_Final_message</ItemText> + </Ww> + <Ww> + <count>92</count> + <WinNumber>1</WinNumber> + <ItemText>active_flag</ItemText> + </Ww> + <Ww> + <count>93</count> + <WinNumber>1</WinNumber> + <ItemText>key_click_state</ItemText> + </Ww> + <Ww> + <count>94</count> + <WinNumber>1</WinNumber> + <ItemText>keystarttime3,0x0A</ItemText> + </Ww> + <Ww> + <count>95</count> + <WinNumber>1</WinNumber> + <ItemText>mUsart2ReceivePack</ItemText> + </Ww> + <Ww> + <count>96</count> + <WinNumber>1</WinNumber> + <ItemText>beepontime</ItemText> + </Ww> + <Ww> + <count>97</count> + <WinNumber>1</WinNumber> + <ItemText>beep_start_flag</ItemText> + </Ww> + <Ww> + <count>98</count> + <WinNumber>1</WinNumber> + <ItemText>click_count</ItemText> + </Ww> + <Ww> + <count>99</count> + <WinNumber>1</WinNumber> + <ItemText>long_press_flag</ItemText> + </Ww> + <Ww> + <count>100</count> + <WinNumber>1</WinNumber> + <ItemText>triple_click_flag</ItemText> + </Ww> + <Ww> + <count>101</count> + <WinNumber>1</WinNumber> + <ItemText>single_click_flag</ItemText> + </Ww> + <Ww> + <count>102</count> + <WinNumber>1</WinNumber> + <ItemText>btn_state</ItemText> + </Ww> + <Ww> + <count>103</count> + <WinNumber>1</WinNumber> + <ItemText>GPS_state</ItemText> + </Ww> + <Ww> + <count>104</count> + <WinNumber>1</WinNumber> + <ItemText>gps_header</ItemText> + </Ww> + <Ww> + <count>105</count> + <WinNumber>1</WinNumber> + <ItemText>sos_state</ItemText> + </Ww> + <Ww> + <count>106</count> + <WinNumber>1</WinNumber> + <ItemText>single_click_flag</ItemText> + </Ww> + <Ww> + <count>107</count> + <WinNumber>1</WinNumber> + <ItemText>long_press_flag</ItemText> + </Ww> + <Ww> + <count>108</count> + <WinNumber>1</WinNumber> + <ItemText>triple_click_flag</ItemText> + </Ww> + <Ww> + <count>109</count> + <WinNumber>1</WinNumber> + <ItemText>rising_time,0x0A</ItemText> + </Ww> + <Ww> + <count>110</count> + <WinNumber>1</WinNumber> + <ItemText>falling_time,0x0A</ItemText> + </Ww> + <Ww> + <count>111</count> + <WinNumber>1</WinNumber> + <ItemText>click_count</ItemText> + </Ww> + <Ww> + <count>112</count> + <WinNumber>1</WinNumber> + <ItemText>active_flag</ItemText> + </Ww> + <Ww> + <count>113</count> + <WinNumber>1</WinNumber> + <ItemText>click_count</ItemText> + </Ww> + <Ww> + <count>114</count> + <WinNumber>1</WinNumber> + <ItemText>temp_rising_time,0x0A</ItemText> + </Ww> + <Ww> + <count>115</count> + <WinNumber>1</WinNumber> + <ItemText>GPS_state</ItemText> + </Ww> + <Ww> + <count>116</count> + <WinNumber>1</WinNumber> + <ItemText>wltag_gps_timer</ItemText> + </Ww> + <Ww> + <count>117</count> + <WinNumber>1</WinNumber> + <ItemText>gps_success_state</ItemText> + </Ww> + <Ww> + <count>118</count> + <WinNumber>1</WinNumber> + <ItemText>air780_success_state</ItemText> + </Ww> + <Ww> + <count>119</count> + <WinNumber>1</WinNumber> + <ItemText>wltag_4g_timer</ItemText> + </Ww> + <Ww> + <count>120</count> + <WinNumber>1</WinNumber> + <ItemText>air780_power_state</ItemText> + </Ww> + <Ww> + <count>121</count> + <WinNumber>1</WinNumber> + <ItemText>TCP_reconnect_timer,0x0A</ItemText> + </Ww> + <Ww> + <count>122</count> + <WinNumber>1</WinNumber> + <ItemText>TCPfail_flag</ItemText> + </Ww> + <Ww> + <count>123</count> + <WinNumber>1</WinNumber> + <ItemText>\\uwb_simple_example\include/src/gps.c\gps_power_state</ItemText> + </Ww> + <Ww> + <count>124</count> + <WinNumber>1</WinNumber> + <ItemText>falling_time</ItemText> + </Ww> + <Ww> + <count>125</count> + <WinNumber>1</WinNumber> + <ItemText>nomove_count</ItemText> + </Ww> + <Ww> + <count>126</count> + <WinNumber>1</WinNumber> + <ItemText>bat_percent,0x0A</ItemText> + </Ww> + <Ww> + <count>127</count> + <WinNumber>1</WinNumber> + <ItemText>fVoltage_mv,0x0A</ItemText> + </Ww> + <Ww> + <count>128</count> + <WinNumber>1</WinNumber> + <ItemText>userkey_state</ItemText> + </Ww> + <Ww> + <count>129</count> + <WinNumber>1</WinNumber> + <ItemText>power_low_flag</ItemText> + </Ww> + <Ww> + <count>130</count> + <WinNumber>1</WinNumber> + <ItemText>GPS_state</ItemText> </Ww> </WatchWindow1> + <WatchWindow2> + <Ww> + <count>0</count> + <WinNumber>2</WinNumber> + <ItemText>_u32DataLen,0x0A</ItemText> + </Ww> + </WatchWindow2> <MemoryWindow1> <Mm> <WinNumber>1</WinNumber> <SubType>8</SubType> - <ItemText>applyid</ItemText> + <ItemText>mUsart2ReceivePack</ItemText> <AccSizeX>0</AccSizeX> </Mm> </MemoryWindow1> + <MemoryWindow2> + <Mm> + <WinNumber>2</WinNumber> + <SubType>8</SubType> + <ItemText>_u8Data_real</ItemText> + <AccSizeX>0</AccSizeX> + </Mm> + </MemoryWindow2> <Tracepoint> <THDelay>0</THDelay> </Tracepoint> @@ -660,6 +1295,18 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> + <PathWithFileName>.\dw_tag.c</PathWithFileName> + <FilenameWithoutPath>dw_tag.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>34</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> <PathWithFileName>.\dw_app_anchor.c</PathWithFileName> <FilenameWithoutPath>dw_app_anchor.c</FilenameWithoutPath> <RteFlg>0</RteFlg> @@ -667,7 +1314,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>34</FileNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -679,7 +1326,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>35</FileNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -691,7 +1338,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>36</FileNumber> + <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -703,7 +1350,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>37</FileNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -715,7 +1362,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>38</FileNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -727,7 +1374,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>39</FileNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -739,7 +1386,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>40</FileNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -751,7 +1398,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>41</FileNumber> + <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -761,17 +1408,29 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>43</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\uwb_tag.c</PathWithFileName> + <FilenameWithoutPath>uwb_tag.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> </Group> <Group> <GroupName>OS</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>5</GroupNumber> - <FileNumber>42</FileNumber> + <FileNumber>44</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -783,7 +1442,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>43</FileNumber> + <FileNumber>45</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -795,7 +1454,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>44</FileNumber> + <FileNumber>46</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -807,7 +1466,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>45</FileNumber> + <FileNumber>47</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -819,7 +1478,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>46</FileNumber> + <FileNumber>48</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -831,7 +1490,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>47</FileNumber> + <FileNumber>49</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -843,7 +1502,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>48</FileNumber> + <FileNumber>50</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -855,7 +1514,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>49</FileNumber> + <FileNumber>51</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -867,7 +1526,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>50</FileNumber> + <FileNumber>52</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -879,7 +1538,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>51</FileNumber> + <FileNumber>53</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -899,7 +1558,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>52</FileNumber> + <FileNumber>54</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -911,7 +1570,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>53</FileNumber> + <FileNumber>55</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -923,7 +1582,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>54</FileNumber> + <FileNumber>56</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -951,7 +1610,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>55</FileNumber> + <FileNumber>57</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -963,7 +1622,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>56</FileNumber> + <FileNumber>58</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -977,13 +1636,13 @@ <Group> <GroupName>HidoLib</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>9</GroupNumber> - <FileNumber>57</FileNumber> + <FileNumber>59</FileNumber> <FileType>4</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1003,7 +1662,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>10</GroupNumber> - <FileNumber>58</FileNumber> + <FileNumber>60</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1015,7 +1674,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>59</FileNumber> + <FileNumber>61</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1027,7 +1686,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>60</FileNumber> + <FileNumber>62</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1039,7 +1698,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>61</FileNumber> + <FileNumber>63</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1051,7 +1710,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>62</FileNumber> + <FileNumber>64</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1063,7 +1722,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>63</FileNumber> + <FileNumber>65</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1075,7 +1734,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>64</FileNumber> + <FileNumber>66</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1095,7 +1754,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>11</GroupNumber> - <FileNumber>65</FileNumber> + <FileNumber>67</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> -- Gitblit v1.9.3