Enable 5 infrared motion sensors to check human behavior

Change-Id: I000ff19aabfcf9ab4369c8d800db6923896a1a1d

1 files changed, 11 insertions, 72 deletions

diff --git a/src/controller.c b/src/controller.c
index 06cb7b7..f6b79dd 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -33,27 +33,21 @@
 #include "connectivity.h"
 #include "controller.h"
 
-#define I2C_BUS_1 0x1
-#define GPIO_NOT_USED -1
 #define GPIO_ULTRASONIC_TRIG_NUM_1 20
 #define GPIO_ULTRASONIC_ECHO_NUM_1 21
-#define GPIO_INFRARED_MOTION_NUM_1 4
-#define I2C_ILLUMINANCE_FIRST_PIN_1 3
-#define USE_MULTIPLE_SENSOR 0
 #define MULTIPLE_SENSOR_NUMBER 5
 
 typedef struct app_data_s {
-	Ecore_Timer *getter_timer[PIN_MAX];
+	Ecore_Timer *getter_timer;
 	connectivity_resource_s *resource_info;
 } app_data;
 
-static Eina_Bool _infrared_motion_getter_timer(void *data)
+static Eina_Bool control_read_sensors_cb(void *data)
 {
-#if USE_MULTIPLE_SENSOR
+	int value[MULTIPLE_SENSOR_NUMBER] = { 0, };
+	int total = 0;
 	int gpio_num[MULTIPLE_SENSOR_NUMBER] = { 5, 6, 13, 19, 26 };
 	int i = 0;
-	int value[MULTIPLE_SENSOR_NUMBER] = { 0, };
-	int detected = 0;
 	app_data *ad = data;
 
 	for (i = 0; i < MULTIPLE_SENSOR_NUMBER; i++) {
@@ -61,47 +55,16 @@ static Eina_Bool _infrared_motion_getter_timer(void *data)
 			_E("Failed to get Infrared Motion value [GPIO:%d]", gpio_num[i]);
 			continue;
 		}
-		detected |= value[i];
+		total |= value[i];
 	}
-	_I("[5:%d][6:%d][13:%d][19:%d][26:%d]", value[0], value[1], value[2], value[3], value[4]);
 
-	if (connectivity_notify(ad->resource_info, detected) == -1)
+	if (connectivity_notify(ad->resource_info, total) == -1)
 		_E("Cannot notify message");
-#else
-	int value = 0;
-
-	retv_if(resource_read_infrared_motion_sensor(GPIO_INFRARED_MOTION_NUM_1, &value) == -1, ECORE_CALLBACK_CANCEL);
-	_I("Infrared Motion Value is [%d]", value);
-#endif
-
-	return ECORE_CALLBACK_RENEW;
-}
-
-#if (!USE_MULTIPLE_SENSOR)
-static void ultrasonic_sensor_read_cb(double value, void *data)
-{
-	_I("Distance : %.2fcm", value);
-}
-
-static Eina_Bool _ultrasonic_getter_timer(void *data)
-{
-	double value = 0;
-
-	retv_if(resource_read_ultrasonic_sensor(GPIO_ULTRASONIC_TRIG_NUM_1, GPIO_ULTRASONIC_ECHO_NUM_1, ultrasonic_sensor_read_cb, NULL) == -1, ECORE_CALLBACK_CANCEL);
-
-	return ECORE_CALLBACK_RENEW;
-}
-
-static Eina_Bool _illuminance_getter_timer(void *data)
-{
-	int value = 0;
 
-	retv_if(resource_read_illuminance_sensor(I2C_BUS_1, &value) == -1, ECORE_CALLBACK_CANCEL);
-	_I("Illuminance sensor is [%d lux]", value);
+	_I("[5:%d] | [6:%d] | [13:%d] | [19:%d] | [26:%d] = [Total:%d]", value[0], value[1], value[2], value[3], value[4], total);
 
 	return ECORE_CALLBACK_RENEW;
 }
-#endif
 
 static bool service_app_create(void *data)
 {
@@ -109,38 +72,14 @@ static bool service_app_create(void *data)
 	int ret = -1;
 
 	controller_init_internal_functions();
-
 	ret = connectivity_set_resource("/door/1", "org.tizen.door", &ad->resource_info);
 	if (ret == -1) _E("Cannot broadcast resource");
 
-#if USE_MULTIPLE_SENSOR
-	ad->getter_timer[GPIO_INFRARED_MOTION_NUM_1] = ecore_timer_add(3.0f, _infrared_motion_getter_timer, ad);
-	if (!ad->getter_timer[GPIO_INFRARED_MOTION_NUM_1]) {
+	ad->getter_timer = ecore_timer_add(0.5f, control_read_sensors_cb, ad);
+	if (!ad->getter_timer) {
 		_E("Failed to add infrared motion getter timer");
 		return false;
 	}
-#else
-	/* One Pin Sensor */
-	ad->getter_timer[GPIO_INFRARED_MOTION_NUM_1] = ecore_timer_add(1.0f, _infrared_motion_getter_timer, ad);
-	if (!ad->getter_timer[GPIO_INFRARED_MOTION_NUM_1]) {
-		_D("Failed to add infrared motion getter timer");
-		return false;
-	}
-
-	/* Two Pins Sensor */
-	ad->getter_timer[GPIO_ULTRASONIC_TRIG_NUM_1] = ecore_timer_add(1.0f, _ultrasonic_getter_timer, ad);
-	if (!ad->getter_timer[GPIO_ULTRASONIC_TRIG_NUM_1]) {
-		_D("Failed to add ultra sonic getter timer");
-		return false;
-	}
-
-	/* I2C Protocol Sensor */
-	ad->getter_timer[I2C_ILLUMINANCE_FIRST_PIN_1] = ecore_timer_add(1.0f, _illuminance_getter_timer, ad);
-	if (!ad->getter_timer[I2C_ILLUMINANCE_FIRST_PIN_1]) {
-		_D("Failed to add illuminance getter timer");
-		return false;
-	}
-#endif
 
     return true;
 }
@@ -150,8 +89,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[i]) {
-			ecore_timer_del(ad->getter_timer[i]);
+		if (ad->getter_timer) {
+			ecore_timer_del(ad->getter_timer);
 		}
 	}