From fa6053f85287163f6e2d5dba690bec05cbc95f4a Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 07 Jun 2024 17:00:49 +0800
Subject: [PATCH] 增加阀控事件记录及修改阀控命令
---
KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx | 555 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 351 insertions(+), 204 deletions(-)
diff --git a/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx b/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx
index 3ceea13..cac83d2 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,42 @@
<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>wrc_ctrl_para_g</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>gprs_network_cfg_para_g</ItemText>
+ <ItemText>sys_delay_sec_para_g,0x0A</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>sys_realtime_state_p</ItemText>
+ <ItemText>save_valve_para_g</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>flow_temp_f</ItemText>
- </Ww>
- <Ww>
- <count>8</count>
- <WinNumber>1</WinNumber>
- <ItemText>inter_alarm_cnt,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>9</count>
- <WinNumber>1</WinNumber>
- <ItemText>inter_recv_para_g</ItemText>
- </Ww>
- <Ww>
- <count>10</count>
- <WinNumber>1</WinNumber>
- <ItemText>sys_realtime_data_g</ItemText>
- </Ww>
- <Ww>
- <count>11</count>
- <WinNumber>1</WinNumber>
- <ItemText>first_power_tim_cnt_g,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>12</count>
- <WinNumber>1</WinNumber>
- <ItemText>first_power_get_cnt_g,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>13</count>
- <WinNumber>1</WinNumber>
- <ItemText>instant_wc_ring,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>14</count>
- <WinNumber>1</WinNumber>
- <ItemText>flow_temp_f</ItemText>
- </Ww>
- <Ww>
- <count>15</count>
- <WinNumber>1</WinNumber>
- <ItemText>ladder_price_cfg_para_true_g,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>16</count>
- <WinNumber>1</WinNumber>
- <ItemText>billing_real_para_g,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>17</count>
- <WinNumber>1</WinNumber>
- <ItemText>pwr_vol_g,0x0A</ItemText>
+ <ItemText>valve_ctrl_para_g</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
@@ -251,9 +206,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>
@@ -333,18 +288,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>
@@ -352,7 +295,7 @@
</File>
<File>
<GroupNumber>1</GroupNumber>
- <FileNumber>4</FileNumber>
+ <FileNumber>3</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -364,7 +307,7 @@
</File>
<File>
<GroupNumber>1</GroupNumber>
- <FileNumber>5</FileNumber>
+ <FileNumber>4</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -376,7 +319,7 @@
</File>
<File>
<GroupNumber>1</GroupNumber>
- <FileNumber>6</FileNumber>
+ <FileNumber>5</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -388,13 +331,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>
@@ -666,6 +621,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>
@@ -676,7 +667,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>29</FileNumber>
+ <FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -688,7 +679,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>30</FileNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -700,7 +691,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>31</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -712,7 +703,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>32</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -724,7 +715,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -736,7 +727,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -748,7 +739,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -768,7 +759,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -780,7 +771,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -800,13 +791,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>
@@ -820,7 +823,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>43</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -832,7 +835,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -844,57 +847,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>
@@ -915,8 +874,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>
@@ -927,8 +886,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>
@@ -939,8 +898,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>
@@ -951,8 +910,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>
@@ -963,8 +922,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>
@@ -975,8 +934,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>
@@ -987,8 +946,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>
@@ -999,8 +958,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>
@@ -1011,8 +970,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>
@@ -1023,8 +982,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>
@@ -1035,8 +994,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>
@@ -1047,8 +1006,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>
@@ -1059,8 +1018,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>
@@ -1071,8 +1030,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>
@@ -1083,8 +1042,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>
@@ -1095,8 +1054,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>
@@ -1107,8 +1066,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>
@@ -1119,8 +1078,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>
@@ -1131,8 +1090,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>
@@ -1143,8 +1102,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>
@@ -1155,8 +1114,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>
@@ -1167,8 +1126,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>
@@ -1179,8 +1138,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>
@@ -1191,8 +1150,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>
@@ -1203,8 +1162,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>
@@ -1215,8 +1174,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>
@@ -1227,8 +1186,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>
@@ -1239,8 +1198,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>
@@ -1251,8 +1210,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>
@@ -1263,8 +1222,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>
@@ -1275,8 +1234,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>
@@ -1295,8 +1254,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>
@@ -1307,8 +1266,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>
@@ -1319,8 +1278,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>
@@ -1333,8 +1292,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