From 98b118389f7848f66d9f98c12f0f5d920d2e403b Mon Sep 17 00:00:00 2001 From: Jin Yoon Date: Thu, 16 Aug 2018 12:12:11 +0900 Subject: [PATCH] Modify codes after reviews Change-Id: Ie70cce2f281a80bd1f41c04b2986eafb421e64ab --- res/certificate.pem | 33 ----------------------------- res/device_def.json | 2 +- res/privatekey.der | Bin 121 -> 0 bytes src/resource/resource_illuminance_sensor.c | 1 + src/resource/resource_servo_motor.c | 12 ++++++++--- src/smart-blind.c | 21 ++++++++---------- 6 files changed, 20 insertions(+), 49 deletions(-) delete mode 100644 res/certificate.pem delete mode 100644 res/privatekey.der diff --git a/res/certificate.pem b/res/certificate.pem deleted file mode 100644 index d3470a3..0000000 --- a/res/certificate.pem +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICyjCCAnCgAwIBAgIUREVWM1AwMTE1MzM2ODUwODUwNzkwCgYIKoZIzj0EAwIw -fTE4MDYGA1UEAwwvU2Ftc3VuZyBFbGVjdHJvbmljcyBPQ0YgRGV2ZWxvcGVyIFN1 -YkNBIHYzIFRFU1QxFjAUBgNVBAsMDU9DRiBEZXYgU3ViQ0ExHDAaBgNVBAoME1Nh -bXN1bmcgRWxlY3Ryb25pY3MxCzAJBgNVBAYTAktSMB4XDTE4MDgwNzIzMzgwNVoX -DTE4MTAwNjIzMzgwNVowgbMxZzBlBgNVBAMMXkRldmVsb3BlciBEZXZpY2UgVEVT -VDogU21hcnRCbGluZCAoYjg4MzdhNWYtMjNiNS00Y2RhLWE0ZmEtNGE5NDU5YzRl -MTBhKS9qYXkudHQudGVzdEBnbWFpbC5jb20xHTAbBgNVBAsMFE9DRiBEZXYgRGV2 -aWNlKGZBYnIpMRwwGgYDVQQKDBNTYW1zdW5nIEVsZWN0cm9uaWNzMQswCQYDVQQG -EwJLUjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJMDmIztgUXrbfrPaBibwShB -oFnYd4vhWLA9II3SkaPzET23uGemCH7jtEd8YmCPezz7yGJTXxg3s4PYJs91GXOj -gZYwgZMwCwYDVR0PBAQDAgPIMDwGCCsGAQUFBwEBBDAwLjAsBggrBgEFBQcwAYYg -aHR0cDovL29jc3AtdGVzdC5zYW1zdW5naW90cy5jb20wOwYDVR0fBDQwMjAwoC6g -LIYqaHR0cDovL2NybC10ZXN0LnNhbXN1bmdpb3RzLmNvbS9kZXYzY2EuY3JsMAkG -A1UdEwQCMAAwCgYIKoZIzj0EAwIDSAAwRQIgJ4Vak8GiWRmMq6pgNwddzBmCRz/b -Px6CO+svAUIgmS8CIQD8f7L6pB+dT8xRa6tC7xcFXccIDnS7z2ST3B1PUIvjLw== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIClDCCAjmgAwIBAgITCBdmNie8mlu4WgGqOB3KClKsjzAMBggqhkjOPQQDAgUA -MHAxLTArBgNVBAMTJFNhbXN1bmcgRWxlY3Ryb25pY3MgT0NGIFJvb3QgQ0EgVEVT -VDEUMBIGA1UECxMLT0NGIFJvb3QgQ0ExHDAaBgNVBAoTE1NhbXN1bmcgRWxlY3Ry -b25pY3MxCzAJBgNVBAYTAktSMCAXDTE3MTAxMDEwMjY0NloYDzIwNjkxMjMxMTQ1 -OTU5WjB9MTgwNgYDVQQDEy9TYW1zdW5nIEVsZWN0cm9uaWNzIE9DRiBEZXZlbG9w -ZXIgU3ViQ0EgdjMgVEVTVDEWMBQGA1UECxMNT0NGIERldiBTdWJDQTEcMBoGA1UE -ChMTU2Ftc3VuZyBFbGVjdHJvbmljczELMAkGA1UEBhMCS1IwWTATBgcqhkjOPQIB -BggqhkjOPQMBBwNCAASaLdjStXbZ6UcF7TFXDqratJxficMlBt8ec46MYQEocqZw -cIAh6UP8mpDMlOs1cUxatCoEDrGUNOZyFuNpztqfo4GgMIGdMA4GA1UdDwEB/wQE -AwIBBjA5BgNVHR8EMjAwMC6gLKAqhihodHRwOi8vY3JsLXRlc3Quc2Ftc3VuZ2lv -dHMuY29tL3Jvb3QuY3JsMBIGA1UdEwEB/wQIMAYBAf8CAQAwPAYIKwYBBQUHAQEE -MDAuMCwGCCsGAQUFBzABhiBodHRwOi8vb2NzcC10ZXN0LnNhbXN1bmdpb3RzLmNv -bTAMBggqhkjOPQQDAgUAA0cAMEQCIDAcuxI2o3RATk1JOGCmNmAqwPNLJxXzq1LA -GPqAP+fnAiBbrlkNBbmWk3q3nLO+0yJP1jd+uh5a7gd8/WF6t5osGA== ------END CERTIFICATE----- diff --git a/res/device_def.json b/res/device_def.json index e9ac95e..8993491 100644 --- a/res/device_def.json +++ b/res/device_def.json @@ -12,7 +12,7 @@ "manufacturerName": "fAbr", "manufacturerUrl": "http://www.samsung.com/sec/", "manufacturingDate": "2017-08-31", - "modelNumber": "NWSP-01", + "modelNumber": "BLIND-01", "platformVersion": "1.0", "osVersion": "1.0", "hardwareVersion": "1.0", diff --git a/res/privatekey.der b/res/privatekey.der deleted file mode 100644 index 1847512bcd8e06592ac40ca6a3b3b398b9008ff8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmV-<0EYiCcLD(c1RxwH{(el9KfK$X}^)c!hH99dj?1xyYaj1_&yK zNX|V20SBQ(13~}ZTin>7@NT;L7-XKcZ=azustA+(vhR{5k0rKXQl{# b #include "log.h" -#define SERVO_MOTOR_CHANNER (0) +#define SERVO_MOTOR_CHANNEL (0) +#define SERVO_MOTOR_DEFAULT_PERIOD 20.0 static peripheral_pwm_h g_pwm_h; @@ -35,15 +36,20 @@ int resource_set_servo_motor_value(double duty_cycle_ms) { int ret = 0; + if (duty_cycle_ms >= SERVO_MOTOR_DEFAULT_PERIOD) { + _E("Too large duty cycle"); + return -1; + } + if (!g_pwm_h) { - ret = peripheral_pwm_open(0, SERVO_MOTOR_CHANNER, &g_pwm_h); + ret = peripheral_pwm_open(0, SERVO_MOTOR_CHANNEL, &g_pwm_h); if (ret != PERIPHERAL_ERROR_NONE) { _E("failed to open servo motor with ch : %s", get_error_message(ret)); return -1; } } - ret = peripheral_pwm_set_period(g_pwm_h, 20 * 1000 * 1000); + ret = peripheral_pwm_set_period(g_pwm_h, SERVO_MOTOR_DEFAULT_PERIOD * 1000 * 1000); if (ret != PERIPHERAL_ERROR_NONE) { _E("failed to set period : %s", get_error_message(ret)); return -1; diff --git a/src/smart-blind.c b/src/smart-blind.c index 961e58e..15db4bd 100644 --- a/src/smart-blind.c +++ b/src/smart-blind.c @@ -43,7 +43,7 @@ #define I2C_BUS_NUMBER (1) // QUIZ -#define SENSOR_GATHER_INTERVAL (100.0f) +#define SENSOR_GATHER_INTERVAL (1.0f) // QUIZ //#define USE_ST_SDK @@ -75,7 +75,7 @@ static inline int __get_illuminance(void *data, unsigned int *illuminance_value) retv_if(!ad->illuminance_data, -1); // QUIZ - //ret = resource_read_illuminance_sensor(/* ? */, illuminance_value); + ret = resource_read_illuminance_sensor(1, illuminance_value); retv_if(ret != 0, -1); sensor_data_set_uint(ad->illuminance_data, *illuminance_value); @@ -106,15 +106,13 @@ static int __set_servo_motor(void *data, int on) power_value = BLIND_DOWN; } - ret = resource_set_servo_motor_value(duty_cycle); +#if 0 // QUIZ + ret = resource_set_servo_motor_value(/* duty_cycle */); retv_if(ret != 0, -1); +#endif sensor_data_set_string(ad->power_data, power_value, strlen(power_value)); -#ifdef USE_ST_SDK - st_things_notify_observers(SENSOR_URI_POWER); -#endif - return 0; } @@ -138,7 +136,9 @@ static Eina_Bool __illuminance_to_servo_motor(void *data) ret = __get_illuminance(ad, &illuminance_value); retv_if(ret != 0, ECORE_CALLBACK_RENEW); -#if 0 // # Senario : Illuminance sensor +#if 1 // # Senario : Illuminance sensor + int on = 0; + if (illuminance_value < ILLUMINATION_CRITERIA) { on = 0; } else { @@ -251,7 +251,7 @@ static bool handle_set_request(st_things_set_request_message_s* req_msg, st_thin } else { ret = __set_servo_motor(g_ad, 0); } - + free(str); retv_if(ret != 0, false); } else { _E("cannot get a string value"); @@ -362,9 +362,6 @@ static void service_app_terminate(void *user_data) { app_data *ad = (app_data *)user_data; - if (ad->getter_illuminance) - ecore_timer_del(ad->getter_illuminance); - resource_close_illuminance_sensor(); resource_close_servo_motor(); -- 2.7.4