Began to add kovan-serial dbus support

kipr · Jan 27, 2013 · 52b76b3 · 52b76b3
1 parent a60abf1
commit 52b76b3
Show file tree

Hide file tree

Showing 40 changed files with 111 additions and 31 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,12 +13,12 @@ SET(DEVICES ${botui_SOURCE_DIR}/devices)
 SET(KOVAN ${DEVICES}/kovan)
 SET(SIMULATOR ${DEVICES}/simulator)
 
-SET(NETWORK_MANAGER ${CMAKE_SOURCE_DIR}/NetworkManager)
+SET(DBUS ${CMAKE_SOURCE_DIR}/dbus)
 
 INCLUDE_DIRECTORIES(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/src
-	${NETWORK_MANAGER}/include
+	${DBUS}/include
 	${botui_SOURCE_DIR} 
 	${botui_BINARY_DIR}
 	${KOVAN}/include
@@ -32,8 +32,8 @@ SET(QT_USE_QTDBUS TRUE)
 
 INCLUDE(${QT_USE_FILE})
 
-FILE(GLOB INCLUDES ${INCLUDE}/*.h ${KOVAN}/include/*.h ${SIMULATOR}/include/*.h ${NETWORK_MANAGER}/include/*.h)
-FILE(GLOB SOURCES ${SRC}/*.cpp ${KOVAN}/src/*.cpp ${SIMULATOR}/src/*.cpp ${NETWORK_MANAGER}/src/*.cpp)
+FILE(GLOB INCLUDES ${INCLUDE}/*.h ${KOVAN}/include/*.h ${SIMULATOR}/include/*.h ${DBUS}/include/*.h)
+FILE(GLOB SOURCES ${SRC}/*.cpp ${KOVAN}/src/*.cpp ${SIMULATOR}/src/*.cpp ${DBUS}/src/*.cpp)
 FILE(GLOB UIS ${UI}/*)
 
 SET(botui_SRCS_CXX ${SOURCES})

diff --git a/NetworkManager/generate.sh → dbus/generate.sh b/NetworkManager/generate.sh → dbus/generate.sh
@@ -5,32 +5,35 @@ rm -Rf src
 
 generate()
 {
-	qdbusxml2cpp -c NM${1} -p NM${1} -N -i NetworkManagerConnection.h ${2}.xml
+	qdbusxml2cpp -c ${1} -p ${1} -N -i NetworkManagerConnection.h ${2}.xml
 }
 
 echo "Generating NetworkManager class..."
-generate NetworkManager nm-manager
+generate NMNetworkManager nm-manager
 
 echo "Generating Device class..."
-generate Device nm-device
+generate NMDevice nm-device
 
 echo "Generating DeviceEthernet class..."
-generate DeviceEthernet nm-device-ethernet
+generate NMDeviceEthernet nm-device-ethernet
 
 echo "Generating DeviceWifi class..."
-generate DeviceWifi nm-device-wifi
+generate NMDeviceWifi nm-device-wifi
 
 echo "Generating Settings class..."
-generate Settings nm-settings
+generate NMSettings nm-settings
 
 echo "Generating SettingsConnection class..."
-generate SettingsConnection nm-settings-connection
+generate NMSettingsConnection nm-settings-connection
 
 echo "Generating SecretAgent class..."
-generate SecretAgent nm-secret-agent
+generate NMSecretAgent nm-secret-agent
 
 echo "Generating AccessPoint class..."
-generate AccessPoint nm-access-point
+generate NMAccessPoint nm-access-point
+
+echo "Generating Serial class..."
+generate Serial org.kipr.Serial
 
 mkdir -p src
 mkdir -p include

diff --git a/NetworkManager/generic-types.xml → dbus/generic-types.xml b/NetworkManager/generic-types.xml → dbus/generic-types.xml
diff --git a/NetworkManager/include/NMAccessPoint.h → dbus/include/NMAccessPoint.h b/NetworkManager/include/NMAccessPoint.h → dbus/include/NMAccessPoint.h
@@ -8,8 +8,8 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef NMACCESSPOINT_H_1353454821
-#define NMACCESSPOINT_H_1353454821
+#ifndef NMACCESSPOINT_H_1359245779
+#define NMACCESSPOINT_H_1359245779
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>

diff --git a/NetworkManager/include/NMDevice.h → dbus/include/NMDevice.h b/NetworkManager/include/NMDevice.h → dbus/include/NMDevice.h
@@ -8,8 +8,8 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef NMDEVICE_H_1353454821
-#define NMDEVICE_H_1353454821
+#ifndef NMDEVICE_H_1359245778
+#define NMDEVICE_H_1359245778
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>

diff --git a/NetworkManager/include/NMDeviceEthernet.h → dbus/include/NMDeviceEthernet.h b/NetworkManager/include/NMDeviceEthernet.h → dbus/include/NMDeviceEthernet.h
@@ -8,8 +8,8 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef NMDEVICEETHERNET_H_1353454821
-#define NMDEVICEETHERNET_H_1353454821
+#ifndef NMDEVICEETHERNET_H_1359245778
+#define NMDEVICEETHERNET_H_1359245778
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>

diff --git a/NetworkManager/include/NMDeviceWifi.h → dbus/include/NMDeviceWifi.h b/NetworkManager/include/NMDeviceWifi.h → dbus/include/NMDeviceWifi.h
@@ -8,8 +8,8 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef NMDEVICEWIFI_H_1353454821
-#define NMDEVICEWIFI_H_1353454821
+#ifndef NMDEVICEWIFI_H_1359245778
+#define NMDEVICEWIFI_H_1359245778
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>

diff --git a/NetworkManager/include/NMNetworkManager.h → dbus/include/NMNetworkManager.h b/NetworkManager/include/NMNetworkManager.h → dbus/include/NMNetworkManager.h
@@ -8,8 +8,8 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef NMNETWORKMANAGER_H_1353454821
-#define NMNETWORKMANAGER_H_1353454821
+#ifndef NMNETWORKMANAGER_H_1359245778
+#define NMNETWORKMANAGER_H_1359245778
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>

diff --git a/NetworkManager/include/NMSecretAgent.h → dbus/include/NMSecretAgent.h b/NetworkManager/include/NMSecretAgent.h → dbus/include/NMSecretAgent.h
@@ -8,8 +8,8 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef NMSECRETAGENT_H_1353454821
-#define NMSECRETAGENT_H_1353454821
+#ifndef NMSECRETAGENT_H_1359245779
+#define NMSECRETAGENT_H_1359245779
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>

diff --git a/NetworkManager/include/NMSettings.h → dbus/include/NMSettings.h b/NetworkManager/include/NMSettings.h → dbus/include/NMSettings.h
@@ -8,8 +8,8 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef NMSETTINGS_H_1353454821
-#define NMSETTINGS_H_1353454821
+#ifndef NMSETTINGS_H_1359245779
+#define NMSETTINGS_H_1359245779
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>

diff --git a/...orkManager/include/NMSettingsConnection.h → dbus/include/NMSettingsConnection.h b/...orkManager/include/NMSettingsConnection.h → dbus/include/NMSettingsConnection.h
@@ -8,8 +8,8 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef NMSETTINGSCONNECTION_H_1353454821
-#define NMSETTINGSCONNECTION_H_1353454821
+#ifndef NMSETTINGSCONNECTION_H_1359245779
+#define NMSETTINGSCONNECTION_H_1359245779
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>

diff --git a/dbus/include/Serial.h b/dbus/include/Serial.h
@@ -0,0 +1,44 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.7
+ * Command line was: qdbusxml2cpp -c Serial -p Serial -N -i NetworkManagerConnection.h org.kipr.Serial.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef SERIAL_H_1359245779
+#define SERIAL_H_1359245779
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+#include "NetworkManagerConnection.h"
+
+/*
+ * Proxy class for interface org.kipr.Serial
+ */
+class Serial: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "org.kipr.Serial"; }
+
+public:
+    Serial(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+
+    ~Serial();
+
+public Q_SLOTS: // METHODS
+Q_SIGNALS: // SIGNALS
+    void Run(const QString &path);
+};
+
+#endif
diff --git a/NetworkManager/nm-access-point.xml → dbus/nm-access-point.xml b/NetworkManager/nm-access-point.xml → dbus/nm-access-point.xml
diff --git a/NetworkManager/nm-active-connection.xml → dbus/nm-active-connection.xml b/NetworkManager/nm-active-connection.xml → dbus/nm-active-connection.xml
diff --git a/NetworkManager/nm-agent-manager.xml → dbus/nm-agent-manager.xml b/NetworkManager/nm-agent-manager.xml → dbus/nm-agent-manager.xml
diff --git a/NetworkManager/nm-device-ethernet.xml → dbus/nm-device-ethernet.xml b/NetworkManager/nm-device-ethernet.xml → dbus/nm-device-ethernet.xml
diff --git a/NetworkManager/nm-device-wifi.xml → dbus/nm-device-wifi.xml b/NetworkManager/nm-device-wifi.xml → dbus/nm-device-wifi.xml
diff --git a/NetworkManager/nm-device.xml → dbus/nm-device.xml b/NetworkManager/nm-device.xml → dbus/nm-device.xml
diff --git a/NetworkManager/nm-dhcp4-config.xml → dbus/nm-dhcp4-config.xml b/NetworkManager/nm-dhcp4-config.xml → dbus/nm-dhcp4-config.xml
diff --git a/NetworkManager/nm-dhcp6-config.xml → dbus/nm-dhcp6-config.xml b/NetworkManager/nm-dhcp6-config.xml → dbus/nm-dhcp6-config.xml
diff --git a/NetworkManager/nm-ip4-config.xml → dbus/nm-ip4-config.xml b/NetworkManager/nm-ip4-config.xml → dbus/nm-ip4-config.xml
diff --git a/NetworkManager/nm-ip6-config.xml → dbus/nm-ip6-config.xml b/NetworkManager/nm-ip6-config.xml → dbus/nm-ip6-config.xml
diff --git a/NetworkManager/nm-manager.xml → dbus/nm-manager.xml b/NetworkManager/nm-manager.xml → dbus/nm-manager.xml
diff --git a/NetworkManager/nm-ppp-manager.xml → dbus/nm-ppp-manager.xml b/NetworkManager/nm-ppp-manager.xml → dbus/nm-ppp-manager.xml
diff --git a/NetworkManager/nm-secret-agent.xml → dbus/nm-secret-agent.xml b/NetworkManager/nm-secret-agent.xml → dbus/nm-secret-agent.xml
diff --git a/NetworkManager/nm-settings-connection.xml → dbus/nm-settings-connection.xml b/NetworkManager/nm-settings-connection.xml → dbus/nm-settings-connection.xml
diff --git a/NetworkManager/nm-settings.xml → dbus/nm-settings.xml b/NetworkManager/nm-settings.xml → dbus/nm-settings.xml
diff --git a/dbus/org.kipr.Serial.xml b/dbus/org.kipr.Serial.xml
@@ -0,0 +1,7 @@
+<node>
+	<interface name="org.kipr.Serial">
+		<signal name="Run">
+			<arg name="path" type="s" direction="out" />
+		</signal>
+	</interface>
+</node>
diff --git a/NetworkManager/src/NMAccessPoint.cpp → dbus/src/NMAccessPoint.cpp b/NetworkManager/src/NMAccessPoint.cpp → dbus/src/NMAccessPoint.cpp
diff --git a/NetworkManager/src/NMDevice.cpp → dbus/src/NMDevice.cpp b/NetworkManager/src/NMDevice.cpp → dbus/src/NMDevice.cpp
diff --git a/NetworkManager/src/NMDeviceEthernet.cpp → dbus/src/NMDeviceEthernet.cpp b/NetworkManager/src/NMDeviceEthernet.cpp → dbus/src/NMDeviceEthernet.cpp
diff --git a/NetworkManager/src/NMDeviceWifi.cpp → dbus/src/NMDeviceWifi.cpp b/NetworkManager/src/NMDeviceWifi.cpp → dbus/src/NMDeviceWifi.cpp
diff --git a/NetworkManager/src/NMNetworkManager.cpp → dbus/src/NMNetworkManager.cpp b/NetworkManager/src/NMNetworkManager.cpp → dbus/src/NMNetworkManager.cpp
diff --git a/NetworkManager/src/NMSecretAgent.cpp → dbus/src/NMSecretAgent.cpp b/NetworkManager/src/NMSecretAgent.cpp → dbus/src/NMSecretAgent.cpp
diff --git a/NetworkManager/src/NMSettings.cpp → dbus/src/NMSettings.cpp b/NetworkManager/src/NMSettings.cpp → dbus/src/NMSettings.cpp
diff --git a/NetworkManager/src/NMSettingsConnection.cpp → dbus/src/NMSettingsConnection.cpp b/NetworkManager/src/NMSettingsConnection.cpp → dbus/src/NMSettingsConnection.cpp
diff --git a/dbus/src/Serial.cpp b/dbus/src/Serial.cpp
@@ -0,0 +1,26 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.7
+ * Command line was: qdbusxml2cpp -c Serial -p Serial -N -i NetworkManagerConnection.h org.kipr.Serial.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "Serial.h"
+
+/*
+ * Implementation of interface class Serial
+ */
+
+Serial::Serial(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+Serial::~Serial()
+{
+}
+
diff --git a/NetworkManager/vpn-errors.xml → dbus/vpn-errors.xml b/NetworkManager/vpn-errors.xml → dbus/vpn-errors.xml
diff --git a/devices/kovan/src/KovanDevice.cpp b/devices/kovan/src/KovanDevice.cpp
@@ -31,7 +31,7 @@
 
 #include <QDebug>
 
-//#define NOT_A_KOVAN
+#define NOT_A_KOVAN
 
 namespace Kovan
 {

diff --git a/include/Program.h b/include/Program.h
@@ -12,14 +12,14 @@ Q_OBJECT
 public:
 	~Program();
 
-	bool start(const QString& path, const QStringList &arguments);
 	bool isRunning();
 
 	QProcess *process() const;
 
 	static Program *instance();
 
 public slots:
+	bool start(const QString& path, const QStringList &arguments = QStringList());
 	void stop();
 
 signals: