Diff: setup.cpp

Revision:

3:4fff62544119

Parent:

2:ca3d2395b6d3

Child:

4:80135cfbaeb7

--- a/setup.cpp	Tue Sep 11 09:34:54 2018 +0000
+++ b/setup.cpp	Fri Sep 14 13:58:59 2018 +0000
@@ -4,7 +4,7 @@
 #include "FlashIAP.h"
 
 // slaveID
-unsigned int slaveID = 0x07;
+//unsigned int slaveID = 0x07;
 // ondersteundende functie codes
 
 unsigned int functionID0x03 = 0x03;
@@ -32,9 +32,8 @@
 unsigned int dataSend[10] ; 
 unsigned int count = 0, count1 = 0, count2 = 0   ; 
 
-void modbus_configure(long baud, int _slaveID )
+void modbus_configure(long baud)
 {
-    slaveID = _slaveID;
     
     if (baud == 1000000 ){
         T1_5 = 1; 
@@ -71,10 +70,10 @@
 //            maxMessageTime.reset();  
 //        }
         int data = bus.getc(); 
-        if ( data == slaveID && buffer == 0 ) 
+        if ( data == allData->slaveID && buffer == 0 ) 
         {
 //            maxMessageTime.start();
-            dataReceived[buffer++] = slaveID ;   // slaveID checks out proceed to checking function ID 
+            dataReceived[buffer++] = allData->slaveID ;   // slaveID checks out proceed to checking function ID 
         }
         else if ( buffer == 1 )
         {
@@ -122,7 +121,7 @@
     static int temperatuur = 0, beweging = 0 ; //allData->temperatuur ; //0 ; //\, count1 = 0, count2 = 0   ; 
     temperatuur = allData->temperatuur ; 
     beweging = allData->beweging ; 
-    dataSend[maxData++] = slaveID ; 
+    dataSend[maxData++] = allData->slaveID ; 
     dataSend[maxData++] = dataReceived[1];
     if ( dataReceived[1] == 0x02 ) 
     {