Modify mistyped log

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

diff --git a/src/controller.c b/src/controller.c
index 6e1e50f..59120a9 100644 (file)
--- a/src/controller.c
+++ b/src/controller.c
@@ -25,56 +25,56 @@
 #include <tizen.h>
 #include <service_app.h>
 
-#include <iotcon.h> // Please remove this after test
-
 #include "log.h"
 #include "resource.h"
 #include "connectivity.h"
 #include "controller.h"
+#include "controller_util.h"
+#include "webutil.h"
+
+
+/**
+ * DO NOT EDIT: please don't edit the time interval.
+ */
+#define SENSORING_TIME_INTERVAL 2.0f
 
-#define GPIO_ULTRASONIC_TRIG_NUM_1 20
-#define GPIO_ULTRASONIC_ECHO_NUM_1 21
-#define MULTIPLE_SENSOR_NUMBER 5
-#define CONNECTIVITY_KEY "opened"
+/**
+ * TODO: You have to use the pin numbers below.
+ * You can change the pin numbers freely.
+ */
+#define TRIG_PIN_NUMBER 20
+#define ECHO_PIN_NUMBER 21
 
 typedef struct app_data_s {
        Ecore_Timer *getter_timer;
        connectivity_resource_s *resource_info;
 } app_data;
 
-static Eina_Bool control_sensors_cb(void *data)
+static void _ultrasonic_sensor_read_cb(double value, 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;
 
        /**
-        * This is the case when a number of the same sensors are installed.
-        * Each of the five infrared motion sensors will receive the value.
+        * TODO: Send the value of the ultrasonic sensor to the Client.
         */
-       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);
+
+
+
+
+
+}
+
+static Eina_Bool _control_sensors_cb(void *data)
+{
+       app_data *ad = data;
 
        /**
-        * Notifies specific clients that resource's attributes have changed.
+        * TODO: Prepare to read the value of the ultrasonic sensor.
         */
-       if (connectivity_notify_bool(ad->resource_info, CONNECTIVITY_KEY, total) == -1)
-               _E("Cannot notify message");
+
+
+
+
 
        return ECORE_CALLBACK_RENEW;
 }
@@ -82,42 +82,40 @@ static Eina_Bool control_sensors_cb(void *data)
 static bool service_app_create(void *data)
 {
        app_data *ad = data;
-       int ret = -1;
 
        /**
-        * No modification required!!!
+        * DO NOT EDIT: please don't edit the function below.
         * Access only when modifying internal functions.
         */
        controller_init_internal_functions();
 
        /**
-        * Create a connectivity resource and registers the resource in server.
+        * TODO: Creates a connectivity resource and registers the resource in server.
         */
-       ret = connectivity_set_resource("/door/1", "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");
+               _E("Failed to add a 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.
@@ -125,7 +123,7 @@ static void service_app_terminate(void *data)
        connectivity_unset_resource(ad->resource_info);
 
        /**
-        * No modification required!!!
+        * DO NOT EDIT: please don't edit the function below.
         * Access only when modifying internal functions.
         */
        controller_fini_internal_functions();
@@ -135,7 +133,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.
+       /*APP_CONTROL*/
 }
 
 static void service_app_lang_changed(app_event_info_h event_info, void *user_data)