martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Read config file for fallback when no command line arguments are given.

Browse Source
This commit is contained in:
Martin Preuss
2023-10-03 16:51:15 +02:00
parent 0740378ad8
commit 831c94f898
24 changed files with 324 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/aqhome-tool/data/adddata.c
View File

@@ -13,6 +13,7 @@
#include "./adddata.h"
#include "../utils.h"
#include "aqhome/aqhome.h"
#include "aqhome/msg/msg_node.h"
#include "aqhome/ipc/msg_ipc_result.h"
#include "aqhome/ipc/data/msg_data_multidata.h"
@@ -188,6 +189,8 @@ int AQH_Tool_AddDataPoint(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
return 0;
}
AQH_MergeConfigFileIntoConfig(dbLocalArgs, "ConfigFile");
return _doAddData(dbLocalArgs);
}
@@ -242,7 +245,7 @@ int _doAddData(GWEN_DB_NODE *dbArgs)
/*fprintf(stdout, "Sending AddData request\n");*/
epTcp=Utils_OpenConnection(dbArgs, 0, timeoutInSeconds);
epTcp=Utils_OpenBrokerConnection(dbArgs, 0, timeoutInSeconds);
if (epTcp==NULL) {
DBG_ERROR(NULL, "ERROR creating TCP connection");
return 2;

5
apps/aqhome-tool/data/getdatapoints.c
View File

@@ -13,6 +13,7 @@
#include "./getdatapoints.h"
#include "../utils.h"
#include "aqhome/aqhome.h"
#include "aqhome/msg/msg_node.h"
#include "aqhome/ipc/msg_ipc_result.h"
#include "aqhome/ipc/data/msg_data_datapoints.h"
@@ -190,6 +191,8 @@ int AQH_Tool_GetDataPoints(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
return 0;
}
AQH_MergeConfigFileIntoConfig(dbLocalArgs, "ConfigFile");
return _doGetDataPoints(dbLocalArgs);
}
@@ -220,7 +223,7 @@ int _doGetDataPoints(GWEN_DB_NODE *dbArgs)
return 2;
}
epTcp=Utils_OpenConnection(dbArgs, 0, timeoutInSeconds);
epTcp=Utils_OpenBrokerConnection(dbArgs, 0, timeoutInSeconds);
if (epTcp==NULL) {
DBG_ERROR(NULL, "ERROR creating TCP connection");
return 2;

5
apps/aqhome-tool/data/getdevices.c
View File

@@ -13,6 +13,7 @@
#include "./getdevices.h"
#include "../utils.h"
#include "aqhome/aqhome.h"
#include "aqhome/msg/msg_node.h"
#include "aqhome/ipc/msg_ipc_result.h"
#include "aqhome/ipc/data/msg_data_devices.h"
@@ -154,6 +155,8 @@ int AQH_Tool_GetDevices(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
return 0;
}
AQH_MergeConfigFileIntoConfig(dbLocalArgs, "ConfigFile");
return _doGetDevices(dbLocalArgs);
}
@@ -169,7 +172,7 @@ int _doGetDevices(GWEN_DB_NODE *dbArgs)
timeoutInSeconds=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 5);
printHeader=GWEN_DB_GetIntValue(dbArgs, "printHeader", 0, 0);
epTcp=Utils_OpenConnection(dbArgs, 0, timeoutInSeconds);
epTcp=Utils_OpenBrokerConnection(dbArgs, 0, timeoutInSeconds);
if (epTcp==NULL) {
DBG_ERROR(NULL, "ERROR creating TCP connection");
return 2;

5
apps/aqhome-tool/data/getlastdatapoint.c
View File

@@ -13,6 +13,7 @@
#include "./getlastdatapoint.h"
#include "../utils.h"
#include "aqhome/aqhome.h"
#include "aqhome/msg/msg_node.h"
#include "aqhome/ipc/msg_ipc_result.h"
#include "aqhome/ipc/data/msg_data_getdata.h"
@@ -167,6 +168,8 @@ int AQH_Tool_GetLastDataPoint(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
return 0;
}
AQH_MergeConfigFileIntoConfig(dbLocalArgs, "ConfigFile");
return _doGetLastDataPoint(dbLocalArgs);
}
@@ -182,7 +185,7 @@ int _doGetLastDataPoint(GWEN_DB_NODE *dbArgs)
timeoutInSeconds=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 5);
valueName=GWEN_DB_GetCharValue(dbArgs, "valueName", 0, NULL);
epTcp=Utils_OpenConnection(dbArgs, 0, timeoutInSeconds);
epTcp=Utils_OpenBrokerConnection(dbArgs, 0, timeoutInSeconds);
if (epTcp==NULL) {
DBG_ERROR(NULL, "ERROR creating TCP connection");
return 2;

5
apps/aqhome-tool/data/getvalues.c
View File

@@ -13,6 +13,7 @@
#include "./getvalues.h"
#include "../utils.h"
#include "aqhome/aqhome.h"
#include "aqhome/msg/msg_node.h"
#include "aqhome/ipc/msg_ipc_result.h"
#include "aqhome/ipc/data/msg_data_values.h"
@@ -143,6 +144,8 @@ int AQH_Tool_GetValues(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
return 0;
}
AQH_MergeConfigFileIntoConfig(dbLocalArgs, "ConfigFile");
return _doGetValues(dbLocalArgs);
}
@@ -156,7 +159,7 @@ int _doGetValues(GWEN_DB_NODE *dbArgs)
timeoutInSeconds=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 5);
epTcp=Utils_OpenConnection(dbArgs, 0, timeoutInSeconds);
epTcp=Utils_OpenBrokerConnection(dbArgs, 0, timeoutInSeconds);
if (epTcp==NULL) {
DBG_ERROR(NULL, "ERROR creating TCP connection");
return 2;

5
apps/aqhome-tool/data/moddevice.c
View File

@@ -13,6 +13,7 @@
#include "./moddevice.h"
#include "../utils.h"
#include "aqhome/aqhome.h"
#include "aqhome/msg/msg_node.h"
#include "aqhome/ipc/msg_ipc_result.h"
#include "aqhome/ipc/data/msg_data_devices.h"
@@ -198,6 +199,8 @@ int AQH_Tool_ModDevice(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
return 0;
}
AQH_MergeConfigFileIntoConfig(dbLocalArgs, "ConfigFile");
return _doModDevice(dbLocalArgs);
}
@@ -213,7 +216,7 @@ int _doModDevice(GWEN_DB_NODE *dbArgs)
timeoutInSeconds=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 5);
device=Utils_DeviceFromArgs(dbArgs);
epTcp=Utils_OpenConnection(dbArgs, 0, timeoutInSeconds);
epTcp=Utils_OpenBrokerConnection(dbArgs, 0, timeoutInSeconds);
if (epTcp==NULL) {
DBG_ERROR(NULL, "ERROR creating TCP connection");
return 2;

5
apps/aqhome-tool/data/setdata.c
View File

@@ -13,6 +13,7 @@
#include "./setdata.h"
#include "../utils.h"
#include "aqhome/aqhome.h"
#include "aqhome/msg/msg_node.h"
#include "aqhome/ipc/msg_ipc_result.h"
#include "aqhome/ipc/data/msg_data_multidata.h"
@@ -176,6 +177,8 @@ int AQH_Tool_SetData(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
return 0;
}
AQH_MergeConfigFileIntoConfig(dbLocalArgs, "ConfigFile");
return _doSetData(dbLocalArgs);
}
@@ -215,7 +218,7 @@ int _doSetData(GWEN_DB_NODE *dbArgs)
/*fprintf(stdout, "Sending SetData request\n");*/
epTcp=Utils_OpenConnection(dbArgs, 0, timeoutInSeconds);
epTcp=Utils_OpenBrokerConnection(dbArgs, 0, timeoutInSeconds);
if (epTcp==NULL) {
DBG_ERROR(NULL, "ERROR creating TCP connection");
return 2;