Diff: src/ModbusMaster/ModbusMaster.cpp

Revision:

57:5f18ae91c7c7

Parent:

54:ec1b03064bbd

Child:

67:49f266601d83

--- a/src/ModbusMaster/ModbusMaster.cpp	Wed Sep 14 12:56:00 2016 +0000
+++ b/src/ModbusMaster/ModbusMaster.cpp	Wed Sep 14 16:10:36 2016 +0000
@@ -26,7 +26,6 @@
     MbedJSONValue json_value;
     
     modbus_init(MB_BAUD_RATE);
-    osDelay(500);
     DigitalOut flu_power(PA_11);
     flu_power = 0; // provide power to the modbus
     printf("MODBUS INITIALIZED\r\n");
@@ -76,7 +75,7 @@
             for (iter = ModbusRegisterMap.begin(); iter != ModbusRegisterMap.end(); ++iter) {
                 logInfo("Reading node=%d, reg=%d, size=%d, order=%d", iter->second.node, iter->second.reg, iter->second.size, iter->second.order );
                 SendModbusCommand(iter->second.node, iter->second.reg, iter->second.size);
-                osDelay(30);
+                Thread::wait(30);
 
                 switch( iter->second.type ) {
                     case TYPE_32BIT_FLOAT:
@@ -115,7 +114,7 @@
             } else {
                 logInfo("No Mail");
             }
-            osDelay(5000);
+            Thread::wait(5000);
         }
     }
 }
@@ -150,8 +149,8 @@
 }
 
 RawSerial modbus(PA_2, PA_3);
-DigitalOut modbus_enable0(PB_0);
-DigitalOut modbus_enable1(PB_1);
+DigitalOut mod_de(PB_0);
+DigitalOut mod_re(PB_1);
 
 void modbus_init( uint16_t baudRate )
 {
@@ -191,15 +190,15 @@
     L1V[6] = modbus_crc(L1V,6) & 0xFF;
     L1V[7] = (modbus_crc(L1V,6)>>8) & 0xFF;
 
-    modbus_enable0 = 1;
-    modbus_enable1 = 1;
-
+    mod_de = 1;
+    mod_re = 1;
+    Thread::wait(1);
     for (uint8_t i = 0; i < 8; i++)
         modbus.putc(L1V[i]);
 
-    wait_ms(2);
-    modbus_enable0 = 0;
-    modbus_enable1 = 0;
+    Thread::wait(2);
+    mod_de = 0;
+    mod_re = 0;
 
 }