From: Eunyoung Lee Date: Mon, 4 Sep 2017 03:22:00 +0000 (+0900) Subject: Implemented APIs for the flame sensor X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0abbb257899b25550cb574f4f650905bc3e1725f;p=apps%2Fnative%2Fposition-finder-server.git Implemented APIs for the flame sensor Change-Id: Id0ebe1b66907a9d068ff959b1315fcc9f2ae5233 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ddce3f1..7cff29f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,6 +46,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${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 + ${PROJECT_ROOT_DIR}/src/resource/resource_flame_sensor.c ) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -lm) diff --git a/inc/resource.h b/inc/resource.h index 11696d1..938f210 100644 --- a/inc/resource.h +++ b/inc/resource.h @@ -32,5 +32,6 @@ #include "resource/resource_ultrasonic_sensor.h" #include "resource/resource_led.h" #include "resource/resource_vibration_sensor.h" +#include "resource/resource_flame_sensor.h" #endif /* __POSITION_FINDER_RESOURCE_H__ */ diff --git a/inc/resource/resource_flame_sensor.h b/inc/resource/resource_flame_sensor.h new file mode 100644 index 0000000..a296ce5 --- /dev/null +++ b/inc/resource/resource_flame_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_FLAME_SENSOR_H__ +#define __POSITION_FINDER_RESOURCE_FLAME_SENSOR_H__ + +/** + * @brief Reads the value of gpio connected flame sensor(NS-FDSM). + * @param[in] pin_num The number of the gpio pin connected to the flame 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_flame_sensor(int pin_num, int *out_value); + +#endif /* __POSITION_FINDER_RESOURCE_FLAME_SENSOR_H__ */ diff --git a/inc/resource/resource_flame_sensor_internal.h b/inc/resource/resource_flame_sensor_internal.h new file mode 100644 index 0000000..6aa8c78 --- /dev/null +++ b/inc/resource/resource_flame_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_FLAME_SENSOR_INTERNAL_H__ +#define __POSITION_FINDER_RESOURCE_FLAME_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 flame sensor + */ +extern void resource_close_flame_sensor(int pin_num); + +#endif /* __POSITION_FINDER_RESOURCE_FLAME_SENSOR_INTERNAL_H__ */ diff --git a/inc/resource_internal.h b/inc/resource_internal.h index 0b11388..601948d 100644 --- a/inc/resource_internal.h +++ b/inc/resource_internal.h @@ -31,6 +31,7 @@ #include "resource/resource_ultrasonic_sensor_internal.h" #include "resource/resource_led_internal.h" #include "resource/resource_vibration_sensor_internal.h" +#include "resource/resource_flame_sensor_internal.h" #define PIN_MAX 40 diff --git a/src/resource/resource_flame_sensor.c b/src/resource/resource_flame_sensor.c new file mode 100644 index 0000000..9ff1c8a --- /dev/null +++ b/src/resource/resource_flame_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_flame_sensor(int pin_num) +{ + if (!resource_get_info(pin_num)->opened) return; + + _I("Flame Sensor is finishing..."); + peripheral_gpio_close(resource_get_info(pin_num)->sensor_h); + resource_get_info(pin_num)->opened = 0; +} + +int resource_read_flame_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(NS-FDSM) normally outputs 1, and outputs 0 as out_value when a flame 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; +}