diff --git a/default_plugins.json b/default_plugins.json index 49c79633..ce8981b9 100644 --- a/default_plugins.json +++ b/default_plugins.json @@ -1,34 +1,9 @@ { "plugins": [ "libplugin-mqtt.so", - "libplugin-sparkplugb.so", - "libplugin-websocket.so", "libplugin-ekuiper.so", "libplugin-monitor.so", "libplugin-modbus-tcp-comm.so", - "libplugin-modbus-tcp.so", - "libplugin-modbus-rtu.so", - "libplugin-modbus-qh-tcp.so", - "libplugin-opcua.so", - "libplugin-EtherNet-IP.so", - "libplugin-Profinet.so", - "libplugin-qna3e.so", - "libplugin-a1e.so", - "libplugin-s7comm.so", - "libplugin-s7comm-for-300.so", - "libplugin-s5fetch-write.so", - "libplugin-fins-tcp.so", - "libplugin-ads.so", - "libplugin-df1.so", - "libplugin-iec104.so", - "libplugin-iec61850.so", - "libplugin-dlt645-2007.so", - "libplugin-bacnet.so", - "libplugin-knx.so", - "libplugin-focas.so", - "libplugin-HJ212.so", - "libplugin-nona11.so", - "libplugin-license-server.so", "libplugin-file.so" ] } \ No newline at end of file diff --git a/extern/uthash b/extern/uthash deleted file mode 160000 index 44a66fe8..00000000 --- a/extern/uthash +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 44a66fe8e008c0a7f1c5af96f4a4cdf304b8bc81 diff --git a/src/adapter/adapter_info.h b/include/neuron/adapter_info.h similarity index 100% rename from src/adapter/adapter_info.h rename to include/neuron/adapter_info.h diff --git a/include/neuron/persist/persist.h b/include/neuron/persist/persist.h index 411cdfd4..b09e9710 100644 --- a/include/neuron/persist/persist.h +++ b/include/neuron/persist/persist.h @@ -24,7 +24,9 @@ extern "C" { #endif -#include "adapter/adapter_info.h" +#include + +#include "adapter_info.h" #include "persist/json/persist_json_plugin.h" typedef neu_json_plugin_req_plugin_t neu_persist_plugin_info_t; @@ -92,6 +94,8 @@ int neu_persister_create(const char *schema_dir); */ void neu_persister_destroy(); +sqlite3 *neu_persister_get_db(); + /** * Persist nodes. * @param node_info neu_persist_node_info_t. diff --git a/src/core/manager_internal.c b/src/core/manager_internal.c index 6a386b2f..54fad043 100644 --- a/src/core/manager_internal.c +++ b/src/core/manager_internal.c @@ -67,8 +67,8 @@ int neu_manager_add_node(neu_manager_t *manager, const char *node_name, return NEU_ERR_NODE_EXIST; } - ret = neu_plugin_manager_create_instance(manager->plugin_manager, - plugin_name, &instance); + ret = neu_plugin_manager_create_instance(manager->plugin_manager, info.name, + &instance); if (ret != 0) { return NEU_ERR_LIBRARY_FAILED_TO_OPEN; } diff --git a/src/core/plugin_manager.c b/src/core/plugin_manager.c index d735c548..c008b531 100644 --- a/src/core/plugin_manager.c +++ b/src/core/plugin_manager.c @@ -242,19 +242,19 @@ int neu_plugin_manager_find(neu_plugin_manager_t *mgr, const char *plugin_name, static const plugin_name_t name[] = { { "mqtt", "MQTT" }, { "ekuiper", "eKuiper" }, - { "modbus-tcp", "Modbus TCP" }, + { "modbus-tcp", "Modbus TCP community" }, { "a1e", "Mitsubishi 1E" }, { "ads", "Beckhoff ADS" }, { "bacnet", "BACnet/IP" }, { "dlt645", "DLT645-2007" }, { "EtherNet-IP", "EtherNet/IP(CIP)" }, - { "fins", "Omron FINS" }, + { "fins", "Omron FINS TCP" }, { "focas", "Fanuc Focas Ethernet" }, { "iec104", "IEC60870-5-104" }, { "knx", "KNXnet/IP" }, { "modbus-qh-tcp", "Modbus TCP QH" }, { "modbus-rtu", "Modbus RTU" }, - { "modbus-plus-tcp", "Modbus TCP Advance" }, + { "modbus-plus-tcp", "Modbus TCP" }, { "nona11", "NON A11" }, { "opcua", "OPC UA" }, { "qna3e", "Mitsubishi 3E" }, diff --git a/src/persist/persist.c b/src/persist/persist.c index c003b67e..1cbc60c2 100644 --- a/src/persist/persist.c +++ b/src/persist/persist.c @@ -465,6 +465,11 @@ int neu_persister_create(const char *schema_dir) return 0; } +sqlite3 *neu_persister_get_db() +{ + return global_db; +} + void neu_persister_destroy() { sqlite3_close(global_db);