Pass Modbus RTS settings through new hardware layer settings struct

sungrean · Mar 17, 2024 · d38100e · d38100e
1 parent efad7ba
commit d38100e
Show file tree

Hide file tree

Showing 19 changed files with 45 additions and 24 deletions.
diff --git a/webserver/core/custom_layer.h b/webserver/core/custom_layer.h
@@ -6,6 +6,8 @@
 // in here by clicking on the "Restore Original Code" button above.
 //-----------------------------------------------------------------------------
 
+#include "custom_layer_options.h"
+
 //-----------------------------------------------------------------------------
 // These are the ignored I/O vectors. If you want to override how OpenPLC
 // handles a particular input or output, you must put them in the ignored

diff --git a/webserver/core/custom_layer_options.h b/webserver/core/custom_layer_options.h
@@ -0,0 +1,11 @@
+//-----------------------------------------------------------------------------
+// DISCLAIMER: EDDITING THIS FILE CAN BREAK YOUR OPENPLC RUNTIME! IF YOU DON'T
+// KNOW WHAT YOU'RE DOING, JUST DON'T DO IT. EDIT AT YOUR OWN RISK.
+//
+// PS: You can always restore original functionality if you broke something
+// in here by clicking on the "Restore Original Code" button above.
+//-----------------------------------------------------------------------------
+
+struct custom_layer_options {
+    uint8_t rpi_modbus_rts_pin;     // If <> 0, expect hardware RTS to be used with this pin
+};
diff --git a/webserver/core/hardware_layers/PiPLC.cpp b/webserver/core/hardware_layers/PiPLC.cpp
@@ -79,7 +79,7 @@ int analogOutBufferPinMask[MAX_ANALOG_OUT] = { 1, 24 };
 // This function is called by the main OpenPLC routine when it is initializing.
 // Hardware initialization procedures should be here.
 //-----------------------------------------------------------------------------
-void initializeHardware()
+void initializeHardware(custom_layer_options& customLayerOptions)
 {
 	wiringPiSetup();
 	//piHiPri(99);
@@ -108,9 +108,10 @@ void initializeHardware()
     		pinMode(analogOutBufferPinMask[i], PWM_OUTPUT);
 	}
 
-	// I²C?
+	// Modbus
+	customLayerOptions.rpi_modbus_rts_pin = MODBUS_RTS;
 
-	// Modbus?
+	// I²C?
 
 	// 1-Wire?
 }

diff --git a/webserver/core/hardware_layers/blank.cpp b/webserver/core/hardware_layers/blank.cpp
@@ -37,7 +37,7 @@
 // This function is called by the main OpenPLC routine when it is initializing.
 // Hardware initialization procedures should be here.
 //-----------------------------------------------------------------------------
-void initializeHardware()
+void initializeHardware(custom_layer_options& customLayerOptions)
 {
 }
 

diff --git a/webserver/core/hardware_layers/fischertechnik.cpp b/webserver/core/hardware_layers/fischertechnik.cpp
@@ -45,7 +45,7 @@ int serialFd; //serial file descriptor
 // This function is called by the main OpenPLC routine when it is initializing.
 // Hardware initialization procedures should be here.
 //-----------------------------------------------------------------------------
-void initializeHardware()
+void initializeHardware(custom_layer_options& customLayerOptions)
 {
 	wiringPiSetup();
 	//piHiPri(99);

diff --git a/webserver/core/hardware_layers/neuron.cpp b/webserver/core/hardware_layers/neuron.cpp
@@ -264,7 +264,7 @@ void searchForIO()
 // This function is called by the main OpenPLC routine when it is initializing.
 // Hardware initialization procedures should be here.
 //-----------------------------------------------------------------------------
-void initializeHardware()
+void initializeHardware(custom_layer_options& customLayerOptions)
 {
     searchForIO();
 }

diff --git a/webserver/core/hardware_layers/pixtend.cpp b/webserver/core/hardware_layers/pixtend.cpp
@@ -813,7 +813,7 @@ void *updateLocalBuffers(void *args)
 // This function is called by the main OpenPLC routine when it is initializing.
 // Hardware initialization procedures should be here.
 //-----------------------------------------------------------------------------
-void initializeHardware()
+void initializeHardware(custom_layer_options& customLayerOptions)
 {
 	Spi_Setup(0);
 	Spi_Setup(1);

diff --git a/webserver/core/hardware_layers/pixtend2l.cpp b/webserver/core/hardware_layers/pixtend2l.cpp
@@ -596,7 +596,7 @@ void *updateLocalBuffers(void *args)
 // This function is called by the main OpenPLC routine when it is initializing.
 // Hardware initialization procedures should be here.
 //-----------------------------------------------------------------------------
-void initializeHardware()
+void initializeHardware(custom_layer_options& customLayerOptions)
 {       
     Spi_SetupV2(0);
     Spi_SetupV2(1);

diff --git a/webserver/core/hardware_layers/pixtend2s.cpp b/webserver/core/hardware_layers/pixtend2s.cpp
@@ -533,7 +533,7 @@ void *updateLocalBuffers(void *args)
 // This function is called by the main OpenPLC routine when it is initializing.
 // Hardware initialization procedures should be here.
 //-----------------------------------------------------------------------------
-void initializeHardware()
+void initializeHardware(custom_layer_options& customLayerOptions)
 {       
     Spi_SetupV2(0);
     Spi_SetupV2(1);

diff --git a/webserver/core/hardware_layers/psm.cpp b/webserver/core/hardware_layers/psm.cpp
@@ -414,7 +414,7 @@ void kill_psm()
 // This function is called by the main OpenPLC routine when it is initializing.
 // Hardware initialization procedures should be here.
 //-----------------------------------------------------------------------------
-void initializeHardware()
+void initializeHardware(custom_layer_options& customLayerOptions)
 {
     //Verify if there is any old PSM running on the background and kill it
     if ((psm = connect_to_psm(0)) >= 0)

diff --git a/webserver/core/hardware_layers/raspberrypi.cpp b/webserver/core/hardware_layers/raspberrypi.cpp
@@ -65,7 +65,7 @@ int analogOutBufferPinMask[MAX_ANALOG_OUT] = { 18 };
 // This function is called by the main OpenPLC routine when it is initializing.
 // Hardware initialization procedures should be here.
 //-----------------------------------------------------------------------------
-void initializeHardware()
+void initializeHardware(custom_layer_options& customLayerOptions)
 {
 	gpioInitialise();
 	//piHiPri(99);

diff --git a/webserver/core/hardware_layers/raspberrypi_old.cpp b/webserver/core/hardware_layers/raspberrypi_old.cpp
@@ -66,7 +66,7 @@ int analogOutBufferPinMask[MAX_ANALOG_OUT] = { 1 };
 // This function is called by the main OpenPLC routine when it is initializing.
 // Hardware initialization procedures should be here.
 //-----------------------------------------------------------------------------
-void initializeHardware()
+void initializeHardware(custom_layer_options& customLayerOptions)
 {
 	wiringPiSetup();
 	//piHiPri(99);

diff --git a/webserver/core/hardware_layers/sequent.cpp b/webserver/core/hardware_layers/sequent.cpp
@@ -1665,7 +1665,7 @@ int mosfets8Set(uint8_t stack, uint8_t val)
 // This function is called by the main OpenPLC routine when it is initializing.
 // Hardware initialization procedures should be here.
 //-----------------------------------------------------------------------------
-void initializeHardware()
+void initializeHardware(custom_layer_options& customLayerOptions)
 {
 }
 

diff --git a/webserver/core/hardware_layers/simulink.cpp b/webserver/core/hardware_layers/simulink.cpp
@@ -162,7 +162,7 @@ void *exchangeData(void *arg)
 // This function is called by the main OpenPLC routine when it is initializing.
 // Hardware initialization procedures should be here.
 //-----------------------------------------------------------------------------
-void initializeHardware()
+void initializeHardware(custom_layer_options& customLayerOptions)
 {
 	pthread_t thread;
 	pthread_create(&thread, NULL, exchangeData, NULL);

diff --git a/webserver/core/hardware_layers/sl_rp4.cpp b/webserver/core/hardware_layers/sl_rp4.cpp
@@ -125,7 +125,7 @@ int16_t getSwitchId()
 // This function is called by the main OpenPLC routine when it is initializing.
 // Hardware initialization procedures should be here.
 //-----------------------------------------------------------------------------
-void initializeHardware()
+void initializeHardware(custom_layer_options& customLayerOptions)
 {
 }
 

diff --git a/webserver/core/hardware_layers/unipi.cpp b/webserver/core/hardware_layers/unipi.cpp
@@ -160,7 +160,7 @@ int mcp_adcRead(int chan)
 // This function is called by the main OpenPLC routine when it is initializing.
 // Hardware initialization procedures should be here.
 //-----------------------------------------------------------------------------
-void initializeHardware()
+void initializeHardware(custom_layer_options& customLayerOptions)
 {
 	wiringPiSetup();
 	mcp_adcSetup(0x68); //ADC I2C address configuration

diff --git a/webserver/core/ladder.h b/webserver/core/ladder.h
@@ -104,7 +104,7 @@ void glueVars();
 void updateTime();
 
 //hardware_layer.cpp
-void initializeHardware();
+void initializeHardware(custom_layer_options& customLayerOptions);
 void finalizeHardware();
 void updateBuffersIn();
 void updateBuffersOut();
@@ -155,7 +155,7 @@ int processEnipMessage(unsigned char *buffer, int buffer_size);
 uint16_t processPCCCMessage(unsigned char *buffer, int buffer_size);
 
 //modbus_master.cpp
-void initializeMB();
+void initializeMB(custom_layer_options& customLayerOptions);
 void *querySlaveDevices(void *arg);
 void updateBuffersIn_MB();
 void updateBuffersOut_MB();

diff --git a/webserver/core/main.cpp b/webserver/core/main.cpp
@@ -32,6 +32,7 @@
 
 #include "iec_types.h"
 #include "ladder.h"
+#include "custom_layer_options.h"
 #ifdef _ethercat_src
 #include "ethercat_src.h"
 #endif
@@ -264,8 +265,11 @@ int main(int argc,char **argv)
     type_logger_callback logger = logger_callback; 
     ethercat_configure("../utils/ethercat_src/build/ethercat.cfg", logger);
 #endif
-    initializeHardware();
-    initializeMB();
+    // Create layer options struct to pass settings between hardware layers and other init methods
+    custom_layer_options customLayerOptions;    
+
+    initializeHardware(customLayerOptions);
+    initializeMB(customLayerOptions);
     initCustomLayer();
     updateBuffersIn();
     updateCustomIn();

diff --git a/webserver/core/modbus_master.cpp b/webserver/core/modbus_master.cpp
@@ -610,7 +610,7 @@ void *querySlaveDevices(void *arg)
 // This function is called by the main OpenPLC routine when it is initializing.
 // Modbus master initialization procedures are here.
 //-----------------------------------------------------------------------------
-void initializeMB()
+void initializeMB(custom_layer_options& customLayerOptions)
 {
     parseConfig();
 
@@ -649,9 +649,12 @@ void initializeMB()
                                                 mb_devices[i].rtu_parity, mb_devices[i].rtu_data_bit,
                                                 mb_devices[i].rtu_stop_bit);
 
-                modbus_enable_rpi(mb_devices[i].mb_ctx,TRUE);
-                modbus_configure_rpi_bcm_pin(mb_devices[i].mb_ctx,6);
-                modbus_rpi_pin_export_direction(mb_devices[i].mb_ctx);
+                // If hardware layer set modbus_rts_pin, enable Pi specific rts handling handling
+                if (customLayerOptions.rpi_modbus_rts_pin != 0) {
+                    modbus_enable_rpi(mb_devices[i].mb_ctx,TRUE);
+                    modbus_configure_rpi_bcm_pin(mb_devices[i].mb_ctx,customLayerOptions.rpi_modbus_rts_pin;
+                    modbus_rpi_pin_export_direction(mb_devices[i].mb_ctx);
+                }
             }
         }