summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeonghoon Park <jh1979.park@samsung.com>2017-09-06 20:40:30 +0900
committerJeonghoon Park <jh1979.park@samsung.com>2017-09-06 20:41:24 +0900
commitfb16e7b22303554d64fed7a099f19698052458cf (patch)
tree48bd9f5a01d42f8e4685ff2192863bb4e194244d
parent73c2932b257451f7773cb662b35395b1d06be9b8 (diff)
downloadrcc-fb16e7b22303554d64fed7a099f19698052458cf.tar.gz
rcc-fb16e7b22303554d64fed7a099f19698052458cf.tar.bz2
rcc-fb16e7b22303554d64fed7a099f19698052458cf.zip
add resource APIs for the rain sensor
Change-Id: I7dc453c429b601b5fafcea5a23891fa139576296
-rwxr-xr-x[-rw-r--r--]CMakeLists.txt1
-rwxr-xr-x[-rw-r--r--]inc/resource.h1
-rwxr-xr-xinc/resource/resource_rain_sensor.h35
-rwxr-xr-xinc/resource/resource_rain_sensor_internal.h31
-rwxr-xr-x[-rw-r--r--]inc/resource_internal.h1
-rw-r--r--src/controller.c6
-rwxr-xr-xsrc/resource/resource_rain_sensor.c61
7 files changed, 132 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01102f7..3579b02 100644..100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,7 @@ 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
)
diff --git a/inc/resource.h b/inc/resource.h
index cc7fb4b..5b6871a 100644..100755
--- a/inc/resource.h
+++ b/inc/resource.h
@@ -33,6 +33,7 @@
#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"
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 <jinny.yoon@samsung.com>
+ * Geunsun Lee <gs86.lee@samsung.com>
+ * Eunyoung Lee <ey928.lee@samsung.com>
+ * Junkyu Han <junkyu.han@samsung.com>
+ *
+ * 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 <jinny.yoon@samsung.com>
+ * Geunsun Lee <gs86.lee@samsung.com>
+ * Eunyoung Lee <ey928.lee@samsung.com>
+ * Junkyu Han <junkyu.han@samsung.com>
+ *
+ * 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_internal.h b/inc/resource_internal.h
index a1ce1eb..beb84e3 100644..100755
--- a/inc/resource_internal.h
+++ b/inc/resource_internal.h
@@ -32,6 +32,7 @@
#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"
diff --git a/src/controller.c b/src/controller.c
index 2d4a9cf..5b391ce 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -82,10 +82,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/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 <jinny.yoon@samsung.com>
+ * Geunsun Lee <gs86.lee@samsung.com>
+ * Eunyoung Lee <ey928.lee@samsung.com>
+ * Junkyu Han <junkyu.han@samsung.com>
+ *
+ * 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 <stdlib.h>
+ #include <unistd.h>
+
+ #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;
+ }