Improved Slave Devices code

zhb2024 · Nov 12, 2018 · d2c33ba · d2c33ba
1 parent 13455c7
commit d2c33ba
Show file tree

Hide file tree

Showing 3 changed files with 215 additions and 155 deletions.
diff --git a/webserver/core/ladder.h b/webserver/core/ladder.h
@@ -134,7 +134,7 @@ void mapUnusedIO();
 
 //modbus_master.cpp
 void initializeMB();
-void querySlaveDevices();
+void *querySlaveDevices(void *arg);
 void updateBuffersIn_MB();
 void updateBuffersOut_MB();
 

diff --git a/webserver/core/main.cpp b/webserver/core/main.cpp
@@ -155,7 +155,7 @@ void disableOutputs()
 //-----------------------------------------------------------------------------
 void handleSpecialFunctions()
 {
-    //current time
+    //current time [%ML1024]
     struct tm *current_time;
     time_t rawtime;
 
@@ -168,9 +168,12 @@ void handleSpecialFunctions()
 
     if (special_functions[0] != NULL) *special_functions[0] = rawtime;
 
-    //number of cycles
+    //number of cycles [%ML1025]
     cycle_counter++;
     if (special_functions[1] != NULL) *special_functions[1] = cycle_counter;
+
+    //comm error counter [%ML1026]
+    /* Implemented in modbus_master.cpp */
 
     //insert other special functions below
 }
@@ -252,8 +255,6 @@ int main(int argc,char **argv)
 		//attached to the user variables
 		glueVars();
 
-        querySlaveDevices(); //query data from all slave devices
-
 		updateBuffersIn(); //read input image
 
 		pthread_mutex_lock(&bufferLock); //lock mutex