From cf4d12fd8322cbb350dd3bc5af8c748e8790ac64 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 05 Jun 2024 17:38:06 +0800
Subject: [PATCH] 继续测试修改
---
KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx | 637 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 438 insertions(+), 199 deletions(-)
diff --git a/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx b/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx
index 0ee7ac5..15b5720 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>
@@ -143,130 +148,172 @@
<Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0FM33A06XEX_FLASH512 -FS00 -FL080000 -FP0($$Device:FM33A06XEV$Flash\FM33A06XEX_FLASH512.FLM))</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
- <Breakpoint>
- <Bp>
- <Number>0</Number>
- <Type>0</Type>
- <LineNumber>138</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>0</Address>
- <ByteObject>0</ByteObject>
- <HtxType>0</HtxType>
- <ManyObjects>0</ManyObjects>
- <SizeOfObject>0</SizeOfObject>
- <BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>0</BreakIfRCount>
- <Filename>..\Function\FLOW_METER_DATA_COLLECT\pulse_and_alarm_line.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression></Expression>
- </Bp>
- <Bp>
- <Number>1</Number>
- <Type>0</Type>
- <LineNumber>142</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>0</Address>
- <ByteObject>0</ByteObject>
- <HtxType>0</HtxType>
- <ManyObjects>0</ManyObjects>
- <SizeOfObject>0</SizeOfObject>
- <BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>0</BreakIfRCount>
- <Filename>..\Function\FLOW_METER_DATA_COLLECT\pulse_and_alarm_line.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression></Expression>
- </Bp>
- </Breakpoint>
+ <Breakpoint/>
<WatchWindow1>
<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>
+ <Ww>
+ <count>28</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>save_realtime_data_g</ItemText>
+ </Ww>
+ <Ww>
+ <count>29</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>system_status_word_g.status_word.broken_line</ItemText>
+ </Ww>
+ <Ww>
+ <count>30</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>system_status_word_g.status_word.cover_open</ItemText>
+ </Ww>
+ <Ww>
+ <count>31</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>broken_line_cnt</ItemText>
+ </Ww>
+ <Ww>
+ <count>32</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>system_alarm_ctrl_word_g.alarm_ctl_word</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
@@ -284,9 +331,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>
@@ -295,7 +342,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>1</aLwin>
+ <aLwin>0</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -366,18 +413,6 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
- <PathWithFileName>..\Soft\mbcrc.c</PathWithFileName>
- <FilenameWithoutPath>mbcrc.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- <File>
- <GroupNumber>1</GroupNumber>
- <FileNumber>3</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
<PathWithFileName>..\Soft\sizhu_ctrl_word.c</PathWithFileName>
<FilenameWithoutPath>sizhu_ctrl_word.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
@@ -385,7 +420,7 @@
</File>
<File>
<GroupNumber>1</GroupNumber>
- <FileNumber>4</FileNumber>
+ <FileNumber>3</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -397,7 +432,7 @@
</File>
<File>
<GroupNumber>1</GroupNumber>
- <FileNumber>5</FileNumber>
+ <FileNumber>4</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -409,7 +444,7 @@
</File>
<File>
<GroupNumber>1</GroupNumber>
- <FileNumber>6</FileNumber>
+ <FileNumber>5</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -421,13 +456,25 @@
</File>
<File>
<GroupNumber>1</GroupNumber>
- <FileNumber>7</FileNumber>
+ <FileNumber>6</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Soft\linked_list.c</PathWithFileName>
<FilenameWithoutPath>linked_list.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>1</GroupNumber>
+ <FileNumber>7</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Soft\mbcrc1.c</PathWithFileName>
+ <FilenameWithoutPath>mbcrc1.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@@ -699,6 +746,42 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ <File>
+ <GroupNumber>3</GroupNumber>
+ <FileNumber>29</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\BILLING\billing.c</PathWithFileName>
+ <FilenameWithoutPath>billing.c</FilenameWithoutPath>
+ <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>
@@ -709,7 +792,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>29</FileNumber>
+ <FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -721,7 +804,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>30</FileNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -733,7 +816,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>31</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -745,7 +828,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>32</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -757,7 +840,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -769,7 +852,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -781,7 +864,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -801,7 +884,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -813,7 +896,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -833,13 +916,25 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>38</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>
@@ -853,7 +948,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>43</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -865,7 +960,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -877,57 +972,13 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>41</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>42</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>43</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>44</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>
@@ -948,8 +999,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>45</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>46</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -960,8 +1011,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>46</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>47</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -972,8 +1023,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>47</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>48</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -984,8 +1035,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>48</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>49</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -996,8 +1047,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>49</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>50</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1008,8 +1059,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>50</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>51</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1020,8 +1071,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>51</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>52</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1032,8 +1083,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>52</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>53</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1044,8 +1095,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>53</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1056,8 +1107,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>54</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1068,8 +1119,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>55</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1080,8 +1131,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>56</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1092,8 +1143,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>57</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1104,8 +1155,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>58</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>59</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1116,8 +1167,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>59</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>60</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1128,8 +1179,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>60</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1140,8 +1191,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>61</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1152,8 +1203,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>62</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1164,8 +1215,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>63</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1176,8 +1227,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>64</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1188,8 +1239,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>65</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1200,8 +1251,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>66</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>67</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1212,8 +1263,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>67</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>68</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1224,8 +1275,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>68</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>69</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1236,8 +1287,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>69</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>70</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1248,8 +1299,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>70</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>71</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1260,8 +1311,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>71</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>72</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1272,8 +1323,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>72</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>73</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1284,8 +1335,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>73</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>74</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1296,8 +1347,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>74</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>75</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1308,8 +1359,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>75</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>76</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1328,8 +1379,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>11</GroupNumber>
- <FileNumber>76</FileNumber>
+ <GroupNumber>10</GroupNumber>
+ <FileNumber>77</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1340,8 +1391,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>11</GroupNumber>
- <FileNumber>77</FileNumber>
+ <GroupNumber>10</GroupNumber>
+ <FileNumber>78</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1352,8 +1403,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>11</GroupNumber>
- <FileNumber>78</FileNumber>
+ <GroupNumber>10</GroupNumber>
+ <FileNumber>79</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1366,8 +1417,196 @@
</Group>
<Group>
+ <GroupName>modbus</GroupName>
+ <tvExp>1</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <cbSel>0</cbSel>
+ <RteFlg>0</RteFlg>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>80</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\functions\mb.c</PathWithFileName>
+ <FilenameWithoutPath>mb.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>81</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\functions\mbfunccoils.c</PathWithFileName>
+ <FilenameWithoutPath>mbfunccoils.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>82</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\functions\mbfuncdiag.c</PathWithFileName>
+ <FilenameWithoutPath>mbfuncdiag.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>83</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\functions\mbfuncdisc.c</PathWithFileName>
+ <FilenameWithoutPath>mbfuncdisc.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>84</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\functions\mbfuncholding.c</PathWithFileName>
+ <FilenameWithoutPath>mbfuncholding.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>85</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\functions\mbfuncinput.c</PathWithFileName>
+ <FilenameWithoutPath>mbfuncinput.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>86</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\functions\mbfuncother.c</PathWithFileName>
+ <FilenameWithoutPath>mbfuncother.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>87</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\functions\mbutils.c</PathWithFileName>
+ <FilenameWithoutPath>mbutils.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>88</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\port\portevent.c</PathWithFileName>
+ <FilenameWithoutPath>portevent.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>89</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\port\portserial.c</PathWithFileName>
+ <FilenameWithoutPath>portserial.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>90</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\port\porttimer.c</PathWithFileName>
+ <FilenameWithoutPath>porttimer.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>91</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\port\regdefine.c</PathWithFileName>
+ <FilenameWithoutPath>regdefine.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>92</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\port\regport.c</PathWithFileName>
+ <FilenameWithoutPath>regport.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>93</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\rtu\mbcrc.c</PathWithFileName>
+ <FilenameWithoutPath>mbcrc.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>94</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\modbus\rtu\mbrtu.c</PathWithFileName>
+ <FilenameWithoutPath>mbrtu.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ </Group>
+
+ <Group>
<GroupName>::Device</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>1</RteFlg>
--
Gitblit v1.9.3