Fix indents troubles
This commit is contained in:
@@ -199,7 +199,7 @@ char *devices_manager_get(devices_manager_t *dm, const char *capability)
|
|||||||
|
|
||||||
if (capability == kOutletEntry)
|
if (capability == kOutletEntry)
|
||||||
{
|
{
|
||||||
output_node = devices_manager_outlets_to_json_object(dm);
|
output_node = devices_manager_outlets_to_json_object(dm);
|
||||||
}
|
}
|
||||||
else if (capability == kShutterEntry)
|
else if (capability == kShutterEntry)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -242,7 +242,7 @@ struct json_object *devices_manager_outlets_to_json_object(devices_manager_t *dm
|
|||||||
while (qlist_getnext(dm->outlets, &obj, false))
|
while (qlist_getnext(dm->outlets, &obj, false))
|
||||||
{
|
{
|
||||||
outlet = obj.data;
|
outlet = obj.data;
|
||||||
json_object_array_add(root_node, outlet_dio_to_json_object(outlet));
|
json_object_array_add(root_node, outlet_dio_to_json_object(outlet));
|
||||||
}
|
}
|
||||||
|
|
||||||
return root_node;
|
return root_node;
|
||||||
@@ -444,7 +444,7 @@ struct json_object *devices_manager_shutters_to_json_object(devices_manager_t *d
|
|||||||
while (qlist_getnext(dm->shutters, &obj, false))
|
while (qlist_getnext(dm->shutters, &obj, false))
|
||||||
{
|
{
|
||||||
shutter = obj.data;
|
shutter = obj.data;
|
||||||
json_object_array_add(root_node, shutter_to_json_object(shutter));
|
json_object_array_add(root_node, shutter_to_json_object(shutter));
|
||||||
}
|
}
|
||||||
|
|
||||||
return root_node;
|
return root_node;
|
||||||
@@ -664,7 +664,7 @@ struct json_object *devices_manager_sprinklers_to_json_object(devices_manager_t
|
|||||||
while (qlist_getnext(dm->sprinklers, &obj, false))
|
while (qlist_getnext(dm->sprinklers, &obj, false))
|
||||||
{
|
{
|
||||||
sprinkler = obj.data;
|
sprinkler = obj.data;
|
||||||
json_object_array_add(root_node, sprinkler_to_json_object(sprinkler));
|
json_object_array_add(root_node, sprinkler_to_json_object(sprinkler));
|
||||||
}
|
}
|
||||||
|
|
||||||
return root_node;
|
return root_node;
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ struct json_object;
|
|||||||
|
|
||||||
/*--------------------------- PUBLIC FUNCTIONS -------------------------------*/
|
/*--------------------------- PUBLIC FUNCTIONS -------------------------------*/
|
||||||
|
|
||||||
|
|
||||||
/*-------------------------------- OUTLETS -----------------------------------*/
|
/*-------------------------------- OUTLETS -----------------------------------*/
|
||||||
extern int load_outlets(devices_manager_t *dm, struct json_object *node);
|
extern int load_outlets(devices_manager_t *dm, struct json_object *node);
|
||||||
extern struct json_object *save_outlets(devices_manager_t *dm);
|
extern struct json_object *save_outlets(devices_manager_t *dm);
|
||||||
|
|||||||
@@ -44,30 +44,30 @@
|
|||||||
|
|
||||||
shutter_t *shutter_new(void)
|
shutter_t *shutter_new(void)
|
||||||
{
|
{
|
||||||
shutter_t *shutter = NEW_OBJECT(shutter_t);
|
shutter_t *shutter = NEW_OBJECT(shutter_t);
|
||||||
if (shutter == NULL)
|
if (shutter == NULL)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
bzero((void *)shutter, sizeof(shutter_t));
|
bzero((void *)shutter, sizeof(shutter_t));
|
||||||
|
|
||||||
shutter->outlet_dio = outlet_dio_new();
|
shutter->outlet_dio = outlet_dio_new();
|
||||||
|
|
||||||
return shutter;
|
return shutter;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------------------------------*/
|
/*--------------------------------------------------------------------------*/
|
||||||
|
|
||||||
void shutter_free(shutter_t *shutter)
|
void shutter_free(shutter_t *shutter)
|
||||||
{
|
{
|
||||||
if (shutter == NULL)
|
if (shutter == NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (shutter->outlet_dio != NULL)
|
if (shutter->outlet_dio != NULL)
|
||||||
outlet_dio_free(shutter->outlet_dio);
|
outlet_dio_free(shutter->outlet_dio);
|
||||||
|
|
||||||
free(shutter);
|
free(shutter);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------------------------------*/
|
/*--------------------------------------------------------------------------*/
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ typedef struct shutter_s shutter_t;
|
|||||||
*/
|
*/
|
||||||
struct shutter_s
|
struct shutter_s
|
||||||
{
|
{
|
||||||
outlet_dio_t *outlet_dio;
|
outlet_dio_t *outlet_dio;
|
||||||
uint8_t speed_up;
|
uint8_t speed_up;
|
||||||
uint8_t speed_down;
|
uint8_t speed_down;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user