emgauwa/core-legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add: commands

Browse source 
fix: timezone problem
This commit is contained in:
Tobias Reisinger 2020-05-07 01:38:13 +02:00
parent 0edb16a2d5
commit 10e41ca166
11 changed files with 209 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
models/controller.c
View file

@ -235,7 +235,14 @@ controller_to_json(controller_t *controller)
}
cJSON_AddItemToObject(json, "active", json_active);
//TODO add relays
relay_t **relays = relay_get_by_controller_id(controller->id);
cJSON *json_relays = cJSON_CreateArray();
for(int i = 0; relays[i] != NULL; ++i)
{
cJSON_AddItemToArray(json_relays, relay_to_json(relays[i]));
}
cJSON_AddItemToObject(json, "relays", json_relays);
relay_free_list(relays);
return json;
}

4
models/relay.c
View file

@ -169,7 +169,9 @@ relay_remove(relay_t *relay)
void
relay_reload_active_schedule(relay_t *relay)
{
relay->active_schedule = relay->schedules[helper_get_weekday(time(NULL))];
time_t timestamp = time(NULL);
struct tm *time_struct = localtime(&timestamp);
relay->active_schedule = relay->schedules[helper_get_weekday(time_struct)];
}
void