domo/domo-iot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add test for shutter objects.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2020-01-08 12:36:40 +01:00
parent c3891cd0c2
commit dd4f3ce3bb
7 changed files with 201 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/devices/devices_manager.c
View File

@@ -84,7 +84,7 @@ void devices_manager_free(devices_manager_t *devices_manager)
i = 0;
while (qlist_getnext(devices_manager->outlets, &obj, true))
{
sprinkler_free(obj.data);
outlet_dio_free(obj.data);
i++;
}
qlist_free(devices_manager->outlets);
@@ -94,7 +94,7 @@ void devices_manager_free(devices_manager_t *devices_manager)
i = 0;
while (qlist_getnext(devices_manager->shutters, &obj, true))
{
sprinkler_free(obj.data);
shutter_free(obj.data);
i++;
}
qlist_free(devices_manager->shutters);
@@ -206,10 +206,31 @@ char *devices_manager_get_by_id(devices_manager_t *dm, const char *capability, u
if (capability == kOutletEntry)
{
outlet_dio_t *outlet_dio;
outlet_dio = get_outlet_by_id(dm, id);
if (outlet_dio != NULL)
{
json_object *output_node = outlet_dio_to_json_object(outlet_dio);
if (output_node != NULL)
{
output = strdup(json_object_to_json_string(output_node));
json_object_put(output_node);
}
}
}
else if (capability == kShutterEntry)
{
shutter_t *shutter;
shutter = get_shutter_by_id(dm, id);
if (shutter != NULL)
{
json_object *output_node = shutter_to_json_object(shutter);
if (output_node != NULL)
{
output = strdup(json_object_to_json_string(output_node));
json_object_put(output_node);
}
}
}
else if (capability == kSprinklerEntry)
{
@@ -221,7 +242,6 @@ char *devices_manager_get_by_id(devices_manager_t *dm, const char *capability, u
if (output_node != NULL)
{
output = strdup(json_object_to_json_string(output_node));
json_object_put(output_node);
}
}