Skip to content

Add timer compensation in level control cluster #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: SVE2/development
Choose a base branch
from
Open

Add timer compensation in level control cluster #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 30 additions & 4 deletions src/app/clusters/level-control/level-control.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ typedef struct

static EmberAfLevelControlState stateTable[kLevelControlStateTableSize];

static chip::System::Clock::Timestamp nextTimestamp;

static EmberAfLevelControlState * getState(EndpointId endpoint);

static EmberAfStatus moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8_t level,
Expand Down Expand Up @@ -139,6 +141,27 @@ static void timerCallback(System::Layer *, void * callbackContext)
emberAfLevelControlClusterServerTickCallback(static_cast<EndpointId>(reinterpret_cast<uintptr_t>(callbackContext)));
}

static uint32_t calculateNextTimestampMs(int32_t delayMs)
{
int32_t waitTime, latency;
const chip::System::Clock::Timestamp currentTime = chip::System::SystemClock().GetMonotonicTimestamp();

latency = (int32_t)currentTime.count() - (int32_t)nextTimestamp.count();

if(latency > delayMs)
{
waitTime = 0;
}
else
{
waitTime = delayMs - latency;
}

nextTimestamp += chip::System::Clock::Milliseconds32(delayMs);

return (uint32_t)waitTime;
}

static void schedule(EndpointId endpoint, uint32_t delayMs)
{
DeviceLayer::SystemLayer().StartTimer(chip::System::Clock::Milliseconds32(delayMs), timerCallback,
Expand Down Expand Up @@ -271,7 +294,7 @@ void emberAfLevelControlClusterServerTickCallback(EndpointId endpoint)
else
{
writeRemainingTime(endpoint, static_cast<uint16_t>(state->transitionTimeMs - state->elapsedTimeMs));
schedule(endpoint, state->eventDurationMs);
schedule(endpoint, calculateNextTimestampMs(state->eventDurationMs));
}
}

Expand Down Expand Up @@ -702,7 +725,8 @@ static EmberAfStatus moveToLevelHandler(EndpointId endpoint, CommandId commandId
state->storedLevel = storedLevel;

// The setup was successful, so mark the new state as active and return.
schedule(endpoint, state->eventDurationMs);
nextTimestamp = chip::System::SystemClock().GetMonotonicTimestamp();
schedule(endpoint, calculateNextTimestampMs(state->eventDurationMs));
status = EMBER_ZCL_STATUS_SUCCESS;

if (commandId == Commands::MoveToLevelWithOnOff::Id)
Expand Down Expand Up @@ -828,7 +852,8 @@ static void moveHandler(EndpointId endpoint, CommandId commandId, uint8_t moveMo
state->storedLevel = INVALID_STORED_LEVEL;

// The setup was successful, so mark the new state as active and return.
schedule(endpoint, state->eventDurationMs);
nextTimestamp = chip::System::SystemClock().GetMonotonicTimestamp();
schedule(endpoint, calculateNextTimestampMs(state->eventDurationMs));
status = EMBER_ZCL_STATUS_SUCCESS;

send_default_response:
Expand Down Expand Up @@ -954,7 +979,8 @@ static void stepHandler(EndpointId endpoint, CommandId commandId, uint8_t stepMo
state->storedLevel = INVALID_STORED_LEVEL;

// The setup was successful, so mark the new state as active and return.
schedule(endpoint, state->eventDurationMs);
nextTimestamp = chip::System::SystemClock().GetMonotonicTimestamp();
schedule(endpoint, calculateNextTimestampMs(state->eventDurationMs));
status = EMBER_ZCL_STATUS_SUCCESS;

send_default_response:
Expand Down