diff --git a/iar/settings/F407_uCOSii_Modbus.wsdt b/iar/settings/F407_uCOSii_Modbus.wsdt index 5a67f53..20047f6 100644 --- a/iar/settings/F407_uCOSii_Modbus.wsdt +++ b/iar/settings/F407_uCOSii_Modbus.wsdt @@ -62,7 +62,7 @@ 33054 0 33035 - 33037 + 33036 34399 0 33038 @@ -105,7 +105,7 @@ 1 1 1 - 2E0200001D001B8F0000010000001386000009000000108600009400000020810000010000000C810000050000000D80000002000000048600000200000056860000EF0000000084000001000000148100000100000030840000010000000E810000070000005E8600000B0000001F810000050000008E8600000100000000E10000010000000B81000001000000058400000100000069860000010000001486000003000000198F00000100000005810000010000000284000002000000118600004B00000000860000020000001084000006000000468100002E00000008860000020000005D86000004000000 + B60200001D001B8F000001000000138600000B00000010860000CE00000020810000010000000C810000020000000D800000020000000486000002000000568600001B0100000084000001000000148100000100000030840000010000000E810000010000005E8600000B0000001F8100000B0000008E8600000100000000E10000010000000B81000001000000058400000100000069860000010000001486000003000000198F00000100000005810000010000000284000002000000118600006800000000860000020000001084000006000000468100003400000008860000020000005D86000004000000 0000 @@ -135,12 +135,12 @@ 0 - 1 + 0 34050 2201000030030000CD070000E1030000 - 00000000C9020000AB06000066030000 + 04000000CD0200001E0100004C030000 32768 0 0 @@ -148,7 +148,7 @@ 0 - 1 + 0 21 @@ -163,7 +163,7 @@ 34053 BC0000003703000067070000E8030000 - 04000000CD020000A70600004C030000 + 00000000C9020000AB06000066030000 32768 0 0 @@ -176,7 +176,7 @@ 34054 2201000030030000CD070000E1030000 - 04000000CD020000A70600004C030000 + 00000000C9020000AB06000066030000 32768 0 0 @@ -198,7 +198,7 @@ 34055 2201000030030000CD070000E1030000 - 04000000CD020000A70600004C030000 + 00000000C9020000AB06000066030000 32768 0 0 @@ -212,7 +212,7 @@ 34056 2201000030030000CD070000E1030000 - 04000000CD020000A70600004C030000 + 00000000C9020000AB06000066030000 32768 0 0 @@ -226,7 +226,7 @@ 34057 2201000030030000CD070000E1030000 - 04000000CD020000A70600004C030000 + 00000000C9020000AB06000066030000 32768 0 0 @@ -248,7 +248,7 @@ 34060 2201000030030000CD070000E1030000 - 04000000CD020000A70600004C030000 + 00000000C9020000AB06000066030000 32768 0 0 @@ -390,7 +390,7 @@ - 0000000002000000000000000080000001000000FFFFFFFFFFFFFFFF00000000B1020000AB060000B5020000010000000100001004000000010000000000000000000000FFFFFFFF070000000285000005850000068500000785000008850000098500000C850000FFFF02000B004354616262656450616E65008000000100000000000000CC020000AB0600007D03000000000000B5020000AB06000066030000000000004080005607000000FFFEFF054200750069006C006400010000000285000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700000000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000685000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300000000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000C85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0285000001000000FFFFFFFF0285000007000000FFFF02001200434D756C746950616E654672616D65576E6400010084000000001700000022010000C8000000000000000000000002000000000000000E85000000000000000000000000000000000000010000000E850000038000010084000000001700000080020000A80000000000000000000000020000000000000003850000000000000000000000000000000000000100000003850000038000010084000000001700000022010000C8000000000000000000000002000000000000000F85000000000000000000000000000000000000010000000F850000038000010084000000001700000022010000C80000000000000000000000020000000000000004850000000000000000000000000000000000000100000004850000038000010084000000001700000022010000C8000000000000000000000002000000000000000A85000000000000000000000000000000000000010000000A850000038000010084000000001700000080020000A8000000000000000000000002000000000000000B85000000000000000000000000000000000000010000000B850000038000010084AC02000077010000B2030000D8020000000000000000000002000000000000000D85000000000000000000000000000000000000010000000D8500000000000000000000 + 0000000002000000000000000080000000000000FFFFFFFFFFFFFFFF00000000B1020000AB060000B5020000000000000100001004000000010000000000000000000000FFFFFFFF070000000285000005850000068500000785000008850000098500000C850000FFFF02000B004354616262656450616E65008000000000000000000000CC020000AB0600007D03000000000000B5020000AB06000066030000000000004080004607000000FFFEFF054200750069006C006400000000000285000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700000000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000685000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300000000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000C85000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF0285000001000000FFFFFFFF0285000007000000FFFF02001200434D756C746950616E654672616D65576E6400010084000000001700000022010000C8000000000000000E85000002000000000000000E85000000000000000000000000000000000000010000000E850000038000010084000000001700000080020000A80000000000000003850000020000000000000003850000000000000000000000000000000000000100000003850000038000010084000000001700000022010000C8000000000000000F85000002000000000000000F85000000000000000000000000000000000000010000000F850000038000010084000000001700000022010000C80000000000000004850000020000000000000004850000000000000000000000000000000000000100000004850000038000010084000000001700000022010000C8000000000000000A85000002000000000000000A85000000000000000000000000000000000000010000000A850000038000010084000000001700000080020000A8000000000000000B85000002000000000000000B85000000000000000000000000000000000000010000000B850000038000010084AC02000077010000B2030000D8020000000000000D85000002000000000000000D85000000000000000000000000000000000000010000000D8500000000000000000000 CMSIS-Pack @@ -411,7 +411,7 @@ Main - 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000040038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000004003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000004003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000400FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000500FFFEFF104700500049004F0050007500500064005F005400790070006500440065006600FFFEFF0E500065006E006400530056002000480061006E0064006C0065007200FFFEFF0F5300790073005400690063006B005F00480061006E0064006C0065007200FFFEFF074200530050005F00430050005500FFFEFF0B4100700070005400690063006B0049006E00690074000000000000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000004003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000040041000000FFFEFF000000000000000000000000000100000001000000018002810000000004001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000040030000000FFFEFF000000000000000000000000000100000001000000018027810000000004002E000000FFFEFF000000000000000000000000000100000001000000018028810000000004002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000004001F000000FFFEFF00000000000000000000000000010000000100000001800D8100000000000021000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000040022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000040023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000 + 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000000038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000000003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000500FFFEFF104700500049004F0050007500500064005F005400790070006500440065006600FFFEFF0E500065006E006400530056002000480061006E0064006C0065007200FFFEFF0F5300790073005400690063006B005F00480061006E0064006C0065007200FFFEFF074200530050005F00430050005500FFFEFF0B4100700070005400690063006B0049006E00690074000000000000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000000003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000000041000000FFFEFF000000000000000000000000000100000001000000018002810000000000001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000000030000000FFFEFF000000000000000000000000000100000001000000018027810000000000002E000000FFFEFF000000000000000000000000000100000001000000018028810000000000002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000004001F000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000020000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000 34049 @@ -429,7 +429,7 @@ - 010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000080000000500000001000000FFFEFF1B2400570053005F0044004900520024005C002E002E005C006D006F0064006200750073005C006D006F0064006200750073002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100370030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0035003900340033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0035003900340033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF086D006F0064006200750073002E00630000000000FFFFFFFFFFFFFFFFFFFEFF3264003A005C004900410052005F00500072006F006A006500630074005C0054007200610069006E00430061006D0070005F006600750062006F00770065006E005F004D006F0064006200750073005C006100700070005C006D00610069006E002E006300010000000180FFFEFF00FFFEFFFF25013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00310034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003900330037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003900330037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1F2400570053005F0044004900520024005C002E002E005C0075007300650072005C00730074006D003300320066003400780078005F00690074002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00390034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0033003600340037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0033003600340037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730074006D003300320066003400780078005F00690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF242400570053005F0044004900520024005C002E002E005C00750063006F0073005F00690069005C0073006F0075007200630065005C006F0073005F0063006F00720065002E006300010000000180FFFEFF00FFFEFFFF2B013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0031003700390037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00370036003900380032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00370036003900380032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF096F0073005F0063006F00720065002E00630000000000FFFFFFFFFFFFFFFFFFFEFF352400570053005F0044004900520024005C002E002E005C002E002E005C002E002E005C004900410052005C00610072006D005C0069006E0063005C0063005C0044004C00690062005F00500072006F0064007500630074005F0073007400720069006E0067002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00340031003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003500350030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003500350030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1A44004C00690062005F00500072006F0064007500630074005F0073007400720069006E0067002E00680020005B0052004F005D0000000000FFFFFFFFFFFFFFFFFFFEFF262400570053005F0044004900520024005C002E002E005C00750063006F0073005F00690069005C0070006F007200740073005C006F0073005F006300700075005F0061002E00610073006D00010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100340038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0036003400390038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0036003400390038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0C6F0073005F006300700075005F0061002E00610073006D0000000000FFFFFFFFFFFFFFFFFFFEFF212400570053005F0044004900520024005C002E002E005C006D006F0064006200750073005C006D006F0064006200750073005F0066006C006100730068002E006300010000000180FFFEFF00FFFEFFFF20013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E6D006F0064006200750073005F0066006C006100730068002E00630000000000FFFFFFFFFFFFFFFFFFFEFF4064003A005C004900410052005F00500072006F006A006500630074005C0054007200610069006E00430061006D0070005F006600750062006F00770065006E005F004D006F0064006200750073005C00750063006F0073005F00690069005C0070006F007200740073005C006F0073005F006300700075005F0063002E006300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100390034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0038003100380034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0038003100380034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6F0073005F006300700075005F0063002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000000000000049000000AB060000C8020000 + 010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000080000000100000001000000FFFEFF1B2400570053005F0044004900520024005C002E002E005C006D006F0064006200750073005C006D006F0064006200750073002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100360032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF086D006F0064006200750073002E00630000000000FFFFFFFFFFFFFFFFFFFEFF3264003A005C004900410052005F00500072006F006A006500630074005C0054007200610069006E00430061006D0070005F006600750062006F00770065006E005F004D006F0064006200750073005C006100700070005C006D00610069006E002E006300010000000180FFFEFF00FFFEFFFF25013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00310034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003900330037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003900330037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1F2400570053005F0044004900520024005C002E002E005C0075007300650072005C00730074006D003300320066003400780078005F00690074002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00390034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0033003600340037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0033003600340037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730074006D003300320066003400780078005F00690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF242400570053005F0044004900520024005C002E002E005C00750063006F0073005F00690069005C0073006F0075007200630065005C006F0073005F0063006F00720065002E006300010000000180FFFEFF00FFFEFFFF2B013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0031003700390037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00370036003900380032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00370036003900380032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF096F0073005F0063006F00720065002E00630000000000FFFFFFFFFFFFFFFFFFFEFF352400570053005F0044004900520024005C002E002E005C002E002E005C002E002E005C004900410052005C00610072006D005C0069006E0063005C0063005C0044004C00690062005F00500072006F0064007500630074005F0073007400720069006E0067002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00340031003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003500350030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003500350030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1A44004C00690062005F00500072006F0064007500630074005F0073007400720069006E0067002E00680020005B0052004F005D0000000000FFFFFFFFFFFFFFFFFFFEFF262400570053005F0044004900520024005C002E002E005C00750063006F0073005F00690069005C0070006F007200740073005C006F0073005F006300700075005F0061002E00610073006D00010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100340038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0036003500320033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0036003500320033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0C6F0073005F006300700075005F0061002E00610073006D0000000000FFFFFFFFFFFFFFFFFFFEFF212400570053005F0044004900520024005C002E002E005C006D006F0064006200750073005C006D006F0064006200750073005F0066006C006100730068002E006300010000000180FFFEFF00FFFEFFFF20013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E6D006F0064006200750073005F0066006C006100730068002E00630000000000FFFFFFFFFFFFFFFFFFFEFF4064003A005C004900410052005F00500072006F006A006500630074005C0054007200610069006E00430061006D0070005F006600750062006F00770065006E005F004D006F0064006200750073005C00750063006F0073005F00690069005C0070006F007200740073005C006F0073005F006300700075005F0063002E006300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100390034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0038003100380034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0038003100380034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6F0073005F006300700075005F0063002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000000000000049000000AB0600007D030000 diff --git a/iar/settings/uCOS_Modbus.dbgdt b/iar/settings/uCOS_Modbus.dbgdt index 871ba53..09c8214 100644 --- a/iar/settings/uCOS_Modbus.dbgdt +++ b/iar/settings/uCOS_Modbus.dbgdt @@ -153,7 +153,7 @@ 1 1 1 - 1F0200001D0013860000090000001B8F000001000000108600009100000020810000010000000D800000020000000C81000001000000048600000200000056860000EF0000001481000001000000008400000100000030840000010000001F810000050000005E8600000B0000000E810000010000000B8100000100000000E10000010000008E860000010000001486000003000000698600000100000005840000010000000086000002000000118600004A00000002840000020000000581000001000000198F000001000000468100002D00000010840000060000005D860000040000000886000002000000 + B80200001D001B8F000001000000138600000B00000010860000CF00000020810000010000000C810000020000000D800000020000000486000002000000568600001B0100000084000001000000148100000100000030840000010000000E810000010000005E8600000B0000001F8100000B0000008E8600000100000000E10000010000000B81000001000000058400000100000069860000010000001486000003000000198F00000100000005810000010000000284000002000000118600006800000000860000020000001084000006000000468100003500000008860000020000005D86000004000000 0400FFFFFFFF838600005886000004DC0000 @@ -625,12 +625,14 @@ ModbusRxBuf + ModbusCoil ModbusTxBuf + ModbusReg rxBuf 0 - 536900356 - 536900612 + 536903428 + 536903684 1 0 0 @@ -638,7 +640,7 @@ 0 0 0 - 33556267 + 33556459 34081 @@ -1012,6 +1014,8 @@ j i indexR + readVal + data diff --git a/iar/settings/uCOS_Modbus.dnx b/iar/settings/uCOS_Modbus.dnx index e253702..991ec0c 100644 --- a/iar/settings/uCOS_Modbus.dnx +++ b/iar/settings/uCOS_Modbus.dnx @@ -16,15 +16,15 @@ 1 - _ 0 - _ 0 - 0 - 0 30303031 + 0 + 0 + _ 0 + _ 0 - 4279408766 + 3595631932 _ 0 @@ -120,22 +120,15 @@ 1 0 - - 0 - - - _ 1 "EMUL_CODE" "{$PROJ_DIR$\..\modbus\modbus.c}.176.17" 0 0 1 "" 0 "" 0 - 1 - + + _ 0 + _ "" + _ 0 _ "" _ 0 - - 0 - 0 - 0 3 @@ -149,8 +142,14 @@ 1 - - _ 0 - _ "" - + + 0 + + + 0 + + + 0 + 0 + diff --git a/modbus/modbus.c b/modbus/modbus.c index ab75da2..c74a495 100644 --- a/modbus/modbus.c +++ b/modbus/modbus.c @@ -5,7 +5,7 @@ #include "modbus.h" extern OS_EVENT* ModbusWriteFlash; /*接收到modbus写入coil请求报文*/ -extern OS_EVENT* ModbusConnect; /*已接收到modbus正确报文*/ +extern OS_EVENT* ModbusConnect; /*已接收到modbus正确报文*/ uint8_t ModbusErr; /*0x270F + 1 = K10000 */ @@ -128,28 +128,30 @@ void AppTaskModbusParse (void *p_arg) rxLen = ModbusRxLen; memcpy(rxBuf, ModbusRxBuf, rxLen); - /*拼接crc校验码（高前低后），接收到的数据帧crc校验码是低前高后*/ + /*帧分解*/ frame.crc = ((uint16_t)(rxBuf[rxLen - 2])) | ((uint16_t)rxBuf[rxLen - 1] << 8); + frame.slaveAddres = rxBuf[0]; + frame.func = rxBuf[1]; + frame.opeAddres = ((uint16_t)rxBuf[2] << 8) | ((uint16_t)rxBuf[3]); + frame.opeNum = ((uint16_t)rxBuf[4] << 8) | ((uint16_t)rxBuf[5]); + + /*crc校验判断*/ if(ChcekCrc16(frame.crc, rxBuf, rxLen) != 0) { /*crc校验错误，直接丢弃*/ ModbusErr = ERR_CRC; continue; } - - frame.slaveAddres = rxBuf[0]; + /*从机地址判断*/ if(frame.slaveAddres != SLAVE_ADDRES) { /*从机地址错误，直接丢弃*/ ModbusErr = ERR_SLAVE_ADDRES; continue; } + /*释放正确接收信号量*/ OSSemPost(ModbusConnect); - frame.func = rxBuf[1]; - frame.opeAddres = ((uint16_t)rxBuf[2] << 8) | ((uint16_t)rxBuf[3]); - frame.opeNum = ((uint16_t)rxBuf[4] << 8) | ((uint16_t)rxBuf[5]); - /*功能码分类*/ switch(frame.func) { @@ -164,39 +166,23 @@ void AppTaskModbusParse (void *p_arg) case 0x0F:/*写多个线圈*/ frame.wNum = rxBuf[6]; memcpy(frame.wData, &rxBuf[7], frame.wNum); - ModbusErr = ModbusWriteCoils(frame.opeAddres, frame.opeNum, frame.wData); - if(ModbusErr == 0) - { - OSSemPost(ModbusWriteFlash); - } + ModbusErr = ModbusWriteCoils(frame.opeAddres, frame.opeNum, frame.wData); break; case 0x10:/*写多个寄存器*/ frame.wNum = rxBuf[6]; memcpy(frame.wData, &rxBuf[7], frame.wNum); ModbusErr = ModbusWriteRegs(frame.opeAddres, frame.opeNum, frame.wData); - if(ModbusErr == 0) - { - OSSemPost(ModbusWriteFlash); - } break; case 0x05:/*写单个线圈*/ memcpy(frame.wData, &rxBuf[4], 2); ModbusErr = ModbusWriteCoil(frame.opeAddres, frame.wData); - if(ModbusErr == 0) - { - OSSemPost(ModbusWriteFlash); - } break; case 0x06:/*写单个寄存器*/ memcpy(frame.wData, &rxBuf[4], 2); ModbusErr = ModbusWriteReg(frame.opeAddres, frame.wData); - if(ModbusErr == 0) - { - OSSemPost(ModbusWriteFlash); - } break; default:/*功能码错误*/ @@ -205,15 +191,19 @@ void AppTaskModbusParse (void *p_arg) break; } /*实现附加功能时不在这里启动发送*/ - if(frame.func == 0x03 && frame.opeAddres == 0XFFFF) - { - ; - } + if(frame.func == 0x03 && frame.opeAddres == 0XFFFF); else { - /*启动发送*/ ModbusSend(ModbusTxBuf, ModbusTxLen); } + + if(ModbusErr == 0 && (frame.func == 0x0F + || frame.func == 0x10 + || frame.func == 0x05 || frame.func == 0x06)) + { + /*释放写FLASH信号量*/ + OSSemPost(ModbusWriteFlash); + } } }