Diff: setup.cpp

Revision:

4:80135cfbaeb7

Parent:

3:4fff62544119

Child:

5:6bafdac3cd5a

--- a/setup.cpp	Fri Sep 14 13:58:59 2018 +0000
+++ b/setup.cpp	Mon Sep 17 10:30:05 2018 +0000
@@ -3,18 +3,6 @@
 #include "ssd1306.h"
 #include "FlashIAP.h"
 
-// slaveID
-//unsigned int slaveID = 0x07;
-// ondersteundende functie codes
-
-unsigned int functionID0x03 = 0x03;
-unsigned int functionID0x05 = 0x05;
-unsigned int functionID0x02 = 0x02;
-
-//?
-int TimerEnd = 0 ; 
-char TxEnablePin = PA_8;
-
 //UART to RS485 bus line & enable of RS485
 Serial bus(PA_9,PA_10); //rx , tx
 DigitalOut activateSN65(PA_8);
@@ -22,46 +10,18 @@
 // Timer max message time
 Timer maxMessageTime ; 
 
-//?
-unsigned int T1;
-unsigned int T1_5; // inter character time out
-unsigned int T3_5; // frame delay
+// buffer message package
 unsigned static int buffer = 0;
 
 unsigned int dataReceived[10] ; 
 unsigned int dataSend[10] ; 
 unsigned int count = 0, count1 = 0, count2 = 0   ; 
-
-void modbus_configure(long baud)
-{
-    
-    if (baud == 1000000 ){
-        T1_5 = 1; 
-        T3_5 = 10;
-    }
-    else if (baud >= 115200 ){
-        T1_5 = 75; 
-        T3_5 = 175; 
-    }
-    else if (baud > 19200){
-        T1_5 = 750; 
-        T3_5 = 1750;
-    }
-    else {
-        T1_5 = 15000000/baud; // 1T * 1.5 = T1.5
-        T3_5 = 35000000/baud; // 1T * 3.5 = T3.5
-    }
-    T1 = 10000000/baud;
-//    maxMessageTime.reset();
-}
-
-
-
+static unsigned int maxSizeBuffer = 0 ; 
 
 int modbus_read(dataModbus *allData)
 {
     activateSN65 = 0 ;
-    static unsigned int maxSizeBuffer = 0 ; 
+
     if(bus.readable())
     {
 //        if( maxMessageTime.read_ms() > (int)180 )
@@ -118,7 +78,7 @@
 {
     int i = 0 ;
     int maxData = 0 ; 
-    static int temperatuur = 0, beweging = 0 ; //allData->temperatuur ; //0 ; //\, count1 = 0, count2 = 0   ; 
+    static int temperatuur = 0, beweging = 0 ; 
     temperatuur = allData->temperatuur ; 
     beweging = allData->beweging ; 
     dataSend[maxData++] = allData->slaveID ;