From 171caacc929afa40bb5ed4c68ca87d83adfb2ce2 Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Tue, 18 Mar 2025 22:53:34 +0100 Subject: [PATCH] aqhome-apps: no longer included removed files. --- apps/aqhome-mqttlog/s_publish.h | 2 +- apps/aqhome-mqttlog/s_setdata.h | 2 +- apps/aqhome-mqttlog/xmlread.h | 1 - apps/aqhome-mqttlog/xmlwrite.c | 1 - apps/aqhome-mqttlog/xmlwrite.h | 1 - apps/aqhome-react/net_read.c | 1 - apps/aqhome-react/net_read.h | 2 +- apps/aqhome-react/types/dataobject.h | 5 +++-- apps/aqhome-react/types/param.h | 2 +- apps/aqhome-react/types/port.h | 3 ++- apps/aqhome-react/types/prgrule.h | 4 ++-- apps/aqhome-react/types/unit.h | 1 - apps/aqhome-react/units/u_highpass.h | 1 - apps/aqhome-react/units/u_logical.h | 1 - apps/aqhome-react/units/u_lowpass.h | 1 - apps/aqhome-react/units/u_module.h | 1 - apps/aqhome-react/units/u_module_p.h | 3 +-- apps/aqhome-react/units/u_passthrough.h | 1 - apps/aqhome-react/units/u_stabilize.h | 1 - apps/aqhome-react/units/u_statfns.h | 1 - apps/aqhome-react/units/u_suntime.h | 1 - apps/aqhome-react/units/u_suntime_p.h | 1 - apps/aqhome-react/units/u_timeprogram.h | 1 - apps/aqhome-react/units/u_timeprogram_p.h | 1 - apps/aqhome-react/units/u_timer.h | 1 - apps/aqhome-react/units/u_valuefilter.h | 1 - apps/aqhome-react/units/u_valueset.h | 1 - apps/aqhome-react/units/u_varchanges.h | 1 - apps/aqhome-react/units/u_varset.c | 6 +++--- apps/aqhome-react/units/u_varset.h | 1 - apps/aqhome-react/units/u_zeroposnegstring.h | 1 - 31 files changed, 15 insertions(+), 36 deletions(-) diff --git a/apps/aqhome-mqttlog/s_publish.h b/apps/aqhome-mqttlog/s_publish.h index 3bbeb7d..f4dff5d 100644 --- a/apps/aqhome-mqttlog/s_publish.h +++ b/apps/aqhome-mqttlog/s_publish.h @@ -10,7 +10,7 @@ #define AQHOMEMQTT_S_PUBLISH_H -#include "./aqhome_mqtt.h" +#include "./server.h" #include #include diff --git a/apps/aqhome-mqttlog/s_setdata.h b/apps/aqhome-mqttlog/s_setdata.h index bb55b65..46cb22c 100644 --- a/apps/aqhome-mqttlog/s_setdata.h +++ b/apps/aqhome-mqttlog/s_setdata.h @@ -10,7 +10,7 @@ #define AQHOMEMQTT_S_SETDATA_H -#include "./aqhome_mqtt.h" +#include "./server.h" #include #include diff --git a/apps/aqhome-mqttlog/xmlread.h b/apps/aqhome-mqttlog/xmlread.h index 1b4f964..ec665d6 100644 --- a/apps/aqhome-mqttlog/xmlread.h +++ b/apps/aqhome-mqttlog/xmlread.h @@ -10,7 +10,6 @@ #define AQHOME_MQTTLOG_XMLREAD_H #include "aqhome-mqttlog/server.h" -#include "aqhome-mqttlog/aqhome_mqtt.h" #include "aqhome-mqttlog/types/device.h" diff --git a/apps/aqhome-mqttlog/xmlwrite.c b/apps/aqhome-mqttlog/xmlwrite.c index 5e9ae67..d6ea5ea 100644 --- a/apps/aqhome-mqttlog/xmlwrite.c +++ b/apps/aqhome-mqttlog/xmlwrite.c @@ -11,7 +11,6 @@ #endif #include "./xmlwrite.h" -#include "./aqhome_mqtt_p.h" #include "aqhome-mqttlog/types/topic.h" #include "aqhome-mqttlog/types/value.h" #include "aqhome-mqttlog/types/translation.h" diff --git a/apps/aqhome-mqttlog/xmlwrite.h b/apps/aqhome-mqttlog/xmlwrite.h index e756fa6..76f4c76 100644 --- a/apps/aqhome-mqttlog/xmlwrite.h +++ b/apps/aqhome-mqttlog/xmlwrite.h @@ -10,7 +10,6 @@ #define AQHOME_MQTTLOG_XMLWRITE_H #include "aqhome-mqttlog/server.h" -#include "aqhome-mqttlog/aqhome_mqtt.h" #include "aqhome-mqttlog/types/device.h" diff --git a/apps/aqhome-react/net_read.c b/apps/aqhome-react/net_read.c index dad8496..edb36af 100644 --- a/apps/aqhome-react/net_read.c +++ b/apps/aqhome-react/net_read.c @@ -12,7 +12,6 @@ #include "./net_read.h" #include "./server_p.h" -#include "aqhome-react/aqhome_react_p.h" #include "aqhome-react/types/unit.h" #include "aqhome-react/units/u_module.h" diff --git a/apps/aqhome-react/net_read.h b/apps/aqhome-react/net_read.h index 52ebff5..53502f3 100644 --- a/apps/aqhome-react/net_read.h +++ b/apps/aqhome-react/net_read.h @@ -10,7 +10,7 @@ #define AQHOMEREACT_NET_READ_H -#include "./aqhome_react.h" +#include "./server.h" int AQH_ReactServer_ReadUnitNetFiles(AQH_OBJECT *aqh); diff --git a/apps/aqhome-react/types/dataobject.h b/apps/aqhome-react/types/dataobject.h index 03e7c31..4f5cf82 100644 --- a/apps/aqhome-react/types/dataobject.h +++ b/apps/aqhome-react/types/dataobject.h @@ -1,6 +1,6 @@ /**************************************************************************** * This file is part of the project AqHome. - * AqHome (c) by 2023 Martin Preuss, all rights reserved. + * AqHome (c) by 2025 Martin Preuss, all rights reserved. * * The license for this file can be found in the file COPYING which you * should have received along with this file. @@ -11,6 +11,7 @@ #include +#include typedef struct AQHREACT_DATAOBJECT AQHREACT_DATAOBJECT; @@ -25,7 +26,7 @@ enum { }; -#include "aqhome-react/aqhome_react.h" +#include "aqhome-react/server.h" diff --git a/apps/aqhome-react/types/param.h b/apps/aqhome-react/types/param.h index 06d3548..85f86ba 100644 --- a/apps/aqhome-react/types/param.h +++ b/apps/aqhome-react/types/param.h @@ -16,7 +16,7 @@ typedef struct AQHREACT_PARAM AQHREACT_PARAM; GWEN_LIST_FUNCTION_DEFS(AQHREACT_PARAM, AQHREACT_Param) -#include "aqhome-react/aqhome_react.h" +#include "aqhome-react/server.h" diff --git a/apps/aqhome-react/types/port.h b/apps/aqhome-react/types/port.h index e53754d..d4fffc6 100644 --- a/apps/aqhome-react/types/port.h +++ b/apps/aqhome-react/types/port.h @@ -16,10 +16,11 @@ typedef struct AQHREACT_PORT AQHREACT_PORT; GWEN_LIST_FUNCTION_DEFS(AQHREACT_PORT, AQHREACT_Port) -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/link.h" #include "aqhome-react/types/dataobject.h" +#include + AQHREACT_PORT *AQHREACT_Port_new(); diff --git a/apps/aqhome-react/types/prgrule.h b/apps/aqhome-react/types/prgrule.h index 70e3be8..ca29998 100644 --- a/apps/aqhome-react/types/prgrule.h +++ b/apps/aqhome-react/types/prgrule.h @@ -1,6 +1,6 @@ /**************************************************************************** * This file is part of the project AqHome. - * AqHome (c) by 2024 Martin Preuss, all rights reserved. + * AqHome (c) by 2025 Martin Preuss, all rights reserved. * * The license for this file can be found in the file COPYING which you * should have received along with this file. @@ -10,7 +10,7 @@ #define AQHOME_REACT_PRGRULE_H -#include "aqhome-react/aqhome_react.h" +#include "aqhome-react/server.h" #include #include diff --git a/apps/aqhome-react/types/unit.h b/apps/aqhome-react/types/unit.h index b4570b8..648ec70 100644 --- a/apps/aqhome-react/types/unit.h +++ b/apps/aqhome-react/types/unit.h @@ -26,7 +26,6 @@ GWEN_INHERIT_FUNCTION_DEFS(AQHREACT_UNIT) #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/port.h" #include "aqhome-react/types/param.h" #include "aqhome-react/types/dataobject.h" diff --git a/apps/aqhome-react/units/u_highpass.h b/apps/aqhome-react/units/u_highpass.h index 8636a3d..b98e4ba 100644 --- a/apps/aqhome-react/units/u_highpass.h +++ b/apps/aqhome-react/units/u_highpass.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" diff --git a/apps/aqhome-react/units/u_logical.h b/apps/aqhome-react/units/u_logical.h index cd6bf43..7b3101d 100644 --- a/apps/aqhome-react/units/u_logical.h +++ b/apps/aqhome-react/units/u_logical.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" diff --git a/apps/aqhome-react/units/u_lowpass.h b/apps/aqhome-react/units/u_lowpass.h index 82fe5d2..5677c15 100644 --- a/apps/aqhome-react/units/u_lowpass.h +++ b/apps/aqhome-react/units/u_lowpass.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" diff --git a/apps/aqhome-react/units/u_module.h b/apps/aqhome-react/units/u_module.h index 72072e2..7a8c487 100644 --- a/apps/aqhome-react/units/u_module.h +++ b/apps/aqhome-react/units/u_module.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" #include diff --git a/apps/aqhome-react/units/u_module_p.h b/apps/aqhome-react/units/u_module_p.h index 9c46f50..51df951 100644 --- a/apps/aqhome-react/units/u_module_p.h +++ b/apps/aqhome-react/units/u_module_p.h @@ -1,6 +1,6 @@ /**************************************************************************** * This file is part of the project AqHome. - * AqHome (c) by 2024 Martin Preuss, all rights reserved. + * AqHome (c) by 2025 Martin Preuss, all rights reserved. * * The license for this file can be found in the file COPYING which you * should have received along with this file. @@ -12,7 +12,6 @@ #include "./u_module.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" #include diff --git a/apps/aqhome-react/units/u_passthrough.h b/apps/aqhome-react/units/u_passthrough.h index 4fff34e..62efffb 100644 --- a/apps/aqhome-react/units/u_passthrough.h +++ b/apps/aqhome-react/units/u_passthrough.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" diff --git a/apps/aqhome-react/units/u_stabilize.h b/apps/aqhome-react/units/u_stabilize.h index 6f51dd7..b7d718a 100644 --- a/apps/aqhome-react/units/u_stabilize.h +++ b/apps/aqhome-react/units/u_stabilize.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" #define AQHOMEREACT_UNIT_STABILIZE_PARAM_HOLDTIME_HIGH "holdTimeHigh" diff --git a/apps/aqhome-react/units/u_statfns.h b/apps/aqhome-react/units/u_statfns.h index 86e5306..0b7c687 100644 --- a/apps/aqhome-react/units/u_statfns.h +++ b/apps/aqhome-react/units/u_statfns.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" diff --git a/apps/aqhome-react/units/u_suntime.h b/apps/aqhome-react/units/u_suntime.h index 3cf8d9c..e3020f0 100644 --- a/apps/aqhome-react/units/u_suntime.h +++ b/apps/aqhome-react/units/u_suntime.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" diff --git a/apps/aqhome-react/units/u_suntime_p.h b/apps/aqhome-react/units/u_suntime_p.h index 6fd98da..0e854f4 100644 --- a/apps/aqhome-react/units/u_suntime_p.h +++ b/apps/aqhome-react/units/u_suntime_p.h @@ -12,7 +12,6 @@ #include "./u_suntime.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" #include diff --git a/apps/aqhome-react/units/u_timeprogram.h b/apps/aqhome-react/units/u_timeprogram.h index 6450d3b..cfc0a1a 100644 --- a/apps/aqhome-react/units/u_timeprogram.h +++ b/apps/aqhome-react/units/u_timeprogram.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" diff --git a/apps/aqhome-react/units/u_timeprogram_p.h b/apps/aqhome-react/units/u_timeprogram_p.h index f01463a..43b60fa 100644 --- a/apps/aqhome-react/units/u_timeprogram_p.h +++ b/apps/aqhome-react/units/u_timeprogram_p.h @@ -12,7 +12,6 @@ #include "./u_timeprogram.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" #include "aqhome-react/types/prgrule.h" diff --git a/apps/aqhome-react/units/u_timer.h b/apps/aqhome-react/units/u_timer.h index 5a6cf59..fddccb5 100644 --- a/apps/aqhome-react/units/u_timer.h +++ b/apps/aqhome-react/units/u_timer.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" diff --git a/apps/aqhome-react/units/u_valuefilter.h b/apps/aqhome-react/units/u_valuefilter.h index 621ef62..15a0e4a 100644 --- a/apps/aqhome-react/units/u_valuefilter.h +++ b/apps/aqhome-react/units/u_valuefilter.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" diff --git a/apps/aqhome-react/units/u_valueset.h b/apps/aqhome-react/units/u_valueset.h index 9b57df6..042dc0b 100644 --- a/apps/aqhome-react/units/u_valueset.h +++ b/apps/aqhome-react/units/u_valueset.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" diff --git a/apps/aqhome-react/units/u_varchanges.h b/apps/aqhome-react/units/u_varchanges.h index a034b88..41c4bf6 100644 --- a/apps/aqhome-react/units/u_varchanges.h +++ b/apps/aqhome-react/units/u_varchanges.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" #include "aqhome/data/value.h" diff --git a/apps/aqhome-react/units/u_varset.c b/apps/aqhome-react/units/u_varset.c index 48852a2..7c7afda 100644 --- a/apps/aqhome-react/units/u_varset.c +++ b/apps/aqhome-react/units/u_varset.c @@ -12,14 +12,14 @@ #include "./u_varset.h" -#include "aqhome/ipc/data/msg_data_set.h" -#include "aqhome/ipc/data/ipc_data.h" +#include "aqhome/msg/ipc/data/m_ipcd_setdata.h" +#include "aqhome/msg/ipc/data/m_ipcd.h" #include #include -#define DEBUG_DRY_RUN 1 /* don't actually set value if "1" */ +#define DEBUG_DRY_RUN 0 /* don't actually set value if "1" */ /* ------------------------------------------------------------------------------------------------ diff --git a/apps/aqhome-react/units/u_varset.h b/apps/aqhome-react/units/u_varset.h index 879cd88..3bb27a7 100644 --- a/apps/aqhome-react/units/u_varset.h +++ b/apps/aqhome-react/units/u_varset.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h" diff --git a/apps/aqhome-react/units/u_zeroposnegstring.h b/apps/aqhome-react/units/u_zeroposnegstring.h index 761389b..2fe56fb 100644 --- a/apps/aqhome-react/units/u_zeroposnegstring.h +++ b/apps/aqhome-react/units/u_zeroposnegstring.h @@ -11,7 +11,6 @@ #include "aqhome-react/server.h" -#include "aqhome-react/aqhome_react.h" #include "aqhome-react/types/unit.h"