From 7371d7996dc2ec863dee5d76e06eb27e09f46a3b Mon Sep 17 00:00:00 2001 From: "Geunsun, Lee" Date: Fri, 1 Sep 2017 15:19:54 +0900 Subject: [PATCH] Implement APIs for the vibration sensor Change-Id: I4fd57df7218d30c76f91b4c58341b6363430d3b5 --- CMakeLists.txt | 1 + inc/resource.h | 1 + inc/resource/resource_vibration_sensor.h | 34 +++++++++++++ inc/resource/resource_vibration_sensor_internal.h | 31 ++++++++++++ inc/resource_internal.h | 1 + src/resource/resource_vibration_sensor.c | 58 +++++++++++++++++++++++ 6 files changed, 126 insertions(+) create mode 100644 inc/resource/resource_vibration_sensor.h create mode 100644 inc/resource/resource_vibration_sensor_internal.h create mode 100644 src/resource/resource_vibration_sensor.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 05d3edb..63de6c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${PROJECT_ROOT_DIR}/src/resource/resource_touch_sensor.c ${PROJECT_ROOT_DIR}/src/resource/resource_ultrasonic_sensor.c ${PROJECT_ROOT_DIR}/src/resource/resource_led.c + ${PROJECT_ROOT_DIR}/src/resource/resource_vibration_sensor.c ) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -lm) diff --git a/inc/resource.h b/inc/resource.h index b2d22ef..11696d1 100644 --- a/inc/resource.h +++ b/inc/resource.h @@ -31,5 +31,6 @@ #include "resource/resource_touch_sensor.h" #include "resource/resource_ultrasonic_sensor.h" #include "resource/resource_led.h" +#include "resource/resource_vibration_sensor.h" #endif /* __POSITION_FINDER_RESOURCE_H__ */ diff --git a/inc/resource/resource_vibration_sensor.h b/inc/resource/resource_vibration_sensor.h new file mode 100644 index 0000000..b387d07 --- /dev/null +++ b/inc/resource/resource_vibration_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_VIBRATION_SENSOR_H__ +#define __POSITION_FINDER_RESOURCE_VIBRATION_SENSOR_H__ + +/** + * @brief Reads the value of gpio connected vibration sensor(SZH-EKAD-131). + * @param[in] pin_num The number of the gpio pin connected to the vibration 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_vibration_sensor(int pin_num, int *out_value); + +#endif /* __POSITION_FINDER_RESOURCE_VIBRATION_SENSOR_H__ */ diff --git a/inc/resource/resource_vibration_sensor_internal.h b/inc/resource/resource_vibration_sensor_internal.h new file mode 100644 index 0000000..61f3c2e --- /dev/null +++ b/inc/resource/resource_vibration_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_VIBRATION_SENSOR_INTERNAL_H__ +#define __POSITION_FINDER_RESOURCE_VIBRATION_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 vibration sensor + */ +extern void resource_close_vibration_sensor(int pin_num); + +#endif /* __POSITION_FINDER_RESOURCE_VIBRATION_SENSOR_INTERNAL_H__ */ diff --git a/inc/resource_internal.h b/inc/resource_internal.h index 4b06c0d..0b11388 100644 --- a/inc/resource_internal.h +++ b/inc/resource_internal.h @@ -30,6 +30,7 @@ #include "resource/resource_touch_sensor_internal.h" #include "resource/resource_ultrasonic_sensor_internal.h" #include "resource/resource_led_internal.h" +#include "resource/resource_vibration_sensor_internal.h" #define PIN_MAX 40 diff --git a/src/resource/resource_vibration_sensor.c b/src/resource/resource_vibration_sensor.c new file mode 100644 index 0000000..8e59882 --- /dev/null +++ b/src/resource/resource_vibration_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_vibration_sensor(int pin_num) +{ + if (!resource_get_info(pin_num)->opened) return; + + _I("Vibration Sensor is finishing..."); + peripheral_gpio_close(resource_get_info(pin_num)->sensor_h); + resource_get_info(pin_num)->opened = 0; +} + +int resource_read_vibration_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_vibration_sensor; + } + + ret = peripheral_gpio_read(resource_get_info(pin_num)->sensor_h, out_value); + retv_if(ret < 0, -1); + + return 0; +} -- 2.7.4