adds motor related modules

[apps/native/position-finder-server.git] / src / controller.c

diff --git a/src/controller.c b/src/controller.c
index f533159..a442f82 100644 (file)
--- a/src/controller.c
+++ b/src/controller.c
@@ -29,11 +29,11 @@
 #include "resource.h"
 #include "connectivity.h"
 #include "controller.h"
+#include "controller_util.h"
+#include "webutil.h"
 
-#define GPIO_ULTRASONIC_TRIG_NUM_1 20
-#define GPIO_ULTRASONIC_ECHO_NUM_1 21
-#define MULTIPLE_SENSOR_NUMBER 5
 #define CONNECTIVITY_KEY "opened"
+#define SENSORING_TIME_INTERVAL 5.0f
 
 typedef struct app_data_s {
        Ecore_Timer *getter_timer;
@@ -42,36 +42,11 @@ typedef struct app_data_s {
 
 static Eina_Bool control_sensors_cb(void *data)
 {
-       int value[MULTIPLE_SENSOR_NUMBER] = { 0, };
-       int total = 0;
-       int gpio_num[MULTIPLE_SENSOR_NUMBER] = { 5, 6, 13, 19, 26 };
-       int i = 0;
        app_data *ad = data;
+       int value = 1;
 
-       /**
-        * This is the case when a number of the same sensors are installed.
-        * Each of the five infrared motion sensors will receive the value.
-        */
-       for (i = 0; i < MULTIPLE_SENSOR_NUMBER; i++) {
-               /**
-                * Infrared motion sensor outputs 1 if motion is detected, or 0 if motion is not detected.
-                */
-               if (resource_read_infrared_motion_sensor(gpio_num[i], &value[i]) == -1) {
-                       _E("Failed to get Infrared Motion value [GPIO:%d]", gpio_num[i]);
-                       continue;
-               }
-               /**
-                * If at least one of the five infrared motion sensors detects motion (1),
-                * it is judged that there is a person (total == 1).
-                */
-               total |= value[i];
-       }
-       _I("[5:%d] | [6:%d] | [13:%d] | [19:%d] | [26:%d] = [Total:%d]", value[0], value[1], value[2], value[3], value[4], total);
-
-       /**
-        * Notifies specific clients that resource's attributes have changed.
-        */
-       if (connectivity_notify_bool(ad->resource_info, CONNECTIVITY_KEY, total) == -1)
+       /* This is example, get value from sensors first */
+       if (connectivity_notify_int(ad->resource_info, "Motion", value) == -1)
                _E("Cannot notify message");
 
        return ECORE_CALLBACK_RENEW;
@@ -81,6 +56,7 @@ static bool service_app_create(void *data)
 {
        app_data *ad = data;
        int ret = -1;
+       const char *path = NULL;
 
        /**
         * No modification required!!!
@@ -91,31 +67,37 @@ static bool service_app_create(void *data)
        /**
         * Create a connectivity resource and registers the resource in server.
         */
-       ret = connectivity_set_resource("/door/1", "org.tizen.door", &ad->resource_info);
+       connectivity_set_protocol(CONNECTIVITY_PROTOCOL_HTTP);
+
+       controller_util_get_path(&path);
+       if (path == NULL) {
+               _E("Failed to get path");
+               return false;
+       }
+
+       ret = connectivity_set_resource(path, "org.tizen.door", &ad->resource_info);
        if (ret == -1) _E("Cannot broadcast resource");
 
        /**
         * Creates a timer to call the given function in the given period of time.
         * In the control_sensors_cb(), each sensor reads the measured value or writes a specific value to the sensor.
         */
-       ad->getter_timer = ecore_timer_add(0.5f, control_sensors_cb, ad);
+       ad->getter_timer = ecore_timer_add(SENSORING_TIME_INTERVAL, control_sensors_cb, ad);
        if (!ad->getter_timer) {
                _E("Failed to add infrared motion getter timer");
                return false;
        }
 
-    return true;
+       return true;
 }
 
 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) {
-                       ecore_timer_del(ad->getter_timer);
-               }
-       }
+       if (ad->getter_timer)
+               ecore_timer_del(ad->getter_timer);
+
 
        /**
         * Releases the resource about connectivity.
@@ -133,7 +115,7 @@ static void service_app_terminate(void *data)
 
 static void service_app_control(app_control_h app_control, void *data)
 {
-    // Todo: add your code here.
+       // Todo: add your code here.
 }
 
 static void service_app_lang_changed(app_event_info_h event_info, void *user_data)