修改定时器定时时间#define

app/inc/hardware.h

@@ -3,7 +3,20 @@
 
 #include"modbus_parse.h"
 
-#define MODBUS_IDLE_TO_T35_US      1664U     /*1664=1750-86*/
+#if (MODBUS_USART_BAUDRATE > 19200U)
+
+/*固定等待1750us，再减去IDLE中断等待的1个字符时间*/
+#define MODBUS_IDLE_TO_T35_US \
+            ((1750UL * MODBUS_USART_BAUDRATE - 10000000UL + MODBUS_USART_BAUDRATE - 1UL) / MODBUS_USART_BAUDRATE)
+
+#else
+
+/*IDLE中断已经过了1个字符的时间，还需等待2.5个字符*/
+#define MODBUS_IDLE_TO_T35_US \
+            ((25000000UL + MODBUS_USART_BAUDRATE - 1UL) / MODBUS_USART_BAUDRATE)
+
+#endif
+
 
 extern uint8_t ModbusRxBuf[MODBUS_RX_BUF_SIZE];
 extern uint8_t ModbusTxBuf[MODBUS_TX_BUF_SIZE];

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>
@@ -92,7 +92,7 @@
                 <ColumnWidth0>36</ColumnWidth0>
                 <ColumnWidth1>1638</ColumnWidth1>
                 <FilterLevel>2</FilterLevel>
-                <LiveFile></LiveFile>
+                <LiveFile />
                 <LiveLogEnabled>0</LiveLogEnabled>
                 <LiveFilterLevel>-1</LiveFilterLevel>
             </IarPane-34053>
@@ -108,11 +108,11 @@
                 <RecentlyUsedMenus>1</RecentlyUsedMenus>
                 <MenuShadows>1</MenuShadows>
                 <ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>
-                <CommandsUsage>C70200001D001B8F000001000000138600000B00000010860000D600000020810000010000000C810000020000000D800000020000000486000002000000568600001B0100000084000001000000148100000100000030840000010000000E810000030000005E8600000B0000001F8100000C0000008E8600000100000000E10000010000000B81000001000000058400000100000069860000010000001486000003000000198F00000100000005810000010000000284000002000000118600006C00000000860000020000001084000006000000468100003600000008860000020000005D86000004000000</CommandsUsage>
+                <CommandsUsage>C80200001D00138600000B0000001B8F00000100000010860000D600000020810000010000000D800000020000000C810000020000000486000002000000568600001B0100001481000001000000008400000100000030840000010000001F8100000C0000005E8600000B0000000E810000040000000B8100000100000000E10000010000008E860000010000001486000003000000698600000100000005840000010000000086000002000000118600006C00000002840000020000000581000001000000198F000001000000468100003600000010840000060000005D860000040000000886000002000000</CommandsUsage>
             </MFCToolBarParameters>
             <CommandManager>
                 <CommandsWithoutImages>24007784000007840000FFFFFFFF808C000044D500002AE10000008200001C820000018200006786000021DE000026DE000028DE000024DE000027DE000025DE00002092000028920000299200003792000038920000259200001E9200001D9200000C84000033840000788400001184000008800000098000000A8000000B8000000C800000158000000A81000001E80000</CommandsWithoutImages>
-                <MenuUserImages>3600048400004C000000048100001C0000002CE10000430000001581000025000000239200000000000007E100003B00000031840000530000005F8600003400000004E1000039000000208100002B0000000F8100002300000023E100003D00000001E10000360000000D800000170000000C81000020000000098100001E0000001982000015000000068400004E00000016820000130000004A810000470000001781000027000000038400004B00000000840000480000002BE1000042000000148100002400000000810000190000000E8400005000000030840000520000002F8200001600000025E100003F00000003E10000380000001F8100002A0000000E810000220000002D9200000F00000022E100003C00000000E10000350000000B8100001F000000188200001400000041E1000045000000D18400000C000000058400004D000000058100001D00000049810000460000001681000026000000028400004A0000001084000051000000328400005400000005E100003A000000518400005600000035E100004400000002E10000370000000A8400004F0000000D810000210000002C9200000E000000</MenuUserImages>
+                <MenuUserImages>3600048400004C00000015810000250000002CE1000043000000048100001C000000318400005300000007E100003B00000023920000000000000F81000023000000208100002B00000004E10000390000005F860000340000000C810000200000000D8000001700000001E100003600000023E100003D000000068400004E0000001982000015000000098100001E000000038400004B00000017810000270000004A81000047000000168200001300000014810000240000002BE1000042000000008400004800000030840000520000000E8400005000000000810000190000000E810000220000001F8100002A00000003E100003800000025E100003F0000002F820000160000000B8100001F00000000E100003500000022E100003C0000002D9200000F000000058400004D000000D18400000C00000041E10000450000001882000014000000028400004A00000016810000260000004981000046000000058100001D00000032840000540000001084000051000000518400005600000005E100003A0000000D810000210000000A8400004F00000002E100003700000035E10000440000002C9200000E000000</MenuUserImages>
             </CommandManager>
             <Pane-59393>
                 <ID>0</ID>
@@ -143,7 +143,7 @@
             <Pane-34050>
                 <ID>34050</ID>
                 <RectRecentFloat>2201000030030000CD070000E1030000</RectRecentFloat>
-                <RectRecentDocked>00000000C9020000AB06000066030000</RectRecentDocked>
+                <RectRecentDocked>04000000CD020000A70600004C030000</RectRecentDocked>
                 <RecentFrameAlignment>32768</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -174,7 +174,7 @@
                 <PinState>0</PinState>
             </Pane-34053>
             <BasePane-34053>
-                <IsVisible>0</IsVisible>
+                <IsVisible>1</IsVisible>
             </BasePane-34053>
             <Pane-34054>
                 <ID>34054</ID>
@@ -393,7 +393,7 @@
             </BasePane-34065>
             <IarPane-34065 />
             <DockingManager-256>
-                <DockingPaneAndPaneDividers>0000000002000000000000000080000001000000FFFFFFFFFFFFFFFF00000000B1020000AB060000B5020000010000000100001004000000010000000000000000000000FFFFFFFF070000000285000005850000068500000785000008850000098500000C850000FFFF02000B004354616262656450616E65008000000100000000000000CC020000AB0600007D03000000000000B5020000AB06000066030000000000004080005607000000FFFEFF054200750069006C006400010000000285000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700000000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000685000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300000000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000C85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0285000001000000FFFFFFFF0285000007000000FFFF02001200434D756C746950616E654672616D65576E6400010084000000001700000022010000C8000000000000000000000002000000000000000E85000000000000000000000000000000000000010000000E850000038000010084000000001700000080020000A80000000000000000000000020000000000000003850000000000000000000000000000000000000100000003850000038000010084000000001700000022010000C8000000000000000000000002000000000000000F85000000000000000000000000000000000000010000000F850000038000010084000000001700000022010000C80000000000000000000000020000000000000004850000000000000000000000000000000000000100000004850000038000010084000000001700000022010000C8000000000000000000000002000000000000000A85000000000000000000000000000000000000010000000A850000038000010084000000001700000080020000A8000000000000000000000002000000000000000B85000000000000000000000000000000000000010000000B850000038000010084CC02000074010000D2030000D5020000000000000000000002000000000000000D85000000000000000000000000000000000000010000000D8500000000000000000000</DockingPaneAndPaneDividers>
+                <DockingPaneAndPaneDividers>0000000002000000000000000080000001000000FFFFFFFFFFFFFFFF00000000B1020000AB060000B5020000010000000100001004000000010000000000000000000000FFFFFFFF070000000285000005850000068500000785000008850000098500000C850000FFFF02000B004354616262656450616E65008000000100000000000000CC020000AB0600007D03000000000000B5020000AB06000066030000000000004080005607000000FFFEFF054200750069006C006400010000000285000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000685000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300000000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000C85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0285000001000000FFFFFFFF0285000007000000FFFF02001200434D756C746950616E654672616D65576E6400010084000000001700000022010000C8000000000000000000000002000000000000000E85000000000000000000000000000000000000010000000E850000038000010084000000001700000080020000A80000000000000000000000020000000000000003850000000000000000000000000000000000000100000003850000038000010084000000001700000022010000C8000000000000000000000002000000000000000F85000000000000000000000000000000000000010000000F850000038000010084000000001700000022010000C80000000000000000000000020000000000000004850000000000000000000000000000000000000100000004850000038000010084000000001700000022010000C8000000000000000000000002000000000000000A85000000000000000000000000000000000000010000000A850000038000010084000000001700000080020000A8000000000000000000000002000000000000000B85000000000000000000000000000000000000010000000B850000038000010084CC02000074010000D2030000D5020000000000000000000002000000000000000D85000000000000000000000000000000000000010000000D8500000000000000000000</DockingPaneAndPaneDividers>
             </DockingManager-256>
             <MFCToolBar-34048>
                 <Name>CMSIS-Pack</Name>
@@ -414,7 +414,7 @@
             </BasePane-34048>
             <MFCToolBar-34049>
                 <Name>Main</Name>
-                <Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000000038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000000003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000500FFFEFF104700500049004F0050007500500064005F005400790070006500440065006600FFFEFF0E500065006E006400530056002000480061006E0064006C0065007200FFFEFF0F5300790073005400690063006B005F00480061006E0064006C0065007200FFFEFF074200530050005F00430050005500FFFEFF0B4100700070005400690063006B0049006E00690074000000000000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000000003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000000041000000FFFEFF000000000000000000000000000100000001000000018002810000000000001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000000030000000FFFEFF000000000000000000000000000100000001000000018027810000000000002E000000FFFEFF000000000000000000000000000100000001000000018028810000000000002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000001F000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000020000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000</Buttons>
+                <Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000040038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000004003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000004003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000400FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000500FFFEFF104700500049004F0050007500500064005F005400790070006500440065006600FFFEFF0E500065006E006400530056002000480061006E0064006C0065007200FFFEFF0F5300790073005400690063006B005F00480061006E0064006C0065007200FFFEFF074200530050005F00430050005500FFFEFF0B4100700070005400690063006B0049006E00690074000000000000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000004003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000040041000000FFFEFF000000000000000000000000000100000001000000018002810000000004001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000040030000000FFFEFF000000000000000000000000000100000001000000018027810000000004002E000000FFFEFF000000000000000000000000000100000001000000018028810000000004002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000004001F000000FFFEFF00000000000000000000000000010000000100000001800D8100000000000021000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000020022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000</Buttons>
             </MFCToolBar-34049>
             <Pane-34049>
                 <ID>34049</ID>

iar/settings/uCOS_Modbus.dnx

@@ -16,15 +16,15 @@
         <ShowSource>1</ShowSource>
     </Trace1>
     <StLinkDriver>
-        <stlinkserialNo>30303031</stlinkserialNo>
-        <stlinkfoundProbes />
         <stlinkResetStyle>0</stlinkResetStyle>
         <stlinkResetStrategy>0</stlinkResetStrategy>
         <CStepIntDis>_ 0</CStepIntDis>
         <LeaveTargetRunning>_ 0</LeaveTargetRunning>
+        <stlinkserialNo>24230357</stlinkserialNo>
+        <stlinkfoundProbes />
     </StLinkDriver>
     <DebugChecksum>
-        <Checksum>363296300</Checksum>
+        <Checksum>2912698606</Checksum>
     </DebugChecksum>
     <Exceptions>
         <StopOnUncaught>_ 0</StopOnUncaught>
@@ -120,10 +120,6 @@
         <ShowTimeSum>1</ShowTimeSum>
         <SumSortOrder>0</SumSortOrder>
     </EventLog>
-    <TermIOLog>
-        <LoggingEnabled>_ 0</LoggingEnabled>
-        <LogFile>_ ""</LogFile>
-    </TermIOLog>
     <LogFile>
         <LoggingEnabled>_ 0</LoggingEnabled>
         <LogFile>_ ""</LogFile>
@@ -153,4 +149,8 @@
         <Count>0</Count>
         <SuppressDialog>0</SuppressDialog>
     </Aliases>
+    <TermIOLog>
+        <LoggingEnabled>_ 0</LoggingEnabled>
+        <LogFile>_ ""</LogFile>
+    </TermIOLog>
 </settings>

modbus/modbus_parse.h

@@ -10,7 +10,7 @@
 #define MODBUS_TX_BUF_SIZE  256
 
 /*modbus通信波特率*/
-#define MODBUS_USART_BAUDRATE 115200
+#define MODBUS_USART_BAUDRATE 115200UL
 
 /*从机地址*/
 #define SLAVE_ADDRES   0x01