浏览代码

附加功能修改

main
the_deepest 6 天前
父节点
当前提交
8a46d58522
共有 4 个文件被更改,包括 863 次插入862 次删除
  1. +25
    -25
      iar/settings/F407_uCOSii_Modbus.wsdt
  2. +13
    -13
      iar/settings/uCOS_Modbus.dnx
  3. +796
    -795
      iar/uCOS_Modbus.dep
  4. +29
    -29
      modbus/modbus.c

+ 25
- 25
iar/settings/F407_uCOSii_Modbus.wsdt 查看文件

@@ -62,7 +62,7 @@
<item>33054</item>
<item>0</item>
<item>33035</item>
<item>33036</item>
<item>33037</item>
<item>34399</item>
<item>0</item>
<item>33038</item>
@@ -72,7 +72,7 @@
</IarPane-34049>
<IarPane-34061>
<ColumnWidths>
<Column0>182</Column0>
<Column0>190</Column0>
<Column1>30</Column1>
<Column2>30</Column2>
<Column3>30</Column3>
@@ -84,8 +84,8 @@
</NodeDict>
</IarPane-34061>
<IarPane-34053>
<ColumnWidth0>30</ColumnWidth0>
<ColumnWidth1>1644</ColumnWidth1>
<ColumnWidth0>36</ColumnWidth0>
<ColumnWidth1>1638</ColumnWidth1>
<FilterLevel>2</FilterLevel>
<LiveFile></LiveFile>
<LiveLogEnabled>0</LiveLogEnabled>
@@ -103,11 +103,11 @@
<RecentlyUsedMenus>1</RecentlyUsedMenus>
<MenuShadows>1</MenuShadows>
<ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>
<CommandsUsage>E40000001B001B8F0000020000001386000002000000108600005300000020810000010000000C810000040000000D80000002000000048600000200000056860000220000000084000002000000148100000100000030840000010000000E810000010000005E8600000A0000008E8600000100000000E10000010000000B81000001000000058400000100000069860000010000001486000001000000198F00000200000005810000010000000284000002000000118600003600000000860000020000001084000006000000468100001E0000000886000002000000</CommandsUsage>
<CommandsUsage>040100001C0013860000040000001B8F000001000000108600005E00000020810000010000000D800000020000000C810000020000000486000002000000568600002D0000001481000001000000008400000100000030840000010000001F810000010000005E8600000A0000000E810000060000000B8100000100000000E10000010000008E860000010000001486000001000000698600000100000005840000010000000086000002000000118600003C00000002840000020000000581000001000000198F000001000000468100002000000010840000060000000886000002000000</CommandsUsage>
</MFCToolBarParameters>
<CommandManager>
<CommandsWithoutImages>0200FFFFFFFF2A8F0000</CommandsWithoutImages>
<MenuUserImages>06001B8F000004000000188F00000700000023920000000000001A8F00000A0000000084000048000000198F000001000000</MenuUserImages>
<CommandsWithoutImages>0000</CommandsWithoutImages>
<MenuUserImages>0000</MenuUserImages>
</CommandManager>
<Pane-59393>
<ID>0</ID>
@@ -124,9 +124,9 @@
</BasePane-59393>
<Pane--1>
<ID>4294967295</ID>
<RectRecentFloat>BC0000003703000067070000E8030000</RectRecentFloat>
<RectRecentDocked>00000000A5020000AB06000066030000</RectRecentDocked>
<RecentFrameAlignment>32768</RecentFrameAlignment>
<RectRecentFloat>00000000CC020000AB0600007D030000</RectRecentFloat>
<RectRecentDocked>00000000B5020000AB06000066030000</RectRecentDocked>
<RecentFrameAlignment>4096</RecentFrameAlignment>
<RecentRowIndex>0</RecentRowIndex>
<IsFloating>0</IsFloating>
<MRUWidth>32767</MRUWidth>
@@ -138,7 +138,7 @@
<Pane-34050>
<ID>34050</ID>
<RectRecentFloat>2201000030030000CD070000E1030000</RectRecentFloat>
<RectRecentDocked>04000000BD020000A70600004C030000</RectRecentDocked>
<RectRecentDocked>00000000C9020000AB06000066030000</RectRecentDocked>
<RecentFrameAlignment>32768</RecentFrameAlignment>
<RecentRowIndex>0</RecentRowIndex>
<IsFloating>0</IsFloating>
@@ -161,7 +161,7 @@
<Pane-34053>
<ID>34053</ID>
<RectRecentFloat>BC0000003703000067070000E8030000</RectRecentFloat>
<RectRecentDocked>04000000BD020000A70600004C030000</RectRecentDocked>
<RectRecentDocked>04000000CD020000A70600004C030000</RectRecentDocked>
<RecentFrameAlignment>32768</RecentFrameAlignment>
<RecentRowIndex>0</RecentRowIndex>
<IsFloating>0</IsFloating>
@@ -169,12 +169,12 @@
<PinState>0</PinState>
</Pane-34053>
<BasePane-34053>
<IsVisible>1</IsVisible>
<IsVisible>0</IsVisible>
</BasePane-34053>
<Pane-34054>
<ID>34054</ID>
<RectRecentFloat>2201000030030000CD070000E1030000</RectRecentFloat>
<RectRecentDocked>04000000BD020000A70600004C030000</RectRecentDocked>
<RectRecentDocked>04000000CD020000A70600004C030000</RectRecentDocked>
<RecentFrameAlignment>32768</RecentFrameAlignment>
<RecentRowIndex>0</RecentRowIndex>
<IsFloating>0</IsFloating>
@@ -182,21 +182,21 @@
<PinState>0</PinState>
</Pane-34054>
<BasePane-34054>
<IsVisible>1</IsVisible>
<IsVisible>0</IsVisible>
</BasePane-34054>
<IarPane-34054>
<ColumnWidth0>591</ColumnWidth0>
<ColumnWidth1>84</ColumnWidth1>
<ColumnWidth2>1014</ColumnWidth2>
<FilterLevel>2</FilterLevel>
<LiveFile></LiveFile>
<LiveFile />
<LiveLogEnabled>0</LiveLogEnabled>
<LiveFilterLevel>-1</LiveFilterLevel>
</IarPane-34054>
<Pane-34055>
<ID>34055</ID>
<RectRecentFloat>2201000030030000CD070000E1030000</RectRecentFloat>
<RectRecentDocked>04000000BD020000A70600001D030000</RectRecentDocked>
<RectRecentDocked>04000000CD020000A70600004C030000</RectRecentDocked>
<RecentFrameAlignment>32768</RecentFrameAlignment>
<RecentRowIndex>0</RecentRowIndex>
<IsFloating>0</IsFloating>
@@ -210,7 +210,7 @@
<Pane-34056>
<ID>34056</ID>
<RectRecentFloat>2201000030030000CD070000E1030000</RectRecentFloat>
<RectRecentDocked>04000000BD020000A70600001D030000</RectRecentDocked>
<RectRecentDocked>04000000CD020000A70600004C030000</RectRecentDocked>
<RecentFrameAlignment>32768</RecentFrameAlignment>
<RecentRowIndex>0</RecentRowIndex>
<IsFloating>0</IsFloating>
@@ -224,7 +224,7 @@
<Pane-34057>
<ID>34057</ID>
<RectRecentFloat>2201000030030000CD070000E1030000</RectRecentFloat>
<RectRecentDocked>04000000BD020000A70600001D030000</RectRecentDocked>
<RectRecentDocked>04000000CD020000A70600004C030000</RectRecentDocked>
<RecentFrameAlignment>32768</RecentFrameAlignment>
<RecentRowIndex>0</RecentRowIndex>
<IsFloating>0</IsFloating>
@@ -246,7 +246,7 @@
<Pane-34060>
<ID>34060</ID>
<RectRecentFloat>2201000030030000CD070000E1030000</RectRecentFloat>
<RectRecentDocked>04000000BD020000A70600001D030000</RectRecentDocked>
<RectRecentDocked>04000000CD020000A70600004C030000</RectRecentDocked>
<RecentFrameAlignment>32768</RecentFrameAlignment>
<RecentRowIndex>0</RecentRowIndex>
<IsFloating>0</IsFloating>
@@ -324,12 +324,12 @@
<RectRecentDocked>0000000032000000FE000000A1020000</RectRecentDocked>
<RecentFrameAlignment>4096</RecentFrameAlignment>
<RecentRowIndex>0</RecentRowIndex>
<IsFloating>0</IsFloating>
<IsFloating>1</IsFloating>
<MRUWidth>32767</MRUWidth>
<PinState>0</PinState>
</Pane-34061>
<BasePane-34061>
<IsVisible>1</IsVisible>
<IsVisible>0</IsVisible>
</BasePane-34061>
<Pane-34062>
<ID>34062</ID>
@@ -388,7 +388,7 @@
</BasePane-34065>
<IarPane-34065 />
<DockingManager-256>
<DockingPaneAndPaneDividers>0000000004000000000000000010000001000000FFFFFFFFFFFFFFFFFE0000003200000002010000A1020000010000000200001004000000010000000000000000000000000000000000000000000000010000000D8500000000000000000000000000000000000000000000010000000D850000010000000D850000000000000080000001000000FFFFFFFFFFFFFFFF00000000A1020000AB060000A50200000100000001000010040000000100000067FDFFFF50000000000000000000000000000000010000000000000000000000000000000100000000000000FFFFFFFF070000000585000002850000068500000785000008850000098500000C850000FFFF02000B004354616262656450616E650080000001000000BC0000003703000067070000E803000000000000A5020000AB06000066030000000000004080005607000000FFFEFF094400650062007500670020004C006F006700010000000585000001000000FFFFFFFFFFFFFFFFFFFEFF054200750069006C006400010000000285000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300010000000685000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300000000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000C85000001000000FFFFFFFFFFFFFFFF010000000000000001000000000000000000000001000000FFFFFFFF0000000019030000AB0600001D0300000000000001000000040000000000000000000000000000000000000000000000000000000000000001000000FFFFFFFF0585000001000000FFFFFFFF0585000006000000FFFF02001200434D756C746950616E654672616D65576E6400010084000000001700000022010000C8000000000000000F85000002000000000000000F85000000000000000000000000000000000000010000000F850000038000010084000000001700000022010000C8000000000000000E85000002000000000000000E85000000000000000000000000000000000000010000000E850000038000010084000000001700000080020000A80000000000000000000000020000000000000003850000000000000000000000000000000000000100000003850000038000010084000000001700000022010000C80000000000000000000000020000000000000004850000000000000000000000000000000000000100000004850000038000010084000000001700000022010000C8000000000000000000000002000000000000000A85000000000000000000000000000000000000010000000A850000038000010084000000001700000080020000A8000000000000000000000002000000000000000B85000000000000000000000000000000000000010000000B8500000000000000000000</DockingPaneAndPaneDividers>
<DockingPaneAndPaneDividers>0000000002000000000000000080000001000000FFFFFFFFFFFFFFFF00000000B1020000AB060000B5020000010000000100001004000000010000000000000000000000FFFFFFFF070000000285000005850000068500000785000008850000098500000C850000FFFF02000B004354616262656450616E65008000000100000000000000CC020000AB0600007D03000000000000B5020000AB06000066030000000000004080005607000000FFFEFF054200750069006C006400010000000285000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700000000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000685000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300000000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000C85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0285000001000000FFFFFFFF0285000007000000FFFF02001200434D756C746950616E654672616D65576E6400010084000000001700000022010000C8000000000000000000000002000000000000000E85000000000000000000000000000000000000010000000E850000038000010084000000001700000080020000A80000000000000000000000020000000000000003850000000000000000000000000000000000000100000003850000038000010084000000001700000022010000C8000000000000000000000002000000000000000F85000000000000000000000000000000000000010000000F850000038000010084000000001700000022010000C80000000000000000000000020000000000000004850000000000000000000000000000000000000100000004850000038000010084000000001700000022010000C8000000000000000000000002000000000000000A85000000000000000000000000000000000000010000000A850000038000010084000000001700000080020000A8000000000000000000000002000000000000000B85000000000000000000000000000000000000010000000B850000038000010084BB020000CD010000C10300002E030000000000000000000002000000000000000D85000000000000000000000000000000000000010000000D8500000000000000000000</DockingPaneAndPaneDividers>
</DockingManager-256>
<MFCToolBar-34048>
<Name>CMSIS-Pack</Name>
@@ -409,7 +409,7 @@
</BasePane-34048>
<MFCToolBar-34049>
<Name>Main</Name>
<Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000040038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000004003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000004003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000400FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000500FFFEFF104700500049004F0050007500500064005F005400790070006500440065006600FFFEFF0E500065006E006400530056002000480061006E0064006C0065007200FFFEFF0F5300790073005400690063006B005F00480061006E0064006C0065007200FFFEFF074200530050005F00430050005500FFFEFF0B4100700070005400690063006B0049006E00690074000000000000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000004003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000040041000000FFFEFF000000000000000000000000000100000001000000018002810000000004001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000040030000000FFFEFF000000000000000000000000000100000001000000018027810000000004002E000000FFFEFF000000000000000000000000000100000001000000018028810000000004002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000001F000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000020000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000</Buttons>
<Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000040038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000004003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000004003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000400FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000500FFFEFF104700500049004F0050007500500064005F005400790070006500440065006600FFFEFF0E500065006E006400530056002000480061006E0064006C0065007200FFFEFF0F5300790073005400690063006B005F00480061006E0064006C0065007200FFFEFF074200530050005F00430050005500FFFEFF0B4100700070005400690063006B0049006E00690074000000000000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000004003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000040041000000FFFEFF000000000000000000000000000100000001000000018002810000000004001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000040030000000FFFEFF000000000000000000000000000100000001000000018027810000000004002E000000FFFEFF000000000000000000000000000100000001000000018028810000000004002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000004001F000000FFFEFF00000000000000000000000000010000000100000001800D8100000000000021000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000020022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000</Buttons>
</MFCToolBar-34049>
<Pane-34049>
<ID>34049</ID>
@@ -427,7 +427,7 @@
</Desktop>
<MDIWindows>
<MDIClientArea-0>
<MDITabsState>010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000010000000000000001000000FFFEFF1B2400570053005F0044004900520024005C002E002E005C006D006F0064006200750073005C006D006F0064006200750073002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100300037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100300037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF086D006F0064006200750073002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000000201000049000000AB060000B8020000</MDITabsState>
<MDITabsState>010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000030000000000000001000000FFFEFF1B2400570053005F0044004900520024005C002E002E005C006D006F0064006200750073005C006D006F0064006200750073002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300300038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF086D006F0064006200750073002E00630000000000FFFFFFFFFFFFFFFFFFFEFF3264003A005C004900410052005F00500072006F006A006500630074005C0054007200610069006E00430061006D0070005F006600750062006F00770065006E005F004D006F0064006200750073005C006100700070005C006D00610069006E002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003400350038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003400350038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1F2400570053005F0044004900520024005C002E002E005C0075007300650072005C00730074006D003300320066003400780078005F00690074002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00390034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0033003600340037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0033003600340037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730074006D003300320066003400780078005F00690074002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000000000000049000000AB060000C8020000</MDITabsState>
</MDIClientArea-0>
</MDIWindows>
</WindowStorage>


+ 13
- 13
iar/settings/uCOS_Modbus.dnx 查看文件

@@ -18,13 +18,13 @@
<StLinkDriver>
<stlinkserialNo>30303031</stlinkserialNo>
<stlinkfoundProbes />
<stlinkResetStyle>0</stlinkResetStyle>
<stlinkResetStrategy>0</stlinkResetStrategy>
<CStepIntDis>_ 0</CStepIntDis>
<LeaveTargetRunning>_ 0</LeaveTargetRunning>
<stlinkResetStyle>0</stlinkResetStyle>
<stlinkResetStrategy>0</stlinkResetStrategy>
</StLinkDriver>
<DebugChecksum>
<Checksum>1307598136</Checksum>
<Checksum>1872421399</Checksum>
</DebugChecksum>
<Exceptions>
<StopOnUncaught>_ 0</StopOnUncaught>
@@ -120,6 +120,12 @@
<ShowTimeSum>1</ShowTimeSum>
<SumSortOrder>0</SumSortOrder>
</EventLog>
<DisassembleMode>
<mode>0</mode>
</DisassembleMode>
<Breakpoints2>
<Count>0</Count>
</Breakpoints2>
<TermIOLog>
<LoggingEnabled>_ 0</LoggingEnabled>
<LogFile>_ ""</LogFile>
@@ -129,6 +135,10 @@
<LogFile>_ ""</LogFile>
<Category>_ 0</Category>
</LogFile>
<Aliases>
<Count>0</Count>
<SuppressDialog>0</SuppressDialog>
</Aliases>
<DriverProfiling>
<Enabled>0</Enabled>
<Mode>3</Mode>
@@ -142,14 +152,4 @@
<CallStackStripe>
<ShowTiming>1</ShowTiming>
</CallStackStripe>
<DisassembleMode>
<mode>0</mode>
</DisassembleMode>
<Breakpoints2>
<Count>0</Count>
</Breakpoints2>
<Aliases>
<Count>0</Count>
<SuppressDialog>0</SuppressDialog>
</Aliases>
</settings>

+ 796
- 795
iar/uCOS_Modbus.dep
文件差异内容过多而无法显示
查看文件


+ 29
- 29
modbus/modbus.c 查看文件

@@ -8,7 +8,7 @@
uint8_t ModbusErr;
/*0x270F + 1 = K10000 */
uint8_t ModbusCoil[1250]; /*10000/8=1250*/
uint16_t ModbusReg[10000];
uint16_t ModbusReg[10001];

/*附加功能:页寄存器*/
uint16_t ModbusExtPage[1] = {0}; /*设置地址为0xFFFE*/
@@ -104,6 +104,8 @@ void AppTaskModbusParse (void *p_arg)
uint16_t rxLen;
uint8_t rxBuf[256];

ModbusReg[10000] = 123;

while(1)
{
/*无限期等待接收到数据帧信号量*/
@@ -303,7 +305,6 @@ uint8_t ModbusReadRegs(uint16_t addres, uint16_t num)
uint8_t readValH;
uint8_t readValL;
uint8_t dataLen;
uint32_t addresExt;

/*操作地址超限*/
if(addres > 0x270F || (addres + (num - 1)) > 0x270F)
@@ -317,20 +318,14 @@ uint8_t ModbusReadRegs(uint16_t addres, uint16_t num)
}

dataLen = num * 2;
if(ModbusExtPage[0] == 1)
if(ModbusExtPage[0] == 1 && addres == 0x0000)
{
addresExt = ((uint32_t)1 << 16) | addres;
/*将16位寄存器值拆分为两个8位*/
readValH = (uint8_t)(ModbusReg[10000] >> 8);
readValL = (uint8_t)(ModbusReg[10000] & 0x00FF);

for(uint16_t i = 0; i < num; i++)
{
index = 3 + (i * 2);
/*将16位寄存器值拆分为两个8位*/
readValH = (uint8_t)(ModbusReg[addresExt + i] >> 8);
readValL = (uint8_t)(ModbusReg[addresExt + i] & 0x00FF);

ModbusTxBuf[index] = readValH;
ModbusTxBuf[index + 1] = readValL;
}
ModbusTxBuf[3] = readValH;
ModbusTxBuf[4] = readValL;
}
else
{
@@ -368,7 +363,7 @@ uint8_t ModbusWriteRegs(uint16_t addres, uint16_t num, uint8_t *data)
{
if(addres == 0xFFFE && num == 1)
{
return ModbusWriteReg(addres, data);
;
}
else
{
@@ -381,16 +376,28 @@ uint8_t ModbusWriteRegs(uint16_t addres, uint16_t num, uint8_t *data)
return ModbusErrReply(0x10, ERR_DATA);
}

for(uint16_t i = 0; i < num; i++)
if(addres == 0xFFFE && num == 1)
{
index = i * 2;

writeValH = data[index];
writeValL = data[index + 1];
writeValH = data[0];
writeValL = data[1];
/*将要写入两个8位值拼接为16位*/
writeVal = ((uint16_t)writeValH << 8) | ((uint16_t)writeValL & 0x00FF);
ModbusReg[addres + i] = writeVal;
ModbusExtPage[0] = writeVal;
}
else
{
for(uint16_t i = 0; i < num; i++)
{
index = i * 2;

writeValH = data[index];
writeValL = data[index + 1];
/*将要写入两个8位值拼接为16位*/
writeVal = ((uint16_t)writeValH << 8) | ((uint16_t)writeValL & 0x00FF);
ModbusReg[addres + i] = writeVal;
}
}

ModbusTxBuf[0] = SLAVE_ADDRES;
@@ -467,14 +474,7 @@ uint8_t ModbusWriteReg(uint16_t addres, uint8_t *data)
/*操作地址超限*/
if(addres > 0x270F)
{
if(addres == 0xFFFE)
{
;
}
else
{
return ModbusErrReply(0x10, ERR_OPE_ADDRES);
}
return ModbusErrReply(0x10, ERR_OPE_ADDRES);
}

writeValH = data[0];


正在加载...
取消
保存