From deaf3df8a987f5cff0ac85c9f6ee12589c2c93ce Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 04 Jun 2024 20:00:52 +0800
Subject: [PATCH] 继续测试修改
---
KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx | 305 +++++++++++++++++++++++++++++---------------------
1 files changed, 176 insertions(+), 129 deletions(-)
diff --git a/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx b/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx
index 8f12a6a..50619d7 100644
--- a/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx
+++ b/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx
@@ -119,13 +119,18 @@
<TargetDriverDllRegistry>
<SetRegEntry>
<Number>0</Number>
+ <Key>DLGUARM</Key>
+ <Name>d</Name>
+ </SetRegEntry>
+ <SetRegEntry>
+ <Number>0</Number>
<Key>ARMRTXEVENTFLAGS</Key>
<Name>-L70 -Z18 -C0 -M0 -T1</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>DLGTARM</Key>
- <Name>(1010=145,103,556,531,0)(1007=175,136,382,356,0)(1008=160,120,536,355,0)</Name>
+ <Name>(1010=494,121,905,550,0)(1007=175,136,382,357,0)(1008=459,341,835,577,0)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -148,92 +153,142 @@
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>calendar_g</ItemText>
+ <ItemText>system_eep_id_g</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>sys_log_cyclic_table,0x0A</ItemText>
+ <ItemText>equipment_basic_inf_g</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>sys_store_para_table,0x0A</ItemText>
+ <ItemText>sys_clockBCD_g</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>RESTORE_DEFAULT_SYSLOG_FORMAT_T</ItemText>
+ <ItemText>system_status_word_g.status_word</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>gprs_soft_para_g</ItemText>
+ <ItemText>pwr_vol_g</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>gprs_network_cfg_para_g</ItemText>
+ <ItemText>sys_fun_run_ctrl_g</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>sys_realtime_state_p</ItemText>
+ <ItemText>flow_meter_data_g</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>flow_temp_f</ItemText>
+ <ItemText>wrc_ctrl_para_g</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>1</WinNumber>
- <ItemText>inter_alarm_cnt,0x0A</ItemText>
+ <ItemText>sys_delay_sec_para_g,0x0A</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>1</WinNumber>
- <ItemText>inter_recv_para_g</ItemText>
+ <ItemText>wrc_uart_para_g.recv_buf</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>1</WinNumber>
- <ItemText>sys_realtime_data_g</ItemText>
+ <ItemText>link_info_g</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>1</WinNumber>
- <ItemText>first_power_tim_cnt_g,0x0A</ItemText>
+ <ItemText>send_buf</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>1</WinNumber>
- <ItemText>first_power_get_cnt_g,0x0A</ItemText>
+ <ItemText>protocol_head_up_g</ItemText>
</Ww>
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
- <ItemText>instant_wc_ring,0x0A</ItemText>
+ <ItemText>up_data_head_g</ItemText>
</Ww>
<Ww>
<count>14</count>
<WinNumber>1</WinNumber>
- <ItemText>flow_temp_f</ItemText>
+ <ItemText>send_length</ItemText>
</Ww>
<Ww>
<count>15</count>
<WinNumber>1</WinNumber>
- <ItemText>ladder_price_cfg_para_true_g,0x0A</ItemText>
+ <ItemText>wrc_para_sizhu_g</ItemText>
</Ww>
<Ww>
<count>16</count>
<WinNumber>1</WinNumber>
- <ItemText>billing_real_para_g,0x0A</ItemText>
+ <ItemText>protocol_head_rec</ItemText>
</Ww>
<Ww>
<count>17</count>
<WinNumber>1</WinNumber>
- <ItemText>pwr_vol_g,0x0A</ItemText>
+ <ItemText>wrc_uart_para_g</ItemText>
+ </Ww>
+ <Ww>
+ <count>18</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>protocol_head_rec.cmd_code_u16</ItemText>
+ </Ww>
+ <Ww>
+ <count>19</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rs485_com_uart_data_g,0x10</ItemText>
+ </Ww>
+ <Ww>
+ <count>20</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>uart_ctrl_para_g</ItemText>
+ </Ww>
+ <Ww>
+ <count>21</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>up_comm_recv_buff</ItemText>
+ </Ww>
+ <Ww>
+ <count>22</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>CMU_Clocks,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>23</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>((UART_Type *) ((( uint32_t)0x40000000) +0x00017800) )</ItemText>
+ </Ww>
+ <Ww>
+ <count>24</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>((UART_Type *) ((( uint32_t)0x40000000) +0x00016800) )</ItemText>
+ </Ww>
+ <Ww>
+ <count>25</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>local_random_code_g</ItemText>
+ </Ww>
+ <Ww>
+ <count>26</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>WRC_recv_buff</ItemText>
+ </Ww>
+ <Ww>
+ <count>27</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>u8_temp_s2</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
@@ -251,9 +306,9 @@
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
- <SubType>1</SubType>
- <ItemText>0x20008C48</ItemText>
- <AccSizeX>0</AccSizeX>
+ <SubType>0</SubType>
+ <ItemText>wrc_uart_para_g.recv_buf</ItemText>
+ <AccSizeX>1</AccSizeX>
</Mm>
</MemoryWindow1>
<Tracepoint>
@@ -678,6 +733,30 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ <File>
+ <GroupNumber>3</GroupNumber>
+ <FileNumber>30</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\OTHER_FUN\other_fun.c</PathWithFileName>
+ <FilenameWithoutPath>other_fun.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>3</GroupNumber>
+ <FileNumber>31</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\SYS_SLEEP\sys_sleep.c</PathWithFileName>
+ <FilenameWithoutPath>sys_sleep.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
</Group>
<Group>
@@ -688,7 +767,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>30</FileNumber>
+ <FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -700,7 +779,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>31</FileNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -712,7 +791,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>32</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -724,7 +803,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -736,7 +815,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -748,7 +827,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -760,7 +839,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -780,7 +859,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -792,7 +871,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -812,13 +891,25 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Function\WirelessRemoteComm\wireless_remote_comm.c</PathWithFileName>
<FilenameWithoutPath>wireless_remote_comm.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>6</GroupNumber>
+ <FileNumber>42</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\WirelessRemoteComm\wrc_sizhu_v4.c</PathWithFileName>
+ <FilenameWithoutPath>wrc_sizhu_v4.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@@ -832,7 +923,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>43</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -844,7 +935,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -856,57 +947,13 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>42</FileNumber>
+ <FileNumber>45</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Function\LCD\lcd_io_api.c</PathWithFileName>
<FilenameWithoutPath>lcd_io_api.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- </Group>
-
- <Group>
- <GroupName>CmBackTrace</GroupName>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <cbSel>0</cbSel>
- <RteFlg>0</RteFlg>
- <File>
- <GroupNumber>8</GroupNumber>
- <FileNumber>43</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>..\CmBackTrace\cm_backtrace.c</PathWithFileName>
- <FilenameWithoutPath>cm_backtrace.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- <File>
- <GroupNumber>8</GroupNumber>
- <FileNumber>44</FileNumber>
- <FileType>2</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>..\CmBackTrace\cmb_fault.S</PathWithFileName>
- <FilenameWithoutPath>cmb_fault.S</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- <File>
- <GroupNumber>8</GroupNumber>
- <FileNumber>45</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>..\CmBackTrace\fault_test.c</PathWithFileName>
- <FilenameWithoutPath>fault_test.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@@ -927,7 +974,7 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>46</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -939,7 +986,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>47</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -951,7 +998,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>48</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -963,7 +1010,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>49</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -975,7 +1022,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>50</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -987,7 +1034,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>51</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -999,7 +1046,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>52</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1011,7 +1058,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>53</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1023,7 +1070,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1035,7 +1082,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1047,7 +1094,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1059,7 +1106,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1071,7 +1118,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1083,7 +1130,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>59</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1095,7 +1142,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>60</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1107,7 +1154,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1119,7 +1166,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1131,7 +1178,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1143,7 +1190,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1155,7 +1202,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1167,7 +1214,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1179,7 +1226,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>67</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1191,7 +1238,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>68</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1203,7 +1250,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>69</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1215,7 +1262,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>70</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1227,7 +1274,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>71</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1239,7 +1286,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>72</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1251,7 +1298,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>73</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1263,7 +1310,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>74</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1275,7 +1322,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>75</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1287,7 +1334,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
+ <GroupNumber>9</GroupNumber>
<FileNumber>76</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1307,7 +1354,7 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>11</GroupNumber>
+ <GroupNumber>10</GroupNumber>
<FileNumber>77</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1319,7 +1366,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>11</GroupNumber>
+ <GroupNumber>10</GroupNumber>
<FileNumber>78</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1331,7 +1378,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>11</GroupNumber>
+ <GroupNumber>10</GroupNumber>
<FileNumber>79</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1351,7 +1398,7 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>80</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1363,7 +1410,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>81</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1375,7 +1422,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>82</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1387,7 +1434,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>83</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1399,7 +1446,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>84</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1411,7 +1458,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>85</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1423,7 +1470,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>86</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1435,7 +1482,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>87</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1447,7 +1494,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>88</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1459,7 +1506,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>89</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1471,7 +1518,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>90</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1483,7 +1530,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>91</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1495,7 +1542,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>92</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1507,7 +1554,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>93</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1519,7 +1566,7 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>12</GroupNumber>
+ <GroupNumber>11</GroupNumber>
<FileNumber>94</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -1534,7 +1581,7 @@
<Group>
<GroupName>::Device</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>1</RteFlg>
--
Gitblit v1.9.3