Подтягивание всех изменений с релиза в ветку
This commit is contained in:
1923
STM32F103_Example/MDK-ARM/Modbus_example.uvguix.wot89
Normal file
1923
STM32F103_Example/MDK-ARM/Modbus_example.uvguix.wot89
Normal file
File diff suppressed because one or more lines are too long
@@ -556,114 +556,6 @@
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>23</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\__crc_algs.c</PathWithFileName>
|
||||
<FilenameWithoutPath>__crc_algs.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>24</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>25</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_coils.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_coils.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>26</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_core.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_core.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>27</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_data.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_data.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>28</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_devid.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_devid.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>29</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_holdregs.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_holdregs.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>30</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_inputregs.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_inputregs.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>31</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\rs_message.c</PathWithFileName>
|
||||
<FilenameWithoutPath>rs_message.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>32</FileNumber>
|
||||
<FileType>5</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
@@ -675,7 +567,19 @@
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>33</FileNumber>
|
||||
<FileNumber>24</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_data.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_data.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>25</FileNumber>
|
||||
<FileType>5</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
@@ -685,6 +589,138 @@
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>26</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>27</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_master.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_master.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>28</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_slave.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_slave.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>29</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_coils.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_coils.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>30</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_core.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_core.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>31</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_holdregs.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_holdregs.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>32</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_inputregs.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_inputregs.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>33</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_devid.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_devid.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>34</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\modbus_diag.c</PathWithFileName>
|
||||
<FilenameWithoutPath>modbus_diag.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>35</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\rs_message.c</PathWithFileName>
|
||||
<FilenameWithoutPath>rs_message.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
<File>
|
||||
<GroupNumber>5</GroupNumber>
|
||||
<FileNumber>36</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\..\Modbus\Src\__crc_algs.c</PathWithFileName>
|
||||
<FilenameWithoutPath>__crc_algs.c</FilenameWithoutPath>
|
||||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</File>
|
||||
</Group>
|
||||
|
||||
<Group>
|
||||
|
||||
@@ -567,15 +567,35 @@
|
||||
<GroupName>Modbus</GroupName>
|
||||
<Files>
|
||||
<File>
|
||||
<FileName>__crc_algs.c</FileName>
|
||||
<FileName>modbus_config.h</FileName>
|
||||
<FileType>5</FileType>
|
||||
<FilePath>..\..\Modbus\Inc\modbus_config.h</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>modbus_data.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\..\Modbus\Src\__crc_algs.c</FilePath>
|
||||
<FilePath>..\..\Modbus\Src\modbus_data.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>modbus_data.h</FileName>
|
||||
<FileType>5</FileType>
|
||||
<FilePath>..\..\Modbus\Inc\modbus_data.h</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>modbus.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\..\Modbus\Src\modbus.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>modbus_master.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\..\Modbus\Src\modbus_master.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>modbus_slave.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\..\Modbus\Src\modbus_slave.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>modbus_coils.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
@@ -586,16 +606,6 @@
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\..\Modbus\Src\modbus_core.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>modbus_data.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\..\Modbus\Src\modbus_data.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>modbus_devid.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\..\Modbus\Src\modbus_devid.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>modbus_holdregs.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
@@ -606,20 +616,25 @@
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\..\Modbus\Src\modbus_inputregs.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>modbus_devid.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\..\Modbus\Src\modbus_devid.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>modbus_diag.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\..\Modbus\Src\modbus_diag.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>rs_message.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\..\Modbus\Src\rs_message.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>modbus_config.h</FileName>
|
||||
<FileType>5</FileType>
|
||||
<FilePath>..\..\Modbus\Inc\modbus_config.h</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>modbus_data.h</FileName>
|
||||
<FileType>5</FileType>
|
||||
<FilePath>..\..\Modbus\Inc\modbus_data.h</FilePath>
|
||||
<FileName>__crc_algs.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\..\Modbus\Src\__crc_algs.c</FilePath>
|
||||
</File>
|
||||
</Files>
|
||||
</Group>
|
||||
|
||||
Reference in New Issue
Block a user