Rtop 100 opc ua

core/src/CMakeLists.txt

@@ -39,6 +39,7 @@ add_executable(plc_main
     ${CMAKE_SOURCE_DIR}/core/src/plc_app/scan_cycle_manager.c
     ${CMAKE_SOURCE_DIR}/core/src/drivers/plugin_driver.c
     ${CMAKE_SOURCE_DIR}/core/src/drivers/plugin_config.c
+    ${CMAKE_SOURCE_DIR}/core/src/drivers/plugin_utils.c
     ${CMAKE_SOURCE_DIR}/core/src/plc_app/unix_socket.c
     ${CMAKE_SOURCE_DIR}/core/src/plc_app/debug_handler.c
 )

core/src/drivers/plugin_driver.c

@@ -17,6 +17,7 @@
 #include "../plc_app/utils/log.h"
 #include "plugin_config.h"
 #include "plugin_driver.h"
+#include "plugin_utils.h"
 #include <dlfcn.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -439,10 +440,19 @@ int plugin_driver_stop(plugin_driver_t *driver)
     // Signal all plugins to stop
     for (int i = 0; i < driver->plugin_count; i++)
     {
+        plugin_instance_t *plugin = &driver->plugins[i];
+
+        // Skip disabled plugins
+        if (!plugin->config.enabled)
+        {
+            printf("[PLUGIN]: Skipping disabled plugin during stop: %s\n", plugin->config.name);
+            continue;
+        }
+
         printf("[PLUGIN]: Stopping plugin %d/%d: %s\n", i + 1, driver->plugin_count,
                driver->plugins[i].config.name);
-        if (driver->plugins[i].python_plugin && driver->plugins[i].python_plugin->pFuncStop &&
-            driver->plugins[i].running)
+        if (plugin->python_plugin && plugin->python_plugin->pFuncStop &&
+            plugin->running)
         {
             plugin_instance_t *plugin = &driver->plugins[i];
             if (plugin->config.enabled == 0)
@@ -466,10 +476,9 @@ int plugin_driver_stop(plugin_driver_t *driver)
             plugin->running = 0;
         }
 
-        else if (driver->plugins[i].native_plugin && driver->plugins[i].native_plugin->stop &&
-                 driver->plugins[i].running)
+        else if (plugin->native_plugin && plugin->native_plugin->stop &&
+                 plugin->running)
         {
-            plugin_instance_t *plugin = &driver->plugins[i];
             plugin->native_plugin->stop();
             printf("[PLUGIN]: Native plugin %s stopped successfully.\n", plugin->config.name);
             plugin->running = 0;
@@ -649,6 +658,9 @@ void *generate_structured_args_with_driver(plugin_type_t type, plugin_driver_t *
     // Initialize mutex functions
     args->mutex_take = plugin_mutex_take;
     args->mutex_give = plugin_mutex_give;
+    args->get_var_list = get_var_list;
+    args->get_var_size = get_var_size;
+    args->get_var_count = get_var_count;
     // Set buffer mutex from driver
     args->buffer_mutex = &driver->buffer_mutex;
 
@@ -1052,9 +1064,8 @@ void plugin_driver_cycle_end(plugin_driver_t *driver)
 // Cleanup Python plugin
 static void python_plugin_cleanup(plugin_instance_t *plugin)
 {
-    (void)plugin; // Suppress unused parameter warning
     // Cleanup Python resources
-    if (plugin && plugin->python_plugin)
+    if (plugin && plugin->python_plugin && plugin->config.enabled)
     {
         // Call cleanup function if available
         if (plugin->python_plugin->pFuncCleanup)

core/src/drivers/plugin_types.h

@@ -17,6 +17,7 @@
 
 #include "../lib/iec_types.h"
 #include <pthread.h>
+#include <stdint.h>
 
 /**
  * @brief Logging function pointer types
@@ -67,6 +68,11 @@ typedef struct
     int (*mutex_give)(pthread_mutex_t *mutex);
     pthread_mutex_t *buffer_mutex;
 
+    /* Variable access functions */
+    void (*get_var_list)(size_t num_vars, size_t *indexes, void **result);
+    size_t (*get_var_size)(size_t idx);
+    uint16_t (*get_var_count)(void);
+
     /* Plugin configuration */
     char plugin_specific_config_file_path[256];
 

core/src/drivers/plugin_utils.c

@@ -0,0 +1,28 @@
+#include "plugin_utils.h"
+#include "../plc_app/image_tables.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+// Wrapper function to get list of variable addresses
+void get_var_list(size_t num_vars, size_t *indexes, void **result)
+{
+    for (size_t i = 0; i < num_vars; i++) {
+        size_t idx = indexes[i];
+        if (idx >= ext_get_var_count()) {
+            result[i] = NULL;
+        } else {
+            result[i] = ext_get_var_addr(idx);
+        }
+    }
+}
+
+size_t get_var_size(size_t idx)
+{
+    return ext_get_var_size(idx);
+}
+
+uint16_t get_var_count(void)
+{
+    return ext_get_var_count();
+}

core/src/drivers/plugin_utils.h

@@ -0,0 +1,11 @@
+#ifndef PLUGIN_UTILS_H
+#define PLUGIN_UTILS_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+void get_var_list(size_t num_vars, size_t *indexes, void **result);
+size_t get_var_size(size_t idx);
+uint16_t get_var_count(void);
+
+#endif // PLUGIN_UTILS_H