From 25efeeb244647e17787f936db872ea0e7702b26b Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Wed, 2 Oct 2024 22:08:16 +0200 Subject: [PATCH] decreased verbosity. --- apps/aqhome-data/c_setdata.c | 24 ++++++++++++------------ apps/aqhome-data/loop.c | 10 +++++----- apps/aqhome-nodes/init.c | 2 ++ aqhome/nodes/nodedb.c | 16 ++++++++-------- 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/apps/aqhome-data/c_setdata.c b/apps/aqhome-data/c_setdata.c index 9143f36..326e8fd 100644 --- a/apps/aqhome-data/c_setdata.c +++ b/apps/aqhome-data/c_setdata.c @@ -46,11 +46,11 @@ static GWEN_MSG_REQUEST *_mkRequest_SetData(AQHOME_DATA *aqh, GWEN_MSG_ENDPOINT *epDriver, const AQH_VALUE *v, const char *data); static void _rqSubRequestFinished(GWEN_MSG_REQUEST *rq, GWEN_MSG_REQUEST *subRq, int reason); -static void _rqAbort(GWEN_MSG_REQUEST *rq); +static void _rqAbort(GWEN_MSG_REQUEST *rq, int reason); static GWEN_MSG_REQUEST *_mkSubRequest_SetData(AQHOME_DATA *aqh, GWEN_MSG_ENDPOINT *epDriver, const AQH_VALUE *v, const char *data); static int _subRqHandleResponse(GWEN_MSG_REQUEST *rq, GWEN_MSG *msg); -static void _subRqAbort(GWEN_MSG_REQUEST *rq); +static void _subRqAbort(GWEN_MSG_REQUEST *rq, int reason); @@ -68,7 +68,7 @@ void AqHomeData_HandleSetData(AQHOME_DATA *aqh, GWEN_MSG_ENDPOINT *epSrc, GWEN_M AQH_VALUE *systemValue; msgId=GWEN_IpcMsg_GetMsgId(recvdMsg); - DBG_ERROR(NULL, "Received IPC SetDataRequest message (msgId=%d)", msgId); + DBG_INFO(NULL, "Received IPC SetDataRequest message (msgId=%d)", msgId); AQH_SetDataIpcMsg_Parse(recvdMsg, 0); recvdValue=AQH_SetDataIpcMsg_ReadValue(recvdMsg); @@ -88,7 +88,7 @@ void AqHomeData_HandleSetData(AQHOME_DATA *aqh, GWEN_MSG_ENDPOINT *epSrc, GWEN_M if (epDriver) { GWEN_MSG_REQUEST *rq; - DBG_ERROR(NULL, "Creating SETDATA request for driver endpoint (%s)", GWEN_MsgEndpoint_GetName(epDriver)); + DBG_DEBUG(NULL, "Creating SETDATA request for driver endpoint (%s)", GWEN_MsgEndpoint_GetName(epDriver)); rq=_mkRequest_SetData(aqh, epSrc, msgId, epDriver, systemValue, valueDataFreeable); AqHomeData_AddRequestToTree(aqh, rq); } @@ -151,7 +151,7 @@ void _rqSubRequestFinished(GWEN_MSG_REQUEST *rq, GWEN_MSG_REQUEST *subRq, int re uint32_t refMsgId; int result; - DBG_ERROR(NULL, "SubRequest finished (reason: %d)", reason); + DBG_DEBUG(NULL, "SubRequest finished (reason: %d)", reason); refMsgId=GWEN_MsgRequest_GetRequestMsgId(rq); ep=GWEN_MsgRequest_GetEndpoint(rq); result=GWEN_MsgRequest_GetResult(subRq); @@ -167,7 +167,7 @@ void _rqSubRequestFinished(GWEN_MSG_REQUEST *rq, GWEN_MSG_REQUEST *subRq, int re -void _rqAbort(GWEN_MSG_REQUEST *rq) +void _rqAbort(GWEN_MSG_REQUEST *rq, int reason) { GWEN_MSG_ENDPOINT *ep; uint32_t refMsgId; @@ -181,7 +181,7 @@ void _rqAbort(GWEN_MSG_REQUEST *rq) rqParent=GWEN_MsgRequest_Tree2_GetParent(rq); if (rqParent) - GWEN_MsgRequest_SubRequestFinished(rqParent, rq, GWEN_MSG_REQUEST_REASON_ABORTED); + GWEN_MsgRequest_SubRequestFinished(rqParent, rq, reason); } @@ -218,13 +218,13 @@ GWEN_MSG_REQUEST *_mkSubRequest_SetData(AQHOME_DATA *aqh, GWEN_MSG_ENDPOINT *epD int _subRqHandleResponse(GWEN_MSG_REQUEST *rq, GWEN_MSG *msg) { - DBG_ERROR(NULL, "Checking message from driver"); + DBG_DEBUG(NULL, "Checking message from driver"); if (GWEN_IpcMsg_GetCode(msg)==AQH_MSGTYPE_IPC_DATA_RESULT) { uint32_t result; GWEN_MSG_REQUEST *rqParent; result=AQH_ResultIpcMsg_GetResultCode(msg); - DBG_ERROR(NULL, "Received result for request: %d", result); + DBG_INFO(NULL, "Received result for request: %d", result); GWEN_MsgRequest_SetResult(rq, result); GWEN_MsgRequest_SetState(rq, GWEN_MSG_REQUEST_STATE_DONE); rqParent=GWEN_MsgRequest_Tree2_GetParent(rq); @@ -241,18 +241,18 @@ int _subRqHandleResponse(GWEN_MSG_REQUEST *rq, GWEN_MSG *msg) -void _subRqAbort(GWEN_MSG_REQUEST *rq) +void _subRqAbort(GWEN_MSG_REQUEST *rq, int reason) { GWEN_MSG_REQUEST *rqParent; - DBG_ERROR(NULL, "Aborting request"); + DBG_INFO(NULL, "Aborting request"); GWEN_MsgRequest_SetResult(rq, AQH_MSG_IPC_ERROR_GENERIC); GWEN_MsgRequest_SetState(rq, GWEN_MSG_REQUEST_STATE_DONE); rqParent=GWEN_MsgRequest_Tree2_GetParent(rq); if (rqParent) - GWEN_MsgRequest_SubRequestFinished(rqParent, rq, GWEN_MSG_REQUEST_REASON_ABORTED); + GWEN_MsgRequest_SubRequestFinished(rqParent, rq, reason); } diff --git a/apps/aqhome-data/loop.c b/apps/aqhome-data/loop.c index 275ed86..f86c4d9 100644 --- a/apps/aqhome-data/loop.c +++ b/apps/aqhome-data/loop.c @@ -214,11 +214,11 @@ void _handleIpcEndpoint(AQHOME_DATA *aqh, GWEN_MSG_ENDPOINT *ep) GWEN_MSG *msg; while( (msg=GWEN_MsgEndpoint_TakeFirstReceivedMessage(ep)) ) { - DBG_ERROR(NULL, "Got IPS message %d (msgId=%d, refMsgId=%d) [%s]", - GWEN_IpcMsg_GetCode(msg), - GWEN_IpcMsg_GetMsgId(msg), - GWEN_IpcMsg_GetRefMsgId(msg), - GWEN_MsgEndpoint_GetName(ep)); + DBG_INFO(NULL, "Got IPS message %d (msgId=%d, refMsgId=%d) [%s]", + GWEN_IpcMsg_GetCode(msg), + GWEN_IpcMsg_GetMsgId(msg), + GWEN_IpcMsg_GetRefMsgId(msg), + GWEN_MsgEndpoint_GetName(ep)); if (AQH_Requests_HandleIpcMsg(aqh->requestTree, ep, msg)!=GWEN_MSG_REQUEST_RESULT_HANDLED) _handleIpcMsg(aqh, ep, msg); GWEN_Msg_free(msg); diff --git a/apps/aqhome-nodes/init.c b/apps/aqhome-nodes/init.c index a8e30ef..8409090 100644 --- a/apps/aqhome-nodes/init.c +++ b/apps/aqhome-nodes/init.c @@ -121,6 +121,7 @@ int AqHomed_Init(AQHOMED *aqh, int argc, char **argv) DBG_ERROR(NULL, "Error loading device list(%d)", rv); return rv; } +#if 0 else { GWEN_BUFFER *dbuf; @@ -129,6 +130,7 @@ int AqHomed_Init(AQHOMED *aqh, int argc, char **argv) fprintf(stdout, "%s\n", GWEN_Buffer_GetStart(dbuf)); GWEN_Buffer_free(dbuf); } +#endif _setupDb(aqh, dbArgs); diff --git a/aqhome/nodes/nodedb.c b/aqhome/nodes/nodedb.c index 51b4462..99340e2 100644 --- a/aqhome/nodes/nodedb.c +++ b/aqhome/nodes/nodedb.c @@ -94,7 +94,7 @@ int AQH_NodeDb_AddNodeInfo(AQH_NODE_DB *ndb, AQH_NODE_INFO *ni) } #endif - DBG_INFO(AQH_LOGDOMAIN, "Adding node UID=%08x BUSADDR=%02x", (unsigned int) uid, busAddr); + DBG_NOTICE(AQH_LOGDOMAIN, "Adding node UID=%08x BUSADDR=%02x", (unsigned int) uid, busAddr); AQH_NodeInfo_List_Add(ni, ndb->nodeList); AQH_NodeDb_SetModified(ndb); return 0; @@ -151,13 +151,13 @@ void AQH_NodeDb_fromDb(AQH_NODE_DB *ndb, GWEN_DB_NODE *dbDatabase) const char *deviceId; deviceId=AQH_NodeInfo_GetDeviceId(ni); - DBG_ERROR(AQH_LOGDOMAIN, - "Adding node %08x (%s, %04x:%02x:%04x)", - AQH_NodeInfo_GetUid(ni), - deviceId?deviceId:"", - AQH_NodeInfo_GetManufacturer(ni), - AQH_NodeInfo_GetDeviceType(ni), - AQH_NodeInfo_GetDeviceVersion(ni)); + DBG_NOTICE(AQH_LOGDOMAIN, + "Adding node %08x (%s, %04x:%02x:%04x)", + AQH_NodeInfo_GetUid(ni), + deviceId?deviceId:"", + AQH_NodeInfo_GetManufacturer(ni), + AQH_NodeInfo_GetDeviceType(ni), + AQH_NodeInfo_GetDeviceVersion(ni)); AQH_NodeInfo_List_Add(ni, ndb->nodeList); }