From dd0df2c535b7b995a8746db2f7c7c308584fabc1 Mon Sep 17 00:00:00 2001 From: Jin Yoon Date: Thu, 7 Sep 2017 11:44:52 +0900 Subject: [PATCH] Sync with master Change-Id: Ie3acc046639bba9edc42718975af3c1f12ca5304 --- CMakeLists.txt | 3 ++ inc/resource.h | 3 ++ inc/resource/resource_rain_sensor.h | 35 ++++++++++++ inc/resource/resource_rain_sensor_internal.h | 31 +++++++++++ inc/resource/resource_sound_detection_sensor.h | 35 ++++++++++++ .../resource_sound_detection_sensor_internal.h | 31 +++++++++++ inc/resource/resource_tilt_sensor.h | 35 ++++++++++++ inc/resource/resource_tilt_sensor_internal.h | 31 +++++++++++ inc/resource_internal.h | 3 ++ src/controller.c | 6 +-- src/resource.c | 2 +- src/resource/resource_rain_sensor.c | 61 +++++++++++++++++++++ src/resource/resource_sound_detection_sensor.c | 63 ++++++++++++++++++++++ src/resource/resource_tilt_sensor.c | 63 ++++++++++++++++++++++ 14 files changed, 397 insertions(+), 5 deletions(-) create mode 100755 inc/resource/resource_rain_sensor.h create mode 100755 inc/resource/resource_rain_sensor_internal.h create mode 100644 inc/resource/resource_sound_detection_sensor.h create mode 100644 inc/resource/resource_sound_detection_sensor_internal.h create mode 100644 inc/resource/resource_tilt_sensor.h create mode 100644 inc/resource/resource_tilt_sensor_internal.h create mode 100755 src/resource/resource_rain_sensor.c create mode 100644 src/resource/resource_sound_detection_sensor.c create mode 100644 src/resource/resource_tilt_sensor.c diff --git a/CMakeLists.txt b/CMakeLists.txt index f221e3f..90fbcd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,6 +46,9 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${PROJECT_ROOT_DIR}/src/resource/resource_led.c ${PROJECT_ROOT_DIR}/src/resource/resource_vibration_sensor.c ${PROJECT_ROOT_DIR}/src/resource/resource_flame_sensor.c + ${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 ) diff --git a/inc/resource.h b/inc/resource.h index d238b52..4b41dfb 100644 --- a/inc/resource.h +++ b/inc/resource.h @@ -33,6 +33,9 @@ #include "resource/resource_led.h" #include "resource/resource_vibration_sensor.h" #include "resource/resource_flame_sensor.h" +#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_rain_sensor.h b/inc/resource/resource_rain_sensor.h new file mode 100755 index 0000000..25e928a --- /dev/null +++ b/inc/resource/resource_rain_sensor.h @@ -0,0 +1,35 @@ +/* + * 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_RAIN_SENSOR_H__ +#define __POSITION_FINDER_RESOURCE_RAIN_SENSOR_H__ + +/** + * @brief Reads the value of gpio connected rain sensor(FC-37 + YL-38). + * @param[in] pin_num The number of the gpio pin connected to the rain sensor + * @param[out] out_value The vaule 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_rain_sensor(int pin_num, int *out_value); + +#endif /* __POSITION_FINDER_RESOURCE_RAIN_SENSOR_H__ */ diff --git a/inc/resource/resource_rain_sensor_internal.h b/inc/resource/resource_rain_sensor_internal.h new file mode 100755 index 0000000..a9a45ea --- /dev/null +++ b/inc/resource/resource_rain_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_RAIN_SENSOR_INTERNAL_H__ +#define __POSITION_FINDER_RESOURCE_RAIN_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 rain sensor + */ +extern void resource_close_rain_sensor(int pin_num); + +#endif /* __POSITION_FINDER_RESOURCE_RAIN_SENSOR_INTERNAL_H__ */ diff --git a/inc/resource/resource_sound_detection_sensor.h b/inc/resource/resource_sound_detection_sensor.h new file mode 100644 index 0000000..3bcdf2d --- /dev/null +++ b/inc/resource/resource_sound_detection_sensor.h @@ -0,0 +1,35 @@ +/* + * 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_SOUND_DETECTION_SENSOR_H__ +#define __POSITION_FINDER_RESOURCE_SOUND_DETECTION_SENSOR_H__ + +/** + * @brief Reads the value of gpio connected sound detection sensor(NS-SDSM). + * @param[in] pin_num The number of the gpio pin connected to the sound detection sensor + * @param[out] out_value The vaule 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_sound_detection_sensor(int pin_num, int *out_value); + +#endif /* __POSITION_FINDER_RESOURCE_SOUND_DETECTION_SENSOR_H__ */ diff --git a/inc/resource/resource_sound_detection_sensor_internal.h b/inc/resource/resource_sound_detection_sensor_internal.h new file mode 100644 index 0000000..88b8bdc --- /dev/null +++ b/inc/resource/resource_sound_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_SOUND_DETECTION_SENSOR_INTERNAL_H__ +#define __POSITION_FINDER_RESOURCE_SOUND_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 sound detection sensor + */ +extern void resource_close_sound_detection_sensor(int pin_num); + +#endif /* __POSITION_FINDER_RESOURCE_SOUND_DETECTION_SENSOR_INTERNAL_H__ */ diff --git a/inc/resource/resource_tilt_sensor.h b/inc/resource/resource_tilt_sensor.h new file mode 100644 index 0000000..20d8403 --- /dev/null +++ b/inc/resource/resource_tilt_sensor.h @@ -0,0 +1,35 @@ +/* + * 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_TILT_SENSOR_H__ +#define __POSITION_FINDER_RESOURCE_TILT_SENSOR_H__ + +/** + * @brief Reads the value of gpio connected tilt sensor(SZH-EK084). + * @param[in] pin_num The number of the gpio pin connected to the tilt sensor + * @param[out] out_value The vaule 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_tilt_sensor(int pin_num, int *out_value); + +#endif /* __POSITION_FINDER_RESOURCE_TILT_SENSOR_H__ */ diff --git a/inc/resource/resource_tilt_sensor_internal.h b/inc/resource/resource_tilt_sensor_internal.h new file mode 100644 index 0000000..4468929 --- /dev/null +++ b/inc/resource/resource_tilt_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_TILT_SENSOR_INTERNAL_H__ +#define __POSITION_FINDER_RESOURCE_TILT_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 tilt sensor + */ +extern void resource_close_tilt_sensor(int pin_num); + +#endif /* __POSITION_FINDER_RESOURCE_TILT_SENSOR_INTERNAL_H__ */ diff --git a/inc/resource_internal.h b/inc/resource_internal.h index 4ceb9b2..cb751b5 100644 --- a/inc/resource_internal.h +++ b/inc/resource_internal.h @@ -32,6 +32,9 @@ #include "resource/resource_led_internal.h" #include "resource/resource_vibration_sensor_internal.h" #include "resource/resource_flame_sensor_internal.h" +#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/controller.c b/src/controller.c index fb10404..449c2ea 100644 --- a/src/controller.c +++ b/src/controller.c @@ -100,10 +100,8 @@ static void service_app_terminate(void *data) { app_data *ad = (app_data *)data; - for (int i = 0; i < PIN_MAX; i++) { - if (ad->getter_timer) { - ecore_timer_del(ad->getter_timer); - } + if (ad->getter_timer) { + ecore_timer_del(ad->getter_timer); } /** diff --git a/src/resource.c b/src/resource.c index bd9b28b..2183850 100644 --- a/src/resource.c +++ b/src/resource.c @@ -36,7 +36,7 @@ void resource_close_all(void) int i = 0; for (i = 0; i < PIN_MAX; i++) { if (!resource_info[i].opened) continue; - _I("[%d]th Resource is closing...", i); + _I("GPIO[%d] is closing...", i); if (resource_info[i].close) resource_info[i].close(i); diff --git a/src/resource/resource_rain_sensor.c b/src/resource/resource_rain_sensor.c new file mode 100755 index 0000000..d5fc10b --- /dev/null +++ b/src/resource/resource_rain_sensor.c @@ -0,0 +1,61 @@ +/* + * 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 "log.h" + #include "resource_internal.h" + + void resource_close_rain_sensor(int pin_num) + { + if (!resource_get_info(pin_num)->opened) return; + + _I("Rain Sensor is finishing..."); + peripheral_gpio_close(resource_get_info(pin_num)->sensor_h); + resource_get_info(pin_num)->opened = 0; + } + + int resource_read_rain_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_flame_sensor; + } + + /** + * This model(FC-37 + YL-38) normally outputs 1, and outputs 0 as out_value when a rain is detected. + */ + ret = peripheral_gpio_read(resource_get_info(pin_num)->sensor_h, out_value); + retv_if(ret < 0, -1); + + *out_value = !*out_value; + + return 0; + } diff --git a/src/resource/resource_sound_detection_sensor.c b/src/resource/resource_sound_detection_sensor.c new file mode 100644 index 0000000..1cf6a77 --- /dev/null +++ b/src/resource/resource_sound_detection_sensor.c @@ -0,0 +1,63 @@ +/* + * 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_sound_detection_sensor(int pin_num) +{ + if (!resource_get_info(pin_num)->opened) return; + + _I("Sound Sensor is finishing..."); + peripheral_gpio_close(resource_get_info(pin_num)->sensor_h); + resource_get_info(pin_num)->opened = 0; +} + +int resource_read_sound_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_sound_detection_sensor; + } + + /** + * This model(NS-SDSM) normally outputs 1, and outputs 0 as out_value when sound is detected. + */ + ret = peripheral_gpio_read(resource_get_info(pin_num)->sensor_h, out_value); + retv_if(ret < 0, -1); + + *out_value = !*out_value; + + return 0; +} diff --git a/src/resource/resource_tilt_sensor.c b/src/resource/resource_tilt_sensor.c new file mode 100644 index 0000000..5a946c4 --- /dev/null +++ b/src/resource/resource_tilt_sensor.c @@ -0,0 +1,63 @@ +/* + * 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_tilt_sensor(int pin_num) +{ + if (!resource_get_info(pin_num)->opened) return; + + _I("Infrared Motion Sensor is finishing..."); + peripheral_gpio_close(resource_get_info(pin_num)->sensor_h); + resource_get_info(pin_num)->opened = 0; +} + +int resource_read_tilt_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_tilt_sensor; + } + + /** + * This model(SZH-EK084) normally outputs 1, and outputs 0 as out_value when the sensor is tilted. + */ + ret = peripheral_gpio_read(resource_get_info(pin_num)->sensor_h, out_value); + retv_if(ret < 0, -1); + + *out_value = !*out_value; + + return 0; +} -- 2.7.4