Sync between master and template
authorJin Yoon <jinny.yoon@samsung.com>
Thu, 7 Sep 2017 02:49:49 +0000 (11:49 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Thu, 7 Sep 2017 02:49:49 +0000 (11:49 +0900)
12 files changed:
CMakeLists.txt
inc/connectivity.h
inc/resource.h
inc/resource/resource_gas_detection_sensor.h [new file with mode: 0644]
inc/resource/resource_gas_detection_sensor_internal.h [new file with mode: 0644]
inc/resource/resource_illuminance_sensor.h
inc/resource/resource_infrared_motion_sensor.h
inc/resource/resource_infrared_obstacle_avoidance_sensor.h
inc/resource/resource_touch_sensor.h
inc/resource_internal.h
src/connectivity.c
src/resource/resource_gas_detection_sensor.c [new file with mode: 0644]

index 3579b02bafbf28807bd551637263e3896bbc2bad..f86c5a10425eef9db57b3f770815253b31b87576 100755 (executable)
@@ -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)
index ca1aa2fdd3431a44dbc653a669ec7db67dc25f07..b88f83acd3d1acbe7d6cc8525d989e6017d218a8 100644 (file)
@@ -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
index 5b6871a883004269efe3c4cc768442f38f47a07b..4b41dfbaf3f87847f7703652574a405b78989570 100755 (executable)
@@ -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 (file)
index 0000000..3dd7787
--- /dev/null
@@ -0,0 +1,34 @@
+/*
+ * 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_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 (file)
index 0000000..9a91007
--- /dev/null
@@ -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_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__ */
index 2e8925d0dd36d03aad2acf835eeb3f6700bd03be..f3329a5354f7d65a43e80de1d38eb5a80be671b0 100644 (file)
@@ -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.
  */
index 6f9ff362b09a96e3e4890a3afe9748d3b5d4e806..a6ed278cb36716aff0540ece008aa03b9b229b15 100644 (file)
@@ -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.
  */
index dd25e2575d9048b2007ae91a07e4a3d1896de65e..5c8bab1a9fbdd1105b35dea2cfbdf2e1436a5de1 100644 (file)
@@ -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.
  */
index ea2866f07226cab50cd5050c8754b3b99f946314..2cd76d2b305b0fb7f3ff51af75be04b6d5d0a085 100644 (file)
@@ -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.
  */
index beb84e307123cf1c10fea1d473962f119317bff7..cb751b5e877ab3d7f573fae12f8378a61def79e8 100755 (executable)
@@ -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
 
index a017aa11ecae8f07985550b129d8c88b4c858d26..1c33e5e5dfbf671df2473894abe85e276d730812 100644 (file)
@@ -24,6 +24,7 @@
 #include <stdbool.h>
 #include <glib.h>
 #include <Eina.h>
+#include <app_common.h>
 
 #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 (file)
index 0000000..ae7a97b
--- /dev/null
@@ -0,0 +1,58 @@
+/*
+ * 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 <peripheral_io.h>
+#include <sys/time.h>
+
+#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;
+}