Merge pull request #1750 from shauew/patch-2

BernardXiong · web-flow · commit 830975f66da1 · 2018-08-30T12:58:56.000+08:00
Update portserial_m.c
diff --git a/components/net/freemodbus/port/portserial_m.c b/components/net/freemodbus/port/portserial_m.c
@@ -130,12 +130,16 @@ void vMBMasterPortSerialEnable(BOOL xRxEnable, BOOL xTxEnable)
         /* enable RX interrupt */
         serial->ops->control(serial, RT_DEVICE_CTRL_SET_INT, (void *)RT_DEVICE_FLAG_INT_RX);
         /* switch 485 to receive mode */
+#if defined(RT_MODBUS_MASTER_USE_CONTROL_PIN)
         rt_pin_write(MODBUS_MASTER_RT_CONTROL_PIN_INDEX, PIN_LOW);
+#endif
     }
     else
     {
         /* switch 485 to transmit mode */
+#if defined(RT_MODBUS_MASTER_USE_CONTROL_PIN)
         rt_pin_write(MODBUS_MASTER_RT_CONTROL_PIN_INDEX, PIN_HIGH);
+#endif
         /* disable RX interrupt */
         serial->ops->control(serial, RT_DEVICE_CTRL_CLR_INT, (void *)RT_DEVICE_FLAG_INT_RX);
     }

Original file line number	Diff line number	Diff line change
`@@ -130,12 +130,16 @@ void vMBMasterPortSerialEnable(BOOL xRxEnable, BOOL xTxEnable)`
`130`	`130`	`/* enable RX interrupt */`
`131`	`131`	`serial->ops->control(serial, RT_DEVICE_CTRL_SET_INT, (void *)RT_DEVICE_FLAG_INT_RX);`
`132`	`132`	`/* switch 485 to receive mode */`
	`133`	`+#if defined(RT_MODBUS_MASTER_USE_CONTROL_PIN)`
`133`	`134`	`rt_pin_write(MODBUS_MASTER_RT_CONTROL_PIN_INDEX, PIN_LOW);`
	`135`	`+#endif`
`134`	`136`	`}`
`135`	`137`	`else`
`136`	`138`	`{`
`137`	`139`	`/* switch 485 to transmit mode */`
	`140`	`+#if defined(RT_MODBUS_MASTER_USE_CONTROL_PIN)`
`138`	`141`	`rt_pin_write(MODBUS_MASTER_RT_CONTROL_PIN_INDEX, PIN_HIGH);`
	`142`	`+#endif`
`139`	`143`	`/* disable RX interrupt */`
`140`	`144`	`serial->ops->control(serial, RT_DEVICE_CTRL_CLR_INT, (void *)RT_DEVICE_FLAG_INT_RX);`
`141`	`145`	`}`