Erster Release für Wizard

_OEM_.cfg

@@ -41,10 +41,10 @@ restconf = {
          implementget = 1;
 };
 
-mqttconf =
-{
-    cfg_file_path = "/opt/GfA/_OEM_/mqttcl/mqttcl.conf.json"
-};
+//mqttconf =
+//{
+//    cfg_file_path = "/opt/GfA/_OEM_/mqttcl/mqttcl.conf.json"
+//};
 
 sinclude = (
 	"gfa/svc/common/uuid.h"

svc/mqttcl/cfg/mqtt.conf.json

@@ -4,7 +4,7 @@
 	"defaultQos":		2,
 	"defaultRetain":	false,
 	"devicePrefix":		"OEM",
-	"tlsMode":			1,
+	"tlsMode":			0,
 	"tlsCaCrtFile":		"/opt/GfA/OEM/mqttcl/client/ca.crt",
 	"tlsClCrtFile":		"/opt/GfA/OEM/mqttcl/client/client.crt",
 	"tlsClKeyFile":		"/opt/GfA/OEM/mqttcl/client/client.key",

svc/mqttcl/main.cpp

@@ -703,7 +703,14 @@ int main(int /*argc*/, char **/*argv*/)
 
 	    CMqttClConfig cfg(UUID_SHM);
 
-	    if(!cfg.LoadCfg(MQTTCL_CONFIG_FILE_PATH, g_lf))
+#ifdef MQTTCL_CONFIG_FILE_PATH
+	std::string strMqttCfg = MQTTCL_CONFIG_FILE_PATH;
+#else	//	MQTTCL_CONFIG_FILE_PATH
+	char szBaseDir[PATH_MAX];
+	::GetAppDirectory(szBaseDir, sizeof(szBaseDir));
+	std::string strMqttCfg = formatString("%s/cfg/mqtt.conf.json", szBaseDir);
+#endif	//	MQTTCL_CONFIG_FILE_PATH
+	    if(!cfg.LoadCfg(strMqttCfg.c_str(), g_lf))
 	    {
 			nRet = -1;
 			break;

svc/mqttcl/mqttcl.pro

@@ -34,9 +34,19 @@ HEADERS +=
 
 INCLUDEPATH += ../../  $$(GEBGFADEV)
 
+linux-g++ {
+	DISTFILES = config
+    config.files = cfg
+    config.path = $$OUT_PWD
+    INSTALLS += config
+}
+
 linux-buildroot-g++ {
-    target.path = $$DEPLOY_BASEDIR/$$DEPLOY_SUBDIR/mqttcl
-    INSTALLS += target
     QMAKE_CXXFLAGS += -D_TARGET_BUILD
     QMAKE_CFLAGS += -D_TARGET_BUILD
+	DISTFILES = config
+    target.path = $$DEPLOY_BASEDIR/$$DEPLOY_SUBDIR/mqttcl
+    config.files = cfg
+    config.path = $$DEPLOY_BASEDIR/$$DEPLOY_SUBDIR/mqttcl
+    INSTALLS += target config
 }

usr/visu/qml/appctrl.qml

@@ -396,12 +396,12 @@ Rectangle {
 	/////////////////////////////////////////////////////////////////////////////////////////////////
 
     Rectangle {
-        x: 270
+        x: 660
         y: 50
         width: 120
         height: 420
 
-        property var appInfo: qGfaAppCtrl.appInfo[QGfaAppCtrl.APP_INDEX_SYSINFO]
+        property var appInfo: qGfaAppCtrl.appInfo[QGfaAppCtrl.APP_INDEX_DATALOGGER]
 
 		Rectangle {
 	        x: 0
@@ -584,12 +584,12 @@ Rectangle {
 	/////////////////////////////////////////////////////////////////////////////////////////////////
 
     Rectangle {
-        x: 400
+        x: 270
         y: 50
         width: 120
         height: 420
 
-		property var appInfo: qGfaAppCtrl.appInfo[QGfaAppCtrl.APP_INDEX_MQTTCL]
+        property var appInfo: qGfaAppCtrl.appInfo[QGfaAppCtrl.APP_INDEX_SUMMARIST]
 
 		Rectangle {
 	        x: 0
@@ -772,12 +772,12 @@ Rectangle {
 	/////////////////////////////////////////////////////////////////////////////////////////////////
 
     Rectangle {
-        x: 530
+        x: 400
         y: 50
         width: 120
         height: 420
 
-		property var appInfo: qGfaAppCtrl.appInfo[QGfaAppCtrl.APP_INDEX_REST]
+		property var appInfo: qGfaAppCtrl.appInfo[QGfaAppCtrl.APP_INDEX_MQTTCL]
 
 		Rectangle {
 	        x: 0
@@ -960,12 +960,12 @@ Rectangle {
 	/////////////////////////////////////////////////////////////////////////////////////////////////
 
     Rectangle {
-        x: 660
+        x: 530
         y: 50
         width: 120
         height: 420
 
-        property var appInfo: qGfaAppCtrl.appInfo[QGfaAppCtrl.APP_INDEX_DATALOGGER]
+		property var appInfo: qGfaAppCtrl.appInfo[QGfaAppCtrl.APP_INDEX_REST]
 
 		Rectangle {
 	        x: 0