Sync between master and template

9 files changed, 74 insertions, 7 deletions

diff --git a/inc/connectivity.h b/inc/connectivity.h
index ca1aa2f..b88f83a 100644
--- a/inc/connectivity.h
+++ b/inc/connectivity.h
@@ -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
diff --git a/inc/resource.h b/inc/resource.h
index 5b6871a..4b41dfb 100755
--- a/inc/resource.h
+++ b/inc/resource.h
@@ -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
index 0000000..3dd7787
--- /dev/null
+++ b/inc/resource/resource_gas_detection_sensor.h
@@ -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
index 0000000..9a91007
--- /dev/null
+++ b/inc/resource/resource_gas_detection_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_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__ */
diff --git a/inc/resource/resource_illuminance_sensor.h b/inc/resource/resource_illuminance_sensor.h
index 2e8925d..f3329a5 100644
--- a/inc/resource/resource_illuminance_sensor.h
+++ b/inc/resource/resource_illuminance_sensor.h
@@ -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.
  */
diff --git a/inc/resource/resource_infrared_motion_sensor.h b/inc/resource/resource_infrared_motion_sensor.h
index 6f9ff36..a6ed278 100644
--- a/inc/resource/resource_infrared_motion_sensor.h
+++ b/inc/resource/resource_infrared_motion_sensor.h
@@ -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.
  */
diff --git a/inc/resource/resource_infrared_obstacle_avoidance_sensor.h b/inc/resource/resource_infrared_obstacle_avoidance_sensor.h
index dd25e25..5c8bab1 100644
--- a/inc/resource/resource_infrared_obstacle_avoidance_sensor.h
+++ b/inc/resource/resource_infrared_obstacle_avoidance_sensor.h
@@ -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.
  */
diff --git a/inc/resource/resource_touch_sensor.h b/inc/resource/resource_touch_sensor.h
index ea2866f..2cd76d2 100644
--- a/inc/resource/resource_touch_sensor.h
+++ b/inc/resource/resource_touch_sensor.h
@@ -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.
  */
diff --git a/inc/resource_internal.h b/inc/resource_internal.h
index beb84e3..cb751b5 100755
--- a/inc/resource_internal.h
+++ b/inc/resource_internal.h
@@ -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