Skip to content
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

Send read init messages after restart #759

Merged
merged 2 commits into from
Jan 29, 2024
Merged

Send read init messages after restart #759

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68ff55b
Send read init messages after restart
FrankZRS Jan 29, 2024
3f30ae4
Implement delayed restart
FrankZRS Jan 29, 2024
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
64 changes: 35 additions & 29 deletions api/oc_knx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,34 +89,6 @@ convert_cmd(char *cmd)
return 0;
}

int
restart_device(size_t device_index)
{
PRINT("restart device\n");

// reset the programming mode
oc_device_info_t *device = oc_core_get_device_info(device_index);
if (device == NULL) {
OC_ERR("device not found %d", (int)device_index);
} else {
device->pm = false;
}

// clear run time errors
// ??

// switch off safe state
// ??

oc_restart_t *my_restart = oc_get_restart_cb();
if (my_restart && my_restart->cb) {
// do a restart on application level
my_restart->cb(device_index, my_restart->data);
}

return 0;
}

int
oc_reset_device(size_t device_index, int value)
{
Expand Down Expand Up @@ -199,6 +171,38 @@ delayed_reset(void *context)
return OC_EVENT_DONE;
}

int
delayed_restart(void *context)
{
PRINT("restart device\n");

// reset the programming mode
oc_device_info_t *device = oc_core_get_device_info(cached_device_index);
if (device == NULL) {
OC_ERR("device not found %d", (int)cached_device_index);
} else {
device->pm = false;
}

// clear run time errors
// ??

// switch off safe state
// ??

// oc_knx_device_storage_read(cached_device_index);
// oc_init_oscore_from_storage(cached_device_index, true);
oc_init_datapoints_at_initialization();

oc_restart_t *my_restart = oc_get_restart_cb();
if (my_restart && my_restart->cb) {
// do a restart on application level
my_restart->cb(cached_device_index, my_restart->data);
}

return 0;
}

static void
oc_core_knx_post_handler(oc_request_t *request, oc_interface_mask_t iface_mask,
void *data)
Expand Down Expand Up @@ -252,7 +256,9 @@ oc_core_knx_post_handler(oc_request_t *request, oc_interface_mask_t iface_mask,
size_t device_index = request->resource->device;

if (cmd == RESTART_DEVICE) {
restart_device(device_index);
cached_device_index = device_index;
cached_value = value;
oc_set_delayed_callback_ms(NULL, delayed_restart, 100);
error = false;
} else if (cmd == RESET_DEVICE) {
// oc_reset_device(device_index, value);
Expand Down
Loading