From 72042fc89c0deb035464a574fdcc221d3778a19a Mon Sep 17 00:00:00 2001 From: David Lin Date: Mon, 17 Feb 2020 19:53:41 +0800 Subject: [PATCH] Fixed enum error in light_data_template_sample.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LIGHT_SWTICH_STATE_OFF -> LIGHT_SWITCH_STATE_OFF LIGHT_SWTICH_STATE_ON -> LIGHT_SWITCH_STATE_ON (when pr, the github note: We鈥檝e detected the file encoding as GB18030. When you commit changes we will transcode it to UTF-8, so some other changes cause by github, not me.) --- .../light_data_template_sample.c | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/examples/tencent_cloud_sdk_data_template/light_data_template_sample.c b/examples/tencent_cloud_sdk_data_template/light_data_template_sample.c index a0083c26..5015809b 100644 --- a/examples/tencent_cloud_sdk_data_template/light_data_template_sample.c +++ b/examples/tencent_cloud_sdk_data_template/light_data_template_sample.c @@ -128,8 +128,8 @@ typedef enum light_color_en { } light_color_t; // a enum to describe the color of a light typedef enum light_switch_state_en { - LIGHT_SWTICH_STATE_OFF = 0, - LIGHT_SWTICH_STATE_ON = 1, + LIGHT_SWITCH_STATE_OFF = 0, + LIGHT_SWITCH_STATE_ON = 1, } light_switch_state_t; // a enum to describe the switch state of a light typedef enum property_state_en { @@ -174,7 +174,7 @@ static void data_template_init(qcloud_device_t *device) { memset((void *)&light_profile, 0, sizeof(light_profile_t)); - light_profile.switch_state = LIGHT_SWTICH_STATE_OFF; + light_profile.switch_state = LIGHT_SWITCH_STATE_OFF; light_profile.color = LIGHT_COLOR_RED; light_profile.brightness = 0.0; @@ -223,7 +223,7 @@ static void property_do_update(shadow_dev_property_t *property) break; case JSON_DATA_TYPE_STRING: // device name - /* 如果多个字符串属性,根据pProperty->key值匹配，处理字符串 */ + /* 濡傛灉澶氫釜瀛楃涓插睘鎬,鏍规嵁pProperty->key鍊煎尮閰嶏紝澶勭悊瀛楃涓 */ if (strcmp("name", property->key) != 0) { break; } @@ -235,7 +235,7 @@ static void property_do_update(shadow_dev_property_t *property) } } -/* 如果有自定义的字符串或者json，需要在这里解析 */ +/* 濡傛灉鏈夎嚜瀹氫箟鐨勫瓧绗︿覆鎴栬卝son锛岄渶瑕佸湪杩欓噷瑙ｆ瀽 */ static qcloud_err_t property_update(const char *json_doc, shadow_dev_property_t *property) { QCLOUD_POINTER_SANITY_CHECK(json_doc, QCLOUD_ERR_INVAL); @@ -263,13 +263,13 @@ static qcloud_err_t property_update(const char *json_doc, shadow_dev_property_t return QCLOUD_ERR_SUCCESS; } -/* 服务端有控制消息下发，会触发这里的delta回调 */ +/* 鏈嶅姟绔湁鎺у埗娑堟伅涓嬪彂锛屼細瑙﹀彂杩欓噷鐨刣elta鍥炶皟 */ static void on_property_delta_handler(void *client, const char *json_doc, uint32_t json_doc_len, shadow_dev_property_t *property) { int i = 0; for (i = 0; i < LIGHT_PROPERTY_COUNT; ++i) { - /* 其他数据类型已经在_handle_delta流程统一处理了，字符串和json串需要在这里处理，因为只有产品自己才知道string/json的自定义解析 */ + /* 鍏朵粬鏁版嵁绫诲瀷宸茬粡鍦╛handle_delta娴佺▼缁熶竴澶勭悊浜嗭紝瀛楃涓插拰json涓查渶瑕佸湪杩欓噷澶勭悊锛屽洜涓哄彧鏈変骇鍝佽嚜宸辨墠鐭ラ亾string/json鐨勮嚜瀹氫箟瑙ｆ瀽 */ if (strcmp(light_property_handler.property_wrappers[i].property.key, property->key) != 0) { continue; } @@ -288,7 +288,7 @@ static void on_property_delta_handler(void *client, const char *json_doc, uint32 QCLOUD_LOG_E("property=%s changed no match", property->key); } -/* 注册数据模板属性 */ +/* 娉ㄥ唽鏁版嵁妯℃澘灞炴 */ static qcloud_err_t data_template_property_register(qcloud_shadow_client_t *client) { int i = 0; @@ -324,17 +324,17 @@ __weak void OLED_ShowString(int x, int y, uint8_t *str, int bold) // handle the light(simulated) static void light_change_color(const char *color) { - // 作为demo，这里用oled屏字符显示来模拟灯颜色的切换 - // 这里应该由用户实现硬件操作代码，来改变智能灯的颜色 - // 此处demo，在开发板显示屏上显示具体的颜色 + // 浣滀负demo锛岃繖閲岀敤oled灞忓瓧绗︽樉绀烘潵妯℃嫙鐏鑹茬殑鍒囨崲 + // 杩欓噷搴旇鐢辩敤鎴峰疄鐜扮‖浠舵搷浣滀唬鐮侊紝鏉ユ敼鍙樻櫤鑳界伅鐨勯鑹 + // 姝ゅdemo锛屽湪寮鍙戞澘鏄剧ず灞忎笂鏄剧ず鍏蜂綋鐨勯鑹 OLED_ShowString(0, 0, (uint8_t *)color, 8); } static void light_change_brightness(template_float_t brightness) { - // 作为demo，这里用oled屏字符显示来模拟灯颜色的切换 - // 这里应该由用户实现硬件操作代码，来改变智能灯的颜色 - // 此处demo，在开发板显示屏上显示具体的颜色 + // 浣滀负demo锛岃繖閲岀敤oled灞忓瓧绗︽樉绀烘潵妯℃嫙鐏鑹茬殑鍒囨崲 + // 杩欓噷搴旇鐢辩敤鎴峰疄鐜扮‖浠舵搷浣滀唬鐮侊紝鏉ユ敼鍙樻櫤鑳界伅鐨勯鑹 + // 姝ゅdemo锛屽湪寮鍙戞澘鏄剧ず灞忎笂鏄剧ず鍏蜂綋鐨勯鑹 char brightness_str[12]; snprintf(brightness_str, sizeof(brightness_str), "%f", brightness); @@ -344,13 +344,13 @@ static void light_change_brightness(template_float_t brightness) static void light_power_on(void) { - // 作为demo，这里用oled屏字符显示来模拟灯颜色的切换 + // 浣滀负demo锛岃繖閲岀敤oled灞忓瓧绗︽樉绀烘潵妯℃嫙鐏鑹茬殑鍒囨崲 OLED_Clear(); } static void light_power_off(void) { - // 作为demo，这里用oled屏字符显示来模拟灯颜色的切换 + // 浣滀负demo锛岃繖閲岀敤oled灞忓瓧绗︽樉绀烘潵妯℃嫙鐏鑹茬殑鍒囨崲 char *info = "light off"; OLED_Clear(); OLED_ShowString(0, 0, (uint8_t *)info, 16); @@ -403,12 +403,12 @@ static void incoming_messsage_handler(void *client, void *context, mqtt_event_t } } -/* 示例灯光控制处理逻辑 */ +/* 绀轰緥鐏厜鎺у埗澶勭悊閫昏緫 */ static void deal_down_stream_user_logic(void) { char *color_name; - /* 灯光颜色 */ + /* 鐏厜棰滆壊 */ switch (light_profile.color) { case LIGHT_COLOR_RED: color_name = " RED "; @@ -423,19 +423,19 @@ static void deal_down_stream_user_logic(void) break; } - if (light_profile.switch_state == LIGHT_SWTICH_STATE_ON) { - /* 灯光开启式，按照控制参数展示 */ + if (light_profile.switch_state == LIGHT_SWITCH_STATE_ON) { + /* 鐏厜寮鍚紡锛屾寜鐓ф帶鍒跺弬鏁板睍绀 */ light_power_on(); light_change_color(color_name); light_change_brightness(light_profile.brightness); } else { - /* 灯光关闭展示 */ + /* 鐏厜鍏抽棴灞曠ず */ light_power_off(); } #if (QCLOUD_CFG_EVENT_EN > 0u) if (light_property_handler.property_wrappers_of.switch_state.state == PROPERTY_STATE_CHANGED) { - if (light_profile.switch_state == LIGHT_SWTICH_STATE_ON) { + if (light_profile.switch_state == LIGHT_SWITCH_STATE_ON) { strcpy(event_message, "light on"); event_status = EVENT_STATUS_LIGHT_ON; } else { @@ -448,7 +448,7 @@ static void deal_down_stream_user_logic(void) #endif } -/* 用户需要实现的上行数据的业务逻辑,此处仅供示例 */ +/* 鐢ㄦ埛闇瑕佸疄鐜扮殑涓婅鏁版嵁鐨勪笟鍔￠昏緫,姝ゅ浠呬緵绀轰緥 */ static void deal_up_stream_user_logic(shadow_dev_property_t *properties_report[], int *count) { int i, j; @@ -473,7 +473,7 @@ static void on_shadow_update_handler(void *client, QCLOUD_LOG_I("recv shadow update response, request state: %d", req_state); } -/* 5s定时上报属性状态,可根据业务裁剪，此处仅供示例 */ +/* 5s瀹氭椂涓婃姤灞炴х姸鎬,鍙牴鎹笟鍔¤鍓紝姝ゅ浠呬緵绀轰緥 */ qcloud_err_t timely_reporting(shadow_dev_property_t *properties_report[], osal_timer_t *report_timer) { int i; @@ -540,14 +540,14 @@ int data_template_light_thread(void) } #define SHADOW_REQUEST_TIMEOUT (10) // in seconds - // 离线期间服务端可能有下行命令，此处实现同步。version同步后台非必要 + // 绂荤嚎鏈熼棿鏈嶅姟绔彲鑳芥湁涓嬭鍛戒护锛屾澶勫疄鐜板悓姝ャ倂ersion鍚屾鍚庡彴闈炲繀瑕 rc = qcloud_shadow_client_get_sync(&shadow_client, SHADOW_REQUEST_TIMEOUT); if (rc != QCLOUD_ERR_SUCCESS) { QCLOUD_LOG_E("device shadow get failed, err: %d", rc); return rc; } - // 属性定时上报timer，可以根据业务需要裁剪。 + // 灞炴у畾鏃朵笂鎶imer锛屽彲浠ユ牴鎹笟鍔￠渶瑕佽鍓 osal_timer_init(&report_timer); while (qcloud_shadow_client_is_connected(&shadow_client) || @@ -562,20 +562,20 @@ int data_template_light_thread(void) } else if (rc != QCLOUD_ERR_SUCCESS && rc != QCLOUD_ERR_MQTT_RECONNECTED) { QCLOUD_LOG_E("exit with error: %d", rc); break; - } + } - /* 服务端下行消息，业务处理逻辑1入口 */ + /* 鏈嶅姟绔笅琛屾秷鎭紝涓氬姟澶勭悊閫昏緫1鍏ュ彛 */ if (is_light_property_changed) { deal_down_stream_user_logic(); - /* 业务逻辑处理完后需要同步通知服务端:设备数据已更新，删除dseire数据 */ + /* 涓氬姟閫昏緫澶勭悊瀹屽悗闇瑕佸悓姝ラ氱煡鏈嶅姟绔:璁惧鏁版嵁宸叉洿鏂帮紝鍒犻櫎dseire鏁版嵁 */ rc = qcloud_shadow_client_desire_null_construct(&shadow_client, shadow_update_buffer, sizeof(shadow_update_buffer)); if (rc == QCLOUD_ERR_SUCCESS) { rc = qcloud_shadow_client_update_sync(&shadow_client, shadow_update_buffer, sizeof(shadow_update_buffer), 5); if (rc == QCLOUD_ERR_SUCCESS) { is_light_property_changed = QCLOUD_FALSE; - // 用户需要根据业务情况修改上报flag的赋值位置,此处仅为示例。 + // 鐢ㄦ埛闇瑕佹牴鎹笟鍔℃儏鍐典慨鏀逛笂鎶lag鐨勮祴鍊间綅缃,姝ゅ浠呬负绀轰緥銆 is_new_property_reported = QCLOUD_TRUE; QCLOUD_LOG_I("shadow update(desired) success"); } else { @@ -586,9 +586,9 @@ int data_template_light_thread(void) } } - /* 设备上行消息,业务逻辑2入口 */ + /* 璁惧涓婅娑堟伅,涓氬姟閫昏緫2鍏ュ彛 */ if (is_new_property_reported) { - /* delta消息是属性的desire和属性的report的差异集，收到deseire消息处理后，要report属性的状态 */ + /* delta娑堟伅鏄睘鎬х殑desire鍜屽睘鎬х殑report鐨勫樊寮傞泦锛屾敹鍒癲eseire娑堟伅澶勭悊鍚庯紝瑕乺eport灞炴х殑鐘舵 */ deal_up_stream_user_logic(properties_report, &properties_report_count); if (properties_report_count > 0) { rc = qcloud_shadow_client_report_construct_array(&shadow_client, shadow_update_buffer, sizeof(shadow_update_buffer), @@ -632,7 +632,7 @@ int data_template_light_thread(void) } #if (QCLOUD_CFG_EVENT_EN > 0u) - // 事件上报 + // 浜嬩欢涓婃姤 event_count = 0; event_flag = event_flag_get(); if (EVENT_COUNTS > 0 && event_flag > 0) {