Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
11 changes: 1 addition & 10 deletions src/LogicChannel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)
{
Expand Down Expand Up @@ -2870,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)

Expand Down
2 changes: 0 additions & 2 deletions src/LogicChannel.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down