X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontroller.c;h=3eea29cb714a8e86bc06c0a3983780d0ad9673ba;hb=1961d5058c76fb5942402af527d097659fc67e9f;hp=4d8e88d6ea67890514948d8e4cd29cb8fdd227e2;hpb=c6e32131429c12efeff38ea95137d5f32f21a79c;p=apps%2Fnative%2Fposition-finder-server.git diff --git a/src/controller.c b/src/controller.c index 4d8e88d..3eea29c 100644 --- a/src/controller.c +++ b/src/controller.c @@ -1,25 +1,24 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Contact: Jin Yoon * Geunsun Lee * Eunyoung Lee * Junkyu Han * - * Licensed under the Apache License, Version 2.0 (the "License"); + * 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://www.apache.org/licenses/LICENSE-2.0 + * 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, + * 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 #include #include @@ -33,111 +32,53 @@ #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 1 - -static void _start_internal_function(void); -static void _stop_internal_function(void); +#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 gpio_num[3] = { 16, 23, 26 }; + 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[3] = { 0, }; - int detected = 0; app_data *ad = data; - for (i = 0; i < 3; i++) { + for (i = 0; i < MULTIPLE_SENSOR_NUMBER; i++) { 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; } - detected |= value[i]; + total |= value[i]; } - 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; -} - -#ifndef USE_MULTIPLE_SENSOR -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, &value) == -1, ECORE_CALLBACK_CANCEL); - _I("Ultra Sonic Distance is [%d cm]", 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; } -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); - - return ECORE_CALLBACK_RENEW; -} -#endif - static bool service_app_create(void *data) { app_data *ad = data; int ret = -1; - _start_internal_function(); - + 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; } @@ -147,13 +88,13 @@ 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); } } connectivity_unset_resource(ad->resource_info); - _stop_internal_function(); + controller_fini_internal_functions(); free(ad); } @@ -205,16 +146,3 @@ int main(int argc, char* argv[]) return ret; } - -/* Do not modify codes under this comment */ -static void _start_internal_function(void) -{ - connectivity_init("iotcon-test-basic-server"); -} - -static void _stop_internal_function(void) -{ - _I("Terminating..."); - resource_close_all(); - connectivity_fini(); -}