From a47ac339bffa27ae51cfa72731ba8b34f773ca99 Mon Sep 17 00:00:00 2001 From: Kevron Rees Date: Tue, 9 Sep 2014 16:37:13 -0700 Subject: [PATCH] disabled irc in bluemonkey --- examples/configwheel | 4 ++-- examples/databaseconfig | 8 ++++---- examples/databasesource | 4 ++-- examples/dbusconfig | 4 ++-- examples/exampleconfig | 4 ++-- examples/gpsnmea | 4 ++-- examples/obdsourceconfig | 4 ++-- examples/opencvdbusconfig | 8 ++++---- examples/opencvluxconfig | 6 +++--- examples/qtmainloopconfig | 6 +++--- examples/testsourceconfig | 4 ++-- examples/websocketsink2 | 4 ++-- examples/websocketsource2 | 4 ++-- plugins/bluemonkey/CMakeLists.txt | 18 ++++++------------ plugins/bluemonkey/bluemonkey.cpp | 11 ++++------- plugins/bluemonkey/bluemonkey.h | 14 ++++++++++++-- plugins/gpsnmea/gpsnmea.cpp | 3 +-- plugins/gpsnmea/gpsnmea.h | 2 +- 18 files changed, 56 insertions(+), 56 deletions(-) diff --git a/examples/configwheel b/examples/configwheel index a2e4011..b8716ac 100644 --- a/examples/configwheel +++ b/examples/configwheel @@ -2,14 +2,14 @@ "sources" : [ { "name" : "WheelSource", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/wheelsourceplugin.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/wheelsourceplugin.so", "device" : "/dev/input/js0" } ], "sinks": [ { "name" : "DBusSink", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/dbussinkplugin.so" + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/dbussinkplugin.so" } ] } diff --git a/examples/databaseconfig b/examples/databaseconfig index ba4b0ad..81bf508 100644 --- a/examples/databaseconfig +++ b/examples/databaseconfig @@ -2,13 +2,13 @@ "sources" : [ { "name" : "ExampleSouce", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/examplesourceplugin.so" + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/examplesourceplugin.so" } ], "sinks": [ { "name" : "Database", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/databasesinkplugin.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/databasesinkplugin.so", "properties" : "{ 'properties' : ['VehicleSpeed','EngineSpeed'] }", "databaseFile" : "/tmp/storage", "startOnLoad" : "true", @@ -17,10 +17,10 @@ }, { "name" : "Example Sink", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/examplesinkplugin.so" + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/examplesinkplugin.so" }, { - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/dbussinkplugin.so" + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/dbussinkplugin.so" } ] diff --git a/examples/databasesource b/examples/databasesource index c24e58f..15a039c 100644 --- a/examples/databasesource +++ b/examples/databasesource @@ -2,14 +2,14 @@ "sources" : [ { "name" : "Database Source", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/databasesinkplugin.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/databasesinkplugin.so", "playbackOnLoad" : "true", "databaseFile" : "generated.db" } ], "sinks": [ { - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/dbussinkplugin.so" + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/dbussinkplugin.so" } ] } diff --git a/examples/dbusconfig b/examples/dbusconfig index c5ca01d..4dd90ba 100644 --- a/examples/dbusconfig +++ b/examples/dbusconfig @@ -2,14 +2,14 @@ "sources" : [ { "name" : "ExampleSouce", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/examplesourceplugin.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/examplesourceplugin.so", "delay" : "6" } ], "sinks": [ { "name" : "DBusSink", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/dbussinkplugin.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/dbussinkplugin.so", "frequency" : "30" } diff --git a/examples/exampleconfig b/examples/exampleconfig index aab3836..22c8103 100644 --- a/examples/exampleconfig +++ b/examples/exampleconfig @@ -2,14 +2,14 @@ "sources" : [ { "name" : "ExampleSouce", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/examplesourceplugin.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/examplesourceplugin.so", "delay" : "1" } ], "sinks": [ { "name" : "ExampleSink", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/examplesinkplugin.so" + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/examplesinkplugin.so" } ] } diff --git a/examples/gpsnmea b/examples/gpsnmea index 1966dd5..8fb2687 100644 --- a/examples/gpsnmea +++ b/examples/gpsnmea @@ -2,14 +2,14 @@ "sources" : [ { "name" : "gps nmea plugin", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/gpsnmea.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/gpsnmea.so", "test" : "true", "device" : "/dev/ttyACM0" } ], "sinks": [ { - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/dbussinkplugin.so" + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/dbussinkplugin.so" } ] } diff --git a/examples/obdsourceconfig b/examples/obdsourceconfig index f776ab3..065e0cf 100644 --- a/examples/obdsourceconfig +++ b/examples/obdsourceconfig @@ -2,7 +2,7 @@ "sources" : [ { "name" : "OBD2Source", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/obd2sourceplugin.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/obd2sourceplugin.so", "device" : "/dev/pts/5", "baud" : "115200", "bluetoothAdapter" : "" @@ -11,7 +11,7 @@ "sinks": [ { "name" : "ExampleSink", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/examplesinkplugin.so" + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/examplesinkplugin.so" } ] } diff --git a/examples/opencvdbusconfig b/examples/opencvdbusconfig index e11b442..da29ab0 100644 --- a/examples/opencvdbusconfig +++ b/examples/opencvdbusconfig @@ -1,9 +1,9 @@ { - "mainloop" : "/usr/lib/i386-linux-gnu/automotive-message-broker/qtmainloopplugin.so", + "mainloop" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/qtmainloopplugin.so", "sources" : [ { "name" : "OpenCV LUX", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/opencvluxplugin.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/opencvluxplugin.so", "threaded" : "true", "cuda" : "true", "fps" : "30", @@ -15,12 +15,12 @@ "logfile" : "/tmp/video.avi" }, { - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/examplesourceplugin.so" + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/examplesourceplugin.so" } ], "sinks": [ { - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/dbussinkplugin.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/dbussinkplugin.so", }, ] } diff --git a/examples/opencvluxconfig b/examples/opencvluxconfig index ea62071..0ecb2a2 100644 --- a/examples/opencvluxconfig +++ b/examples/opencvluxconfig @@ -1,9 +1,9 @@ { - "mainloop" : "/usr/lib/i386-linux-gnu/automotive-message-broker/qtmainloopplugin.so", + "mainloop" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/qtmainloopplugin.so", "sources" : [ { "name" : "OpenCV Lux plugin", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/opencvluxplugin.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/opencvluxplugin.so", "threaded" : "true", "kinect" : "false", "opencl" : "false", @@ -17,7 +17,7 @@ "sinks": [ { "name" : "Example sink", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/examplesinkplugin.so" + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/examplesinkplugin.so" } ] } diff --git a/examples/qtmainloopconfig b/examples/qtmainloopconfig index 10c252b..0de7d7e 100644 --- a/examples/qtmainloopconfig +++ b/examples/qtmainloopconfig @@ -1,15 +1,15 @@ { - "mainloop" : "/usr/lib/i386-linux-gnu/automotive-message-broker/qtmainloopplugin.so", + "mainloop" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/qtmainloopplugin.so", "sources" : [ { "name" : "ExampleSouce", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/examplesourceplugin.so" + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/examplesourceplugin.so" } ], "sinks": [ { "name" : "Example sink", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/examplesinkplugin.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/examplesinkplugin.so", "interface" : "lo", "port" : "23000" } diff --git a/examples/testsourceconfig b/examples/testsourceconfig index f66b16e..445c0cf 100644 --- a/examples/testsourceconfig +++ b/examples/testsourceconfig @@ -2,13 +2,13 @@ "sources" : [ { "name" : "TestPlugin", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/testplugin.so" + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/testplugin.so" } ], "sinks": [ { "name" : "ExampleSink", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/examplesinkplugin.so" + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/examplesinkplugin.so" } ] } diff --git a/examples/websocketsink2 b/examples/websocketsink2 index af755fa..7822960 100644 --- a/examples/websocketsink2 +++ b/examples/websocketsink2 @@ -2,14 +2,14 @@ "sources" : [ { "name" : "ExampleSouce", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/examplesourceplugin.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/examplesourceplugin.so", "delay" : "6" } ], "sinks": [ { "name" : "WebSocketSink", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/websocketsink.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/websocketsink.so", "interface" : "eth1", "ssl" : "false", "port" : "23000", diff --git a/examples/websocketsource2 b/examples/websocketsource2 index e102713..867734d 100644 --- a/examples/websocketsource2 +++ b/examples/websocketsource2 @@ -2,7 +2,7 @@ "sources" : [ { "name" : "WebsocketSource", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/websocketsource.so", + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/websocketsource.so", "port" : "23000", "ssl" : "false", "ip" : "127.0.0.1", @@ -13,7 +13,7 @@ "sinks": [ { "name" : "ExampleSink", - "path" : "/usr/lib/i386-linux-gnu/automotive-message-broker/examplesinkplugin.so" + "path" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/examplesinkplugin.so" } ] } diff --git a/plugins/bluemonkey/CMakeLists.txt b/plugins/bluemonkey/CMakeLists.txt index ec63f77..3482d48 100644 --- a/plugins/bluemonkey/CMakeLists.txt +++ b/plugins/bluemonkey/CMakeLists.txt @@ -9,31 +9,25 @@ if(Qt5Core_FOUND) set(QT_INCLUDE_DIRS ${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Script_INCLUDE_DIRS}) set(QT_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Script_LIBRARIES}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - message(STATUS "size of void_p: ${CMAKE_SIZEOF_VOID_P}") - if(CMAKE_SIZEOF_VOID_P MATCHES "8") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcmodel=large") - endif(CMAKE_SIZEOF_VOID_P MATCHES "8") add_definitions(${Qt5Core_DEFINITIONS}) endif(Qt5Core_FOUND) set(CMAKE_AUTOMOC ON) -set(communi_INCLUDE_DIRS /usr/include/qt5/Communi) -set(communi_LIBRARIES -lCommuni) -add_definitions(-DCOMMUNI_SHARED) +#set(communi_INCLUDE_DIRS /usr/include/qt5/Communi) +#set(communi_LIBRARIES -lCommuni) +#add_definitions(-DCOMMUNI_SHARED) include_directories(${CMAKE_SOURCE_DIR}/lib ${include_dirs} ${communi_INCLUDE_DIRS} ${QT_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/plugins/common) -set(bluemonkeyplugin_headers bluemonkey.h irccoms.h authenticate.h agent.h) -set(bluemonkeyplugin_sources bluemonkey.cpp irccoms.cpp authenticate.cpp agent.cpp) +set(bluemonkeyplugin_headers bluemonkey.h authenticate.h agent.h) +set(bluemonkeyplugin_sources bluemonkey.cpp authenticate.cpp agent.cpp) add_library(bluemonkeyplugin MODULE ${bluemonkeyplugin_sources}) set_target_properties(bluemonkeyplugin PROPERTIES PREFIX "") target_link_libraries(bluemonkeyplugin amb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${QT_LIBRARIES} ${communi_LIBRARIES} amb-plugins-common -L${CMAKE_CURRENT_BINARY_DIR}/plugins/common) -set(config_files ${CMAKE_CURRENT_SOURCE_DIR}/ircSettings.js - ${CMAKE_CURRENT_SOURCE_DIR}/authSettings.js - ${CMAKE_CURRENT_SOURCE_DIR}/config.js) +set(config_files ${CMAKE_CURRENT_SOURCE_DIR}/config.js) install(TARGETS bluemonkeyplugin LIBRARY DESTINATION ${PLUGIN_INSTALL_PATH}) install (FILES ${config_files} DESTINATION /etc/ambd/bluemonkey) diff --git a/plugins/bluemonkey/bluemonkey.cpp b/plugins/bluemonkey/bluemonkey.cpp index 5ff5689..014540b 100644 --- a/plugins/bluemonkey/bluemonkey.cpp +++ b/plugins/bluemonkey/bluemonkey.cpp @@ -21,7 +21,6 @@ #include "abstractroutingengine.h" #include "ambplugin.h" #include "debugout.h" -#include "irccoms.h" #include #include @@ -95,13 +94,11 @@ QVariant gvariantToQVariant(GVariant *value) BluemonkeySink::BluemonkeySink(AbstractRoutingEngine* e, map config, AbstractSource &parent): QObject(0), AmbPluginImpl(e, config, parent), agent(nullptr), engine(nullptr), mSilentMode(false) { - irc = new IrcCommunication(config, this); - QTimer::singleShot(1,this,SLOT(reloadEngine())); auth = new Authenticate(config, this); - connect(irc, &IrcCommunication::message, [&](QString sender, QString prefix, QString codes ) { +/* connect(irc, &IrcCommunication::message, [&](QString sender, QString prefix, QString codes ) { if(codes.startsWith("authenticate")) { @@ -135,7 +132,7 @@ BluemonkeySink::BluemonkeySink(AbstractRoutingEngine* e, map con irc->respond(sender, response); } }); - +*/ } @@ -243,8 +240,8 @@ void BluemonkeySink::reloadEngine() QScriptValue qtimerClass = engine->scriptValueFromQMetaObject(); engine->globalObject().setProperty("QTimer", qtimerClass); - QScriptValue ircValue = engine->newQObject(irc); - engine->globalObject().setProperty("irc", ircValue); +// QScriptValue ircValue = engine->newQObject(irc); +// engine->globalObject().setProperty("irc", ircValue); loadConfig(configuration["config"].c_str()); } diff --git a/plugins/bluemonkey/bluemonkey.h b/plugins/bluemonkey/bluemonkey.h index a9fd240..34c7f29 100644 --- a/plugins/bluemonkey/bluemonkey.h +++ b/plugins/bluemonkey/bluemonkey.h @@ -23,6 +23,8 @@ #include "abstractsource.h" #include "ambpluginimpl.h" +#include + #include #include #include @@ -33,9 +35,16 @@ #include "authenticate.h" #include "agent.h" -class IrcCommunication; class QScriptEngine; +class ModuleInterface +{ +public: + virtual std::map objects(std::map config) = 0; +}; + +Q_DECLARE_INTERFACE(ModuleInterface, "org.automotive.bluemonkey.moduleinterface") + class Property: public QObject, public AbstractSink { Q_OBJECT @@ -105,6 +114,8 @@ public Q_SLOTS: void loadConfig(QString str); + void loadModule(QString path); + void reloadEngine(); void writeProgram(QString program); @@ -122,7 +133,6 @@ public Q_SLOTS: private: QStringList configsToLoad; - IrcCommunication* irc; Authenticate* auth; BluemonkeyAgent* agent; diff --git a/plugins/gpsnmea/gpsnmea.cpp b/plugins/gpsnmea/gpsnmea.cpp index c250d2b..1cd8647 100644 --- a/plugins/gpsnmea/gpsnmea.cpp +++ b/plugins/gpsnmea/gpsnmea.cpp @@ -426,10 +426,9 @@ GpsNmeaSource::GpsNmeaSource(AbstractRoutingEngine *re, map conf { std::string dev = config["device"]; -#ifdef USE_BLUEZ5 if(dev.find(":") != string::npos) { - +#ifdef USE_BLUEZ5 bt = new Bluetooth5(); bt->getDeviceForAddress(dev, [this](int fd) { DebugOut() << "fd: " << fd << endl; diff --git a/plugins/gpsnmea/gpsnmea.h b/plugins/gpsnmea/gpsnmea.h index 5336a97..9212224 100644 --- a/plugins/gpsnmea/gpsnmea.h +++ b/plugins/gpsnmea/gpsnmea.h @@ -82,7 +82,7 @@ private: #ifdef USE_BLUEZ5 Bluetooth5 * bt; #else - BluetoothDevice *bt + BluetoothDevice *bt; #endif }; -- 2.7.4