From 55beacca200a7bbcede405d1a631869ddb236d29 Mon Sep 17 00:00:00 2001 From: Waldemar Porscha Date: Tue, 11 Nov 2025 00:39:43 +0100 Subject: [PATCH 1/3] Update liebrary.json --- library.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library.json b/library.json index e47f554..e1a09c6 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "OFM-LogicModule", - "version": "3.7.3", + "version": "3.8.0", "description": "Logic module for the knx stack, can be embedded in an ETS application", "homepage": "https://openknx.de", "authors": { From 9a162c17afdc5c915dc91bd09263894e65da44ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cornelius=20K=C3=B6pp?= Date: Sat, 9 Aug 2025 22:32:00 +0200 Subject: [PATCH 2/3] Debug-Logging: Remove Old Prefix "Cnn" for Channels --- src/LogicChannel.cpp | 9 --------- src/LogicChannel.h | 2 -- 2 files changed, 11 deletions(-) diff --git a/src/LogicChannel.cpp b/src/LogicChannel.cpp index 98ed171..9a1001f 100644 --- a/src/LogicChannel.cpp +++ b/src/LogicChannel.cpp @@ -30,10 +30,6 @@ LogicChannel::LogicChannel(uint8_t iChannelNumber) pTriggerIO = 0; pCurrentIn = BIT_INITIAL_GATE; pCurrentOut = BIT_OUTPUT_INITIAL; // tri-state output, at the beginning we are undefined - pLogPrefix[0] = 'C'; - pLogPrefix[1] = '0' + (iChannelNumber + 1) / 10; - pLogPrefix[2] = '0' + (iChannelNumber + 1) % 10; - pLogPrefix[3] = 0; } LogicChannel::~LogicChannel() @@ -44,11 +40,6 @@ LogicChannel::~LogicChannel() * Debug helper * ***************************/ -const std::string LogicChannel::logPrefix() -{ - return std::string(pLogPrefix); -} - #if LOGIC_TRACE char *LogicChannel::logTimeBase(uint16_t iParamIndex) { diff --git a/src/LogicChannel.h b/src/LogicChannel.h index 4a9e9a3..3035e1f 100644 --- a/src/LogicChannel.h +++ b/src/LogicChannel.h @@ -328,8 +328,6 @@ class LogicChannel : public OpenKNX::Channel static TimerRestore &sTimerRestore; // instance - char pLogPrefix[4]; - virtual const std::string logPrefix() override; /* Runtime information per channel */ uint8_t pTriggerIO; // Bitfield: Which input (0-3) triggered processing, Bit 4-7 are not used uint8_t pValidActiveIO; // Bitfield: validity flags for input (0-3) values and active inputs (4-7) From 282de4ac75931579ea41840b75069fcdfa420e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cornelius=20K=C3=B6pp?= Date: Sat, 9 Aug 2025 22:38:03 +0200 Subject: [PATCH 3/3] Debug-Logging (TimerRestore): Remove Channel Number from Day Processing Old: "Processing TimerRestore on Channel %d for Day %02d.%02d.%02d" New: "Processing TimerRestore for Day %04d-%02d-%02d" --- src/LogicChannel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LogicChannel.cpp b/src/LogicChannel.cpp index 9a1001f..5859ab8 100644 --- a/src/LogicChannel.cpp +++ b/src/LogicChannel.cpp @@ -2861,7 +2861,7 @@ void LogicChannel::processTimerRestoreState(TimerRestore &iTimer) if (lIterationIndicator) pCurrentPipeline |= PIP_TIMER_RESTORE_STEP; - logInfoP("Processing TimerRestore on Channel %d for Day %02d.%02d.%02d", channelIndex() + 1, iTimer.getDay(), iTimer.getMonth(), iTimer.getYear()); + logInfoP("Processing TimerRestore for Day %04d-%02d-%02d", iTimer.getYear(), iTimer.getMonth(), iTimer.getDay()); // first we process settings valid for whole timer // vacation is not processed (always skipped)