From 56f6ac3f17b48c36cb6263714cdf25e595a58b50 Mon Sep 17 00:00:00 2001 From: Jin Yoon Date: Thu, 7 Sep 2017 11:49:49 +0900 Subject: [PATCH] Sync between master and template --- CMakeLists.txt | 1 + inc/connectivity.h | 6 +-- inc/resource.h | 1 + inc/resource/resource_gas_detection_sensor.h | 34 +++++++++++++ .../resource_gas_detection_sensor_internal.h | 31 ++++++++++++ inc/resource/resource_illuminance_sensor.h | 2 +- inc/resource/resource_infrared_motion_sensor.h | 2 +- .../resource_infrared_obstacle_avoidance_sensor.h | 2 +- inc/resource/resource_touch_sensor.h | 2 +- inc/resource_internal.h | 1 + src/connectivity.c | 1 + src/resource/resource_gas_detection_sensor.c | 58 ++++++++++++++++++++++ 12 files changed, 134 insertions(+), 7 deletions(-) create mode 100644 inc/resource/resource_gas_detection_sensor.h create mode 100644 inc/resource/resource_gas_detection_sensor_internal.h create mode 100644 src/resource/resource_gas_detection_sensor.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 3579b02..f86c5a1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,6 +54,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${PROJECT_ROOT_DIR}/src/resource/resource_rain_sensor.c ${PROJECT_ROOT_DIR}/src/resource/resource_sound_detection_sensor.c ${PROJECT_ROOT_DIR}/src/resource/resource_tilt_sensor.c + ${PROJECT_ROOT_DIR}/src/resource/resource_gas_detection_sensor.c ) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -lm) diff --git a/inc/connectivity.h b/inc/connectivity.h index ca1aa2f..b88f83a 100644 --- a/inc/connectivity.h +++ b/inc/connectivity.h @@ -50,7 +50,7 @@ extern int connectivity_set_resource(const char *path, const char *type, connect extern void connectivity_unset_resource(connectivity_resource_s *resource); /** - * @brief Notifies specific clients that resource's attributes have changed with boolean vaule. + * @brief Notifies specific clients that resource's attributes have changed with boolean value. * @param[in] resource_info A structure containing information about connectivity resource * @param[in] key A new key to be added into attributes * @param[in] value A boolean value to be added into attributes @@ -60,7 +60,7 @@ extern void connectivity_unset_resource(connectivity_resource_s *resource); extern int connectivity_notify_bool(connectivity_resource_s *resource_info, const char *key, bool value); /** - * @brief Notifies specific clients that resource's attributes have changed with int vaule. + * @brief Notifies specific clients that resource's attributes have changed with int value. * @param[in] resource_info A structure containing information about connectivity resource * @param[in] key A new key to be added into attributes * @param[in] value A int value to be added into attributes @@ -70,7 +70,7 @@ extern int connectivity_notify_bool(connectivity_resource_s *resource_info, cons extern int connectivity_notify_int(connectivity_resource_s *resource_info, const char *key, int value); /** - * @brief Notifies specific clients that resource's attributes have changed with double vaule. + * @brief Notifies specific clients that resource's attributes have changed with double value. * @param[in] resource_info A structure containing information about connectivity resource * @param[in] key A new key to be added into attributes * @param[in] value A double value to be added into attributes diff --git a/inc/resource.h b/inc/resource.h index 5b6871a..4b41dfb 100755 --- a/inc/resource.h +++ b/inc/resource.h @@ -36,5 +36,6 @@ #include "resource/resource_rain_sensor.h" #include "resource/resource_sound_detection_sensor.h" #include "resource/resource_tilt_sensor.h" +#include "resource/resource_gas_detection_sensor.h" #endif /* __POSITION_FINDER_RESOURCE_H__ */ diff --git a/inc/resource/resource_gas_detection_sensor.h b/inc/resource/resource_gas_detection_sensor.h new file mode 100644 index 0000000..3dd7787 --- /dev/null +++ b/inc/resource/resource_gas_detection_sensor.h @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * + * Contact: Jin Yoon + * Geunsun Lee + * Eunyoung Lee + * Junkyu Han + * + * Licensed under the Flora License, Version 1.1 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://floralicense.org/license/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __POSITION_FINDER_RESOURCE_GAS_DETECTION_SENSOR_H__ +#define __POSITION_FINDER_RESOURCE_GAS_DETECTION_SENSOR_H__ + +/** + * @brief Reads the value of gpio connected to the gas detection sensor(fc-22). + * @param[in] pin_num The number of the gpio pin connected to the digital pin of gas detection sensor + * @param[out] out_value The value of the gpio (zero or non-zero) + * @return 0 on success, otherwise a negative error value + * @see If the gpio pin is not open, creates gpio handle before reading the value of gpio. + */ +extern int resource_read_gas_detection_sensor(int pin_num, int *out_value); + +#endif /* __POSITION_FINDER_RESOURCE_GAS_DETECTION_SENSOR_H__ */ diff --git a/inc/resource/resource_gas_detection_sensor_internal.h b/inc/resource/resource_gas_detection_sensor_internal.h new file mode 100644 index 0000000..9a91007 --- /dev/null +++ b/inc/resource/resource_gas_detection_sensor_internal.h @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * + * Contact: Jin Yoon + * Geunsun Lee + * Eunyoung Lee + * Junkyu Han + * + * Licensed under the Flora License, Version 1.1 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://floralicense.org/license/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __POSITION_FINDER_RESOURCE_GAS_DETECTION_SENSOR_INTERNAL_H__ +#define __POSITION_FINDER_RESOURCE_GAS_DETECTION_SENSOR_INTERNAL_H__ + +/** + * @brief Releases the gpio handle and changes the gpio pin state to the close(0). + * @param[in] pin_num The number of the gpio pin connected to the gas detection sensor + */ +extern void resource_close_gas_detection_sensor(int pin_num); + +#endif /* __POSITION_FINDER_RESOURCE_GAS_DETECTION_SENSOR_INTERNAL_H__ */ diff --git a/inc/resource/resource_illuminance_sensor.h b/inc/resource/resource_illuminance_sensor.h index 2e8925d..f3329a5 100644 --- a/inc/resource/resource_illuminance_sensor.h +++ b/inc/resource/resource_illuminance_sensor.h @@ -25,7 +25,7 @@ /** * @brief Reads the value of i2c bus connected illuminance sensor. * @param[in] i2c_bus The i2c bus number that the slave device is connected - * @param[out] out_value The vaule read by the illuminance sensor + * @param[out] out_value The value read by the illuminance sensor * @return 0 on success, otherwise a negative error value * @see If the i2c bus is not open, creates i2c handle before reading data from the i2c slave device. */ diff --git a/inc/resource/resource_infrared_motion_sensor.h b/inc/resource/resource_infrared_motion_sensor.h index 6f9ff36..a6ed278 100644 --- a/inc/resource/resource_infrared_motion_sensor.h +++ b/inc/resource/resource_infrared_motion_sensor.h @@ -25,7 +25,7 @@ /** * @brief Reads the value of gpio connected infrared motion sensor(HC-SR501). * @param[in] pin_num The number of the gpio pin connected to the infrared motion sensor - * @param[out] out_value The vaule of the gpio (zero or non-zero) + * @param[out] out_value The value of the gpio (zero or non-zero) * @return 0 on success, otherwise a negative error value * @see If the gpio pin is not open, creates gpio handle before reading the value of gpio. */ diff --git a/inc/resource/resource_infrared_obstacle_avoidance_sensor.h b/inc/resource/resource_infrared_obstacle_avoidance_sensor.h index dd25e25..5c8bab1 100644 --- a/inc/resource/resource_infrared_obstacle_avoidance_sensor.h +++ b/inc/resource/resource_infrared_obstacle_avoidance_sensor.h @@ -25,7 +25,7 @@ /** * @brief Reads the value of gpio connected infrared obstacle avoidance sensor. * @param[in] pin_num The number of the gpio pin connected to the infrared obstacle avoidance sensor - * @param[out] out_value The vaule of the gpio (zero or non-zero) + * @param[out] out_value The value of the gpio (zero or non-zero) * @return 0 on success, otherwise a negative error value * @see If the gpio pin is not open, creates gpio handle before reading the value of gpio. */ diff --git a/inc/resource/resource_touch_sensor.h b/inc/resource/resource_touch_sensor.h index ea2866f..2cd76d2 100644 --- a/inc/resource/resource_touch_sensor.h +++ b/inc/resource/resource_touch_sensor.h @@ -25,7 +25,7 @@ /** * @brief Reads the value of gpio connected touch sensor. * @param[in] pin_num The number of the gpio pin connected to the touch sensor - * @param[out] out_value The vaule of the gpio (zero or non-zero) + * @param[out] out_value The value of the gpio (zero or non-zero) * @return 0 on success, otherwise a negative error value * @see If the gpio pin is not open, creates gpio handle before reading the value of gpio. */ diff --git a/inc/resource_internal.h b/inc/resource_internal.h index beb84e3..cb751b5 100755 --- a/inc/resource_internal.h +++ b/inc/resource_internal.h @@ -35,6 +35,7 @@ #include "resource/resource_rain_sensor_internal.h" #include "resource/resource_sound_detection_sensor_internal.h" #include "resource/resource_tilt_sensor_internal.h" +#include "resource/resource_gas_detection_sensor_internal.h" #define PIN_MAX 40 diff --git a/src/connectivity.c b/src/connectivity.c index a017aa1..1c33e5e 100644 --- a/src/connectivity.c +++ b/src/connectivity.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "log.h" #include "connectivity.h" diff --git a/src/resource/resource_gas_detection_sensor.c b/src/resource/resource_gas_detection_sensor.c new file mode 100644 index 0000000..ae7a97b --- /dev/null +++ b/src/resource/resource_gas_detection_sensor.c @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * + * Contact: Jin Yoon + * Geunsun Lee + * Eunyoung Lee + * Junkyu Han + * + * Licensed under the Flora License, Version 1.1 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://floralicense.org/license/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include + +#include "log.h" +#include "resource_internal.h" + +void resource_close_gas_detection_sensor(int pin_num) +{ + if (!resource_get_info(pin_num)->opened) return; + + _I("Gas Detection Sensor is finishing..."); + peripheral_gpio_close(resource_get_info(pin_num)->sensor_h); + resource_get_info(pin_num)->opened = 0; +} + +int resource_read_gas_detection_sensor(int pin_num, int *out_value) +{ + int ret = PERIPHERAL_ERROR_NONE; + + if (!resource_get_info(pin_num)->opened) { + ret = peripheral_gpio_open(pin_num, &resource_get_info(pin_num)->sensor_h); + retv_if(!resource_get_info(pin_num)->sensor_h, -1); + + ret = peripheral_gpio_set_direction(resource_get_info(pin_num)->sensor_h, PERIPHERAL_GPIO_DIRECTION_IN); + retv_if(ret != 0, -1); + + resource_get_info(pin_num)->opened = 1; + resource_get_info(pin_num)->close = resource_close_gas_detection_sensor; + } + + ret = peripheral_gpio_read(resource_get_info(pin_num)->sensor_h, out_value); + retv_if(ret < 0, -1); + + return 0; +} -- 2.7.4