diff --git a/src/prog/domod/src/devices/light-device.cpp b/src/prog/domod/src/devices/light-device.cpp index eadc6d1c..e64addc8 100644 --- a/src/prog/domod/src/devices/light-device.cpp +++ b/src/prog/domod/src/devices/light-device.cpp @@ -51,13 +51,12 @@ LightDevice::~LightDevice(void) { } - /*! ---------------------------------------------------------------------------- * @fn operator[] * - * @brief to access to a specific light opbject. + * @brief to access to a specific light object. */ -Light& LightDevice::operator[] (int a_pos) +Light& LightDevice::operator[](int a_pos) { return m_lights[a_pos]; } diff --git a/src/prog/domod/src/devices/light-device.h b/src/prog/domod/src/devices/light-device.h index 2f217dee..1c43f0cd 100644 --- a/src/prog/domod/src/devices/light-device.h +++ b/src/prog/domod/src/devices/light-device.h @@ -41,7 +41,7 @@ class LightDevice : public Device LightDevice(void); ~LightDevice(void); - Light& operator[] (int a_pos); + Light& operator[](int a_pos); uint16_t size(void); diff --git a/src/prog/domod/src/devices/shutter-device.cpp b/src/prog/domod/src/devices/shutter-device.cpp index 1bdb3a51..6fa836ff 100644 --- a/src/prog/domod/src/devices/shutter-device.cpp +++ b/src/prog/domod/src/devices/shutter-device.cpp @@ -51,6 +51,50 @@ ShutterDevice::~ShutterDevice(void) { } +/*! ---------------------------------------------------------------------------- + * @fn operator[] + * + * @brief to access to a specific shutter object. + */ +Shutter& ShutterDevice::operator[] (int a_pos) +{ + return m_shutters[a_pos]; +} + +/*! ---------------------------------------------------------------------------- + * @fn size + * + * @brief return the size of the shutter devices. + */ +uint16_t ShutterDevice::size(void) +{ + return m_shutters.size(); +} + +/*! ---------------------------------------------------------------------------- + * @fn size + * + * @brief return the size of the light devices. + */ +int ShutterDevice::find(int a_pos) +{ + std::vector::iterator the_shutter_it; + int the_status = -1; + int the_pos = 0; + + for (the_shutter_it = m_shutters.begin(); the_shutter_it != m_shutters.end(); the_shutter_it++) + { + if ((*the_shutter_it).get_id() == a_pos) + { + return the_pos; + } + + the_pos++; + } + + return the_status; +} + /*! ---------------------------------------------------------------------------- * @fn from_json * diff --git a/src/prog/domod/src/devices/shutter-device.h b/src/prog/domod/src/devices/shutter-device.h index 0dd9f2fb..fbfea3db 100644 --- a/src/prog/domod/src/devices/shutter-device.h +++ b/src/prog/domod/src/devices/shutter-device.h @@ -41,6 +41,12 @@ class ShutterDevice : public Device ShutterDevice(void); ~ShutterDevice(void); + Shutter& operator[](int a_pos); + + uint16_t size(void); + + int find(int a_pos); + int from_json(struct json_object *a_node); struct json_object *to_json(void); diff --git a/src/prog/domod/src/devices/sprinkler-device.h b/src/prog/domod/src/devices/sprinkler-device.h index 0148b702..52bedc29 100644 --- a/src/prog/domod/src/devices/sprinkler-device.h +++ b/src/prog/domod/src/devices/sprinkler-device.h @@ -42,6 +42,12 @@ class SprinklerDevice : public Device SprinklerDevice(void); ~SprinklerDevice(void); + Sprinkler& operator[](int a_pos); + + uint16_t size(void); + + int find(int a_pos); + int from_json(struct json_object *a_node); struct json_object *to_json(void);