fix comment
This commit is contained in:
@@ -223,7 +223,7 @@ static void property_do_update(shadow_dev_property_t *property)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case JSON_DATA_TYPE_STRING: // device name
|
case JSON_DATA_TYPE_STRING: // device name
|
||||||
/* 如果多个å—符串属性,æ ¹æ®pProperty->key值匹é…,处ç†å—符串 */
|
/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><><EFBFBD><EFBFBD>pProperty->keyֵƥ<D6B5>䣬<EFBFBD><E4A3AC><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD> */
|
||||||
if (strcmp("name", property->key) != 0) {
|
if (strcmp("name", property->key) != 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -235,7 +235,7 @@ static void property_do_update(shadow_dev_property_t *property)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Èç¹ûÓÐ×Ô¶¨ÒåµÄ×Ö·û´®»òÕßjson£¬ÐèÒªÔÚÕâÀï½âÎö */
|
/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>json<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
||||||
static qcloud_err_t property_update(const char *json_doc, shadow_dev_property_t *property)
|
static qcloud_err_t property_update(const char *json_doc, shadow_dev_property_t *property)
|
||||||
{
|
{
|
||||||
QCLOUD_POINTER_SANITY_CHECK(json_doc, QCLOUD_ERR_INVAL);
|
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;
|
return QCLOUD_ERR_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* æœåŠ¡ç«¯æœ‰æŽ§åˆ¶æ¶ˆæ¯ä¸‹å‘,会触å‘这里的delta回调 */
|
/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>п<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD>·<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᴥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>delta<EFBFBD>ص<EFBFBD> */
|
||||||
static void on_property_delta_handler(void *client, const char *json_doc, uint32_t json_doc_len, shadow_dev_property_t *property)
|
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;
|
int i = 0;
|
||||||
|
|
||||||
for (i = 0; i < LIGHT_PROPERTY_COUNT; ++i) {
|
for (i = 0; i < LIGHT_PROPERTY_COUNT; ++i) {
|
||||||
/* ÆäËûÊý¾ÝÀàÐÍÒѾÔÚ_handle_deltaÁ÷³Ìͳһ´¦ÀíÁË£¬×Ö·û´®ºÍjson´®ÐèÒªÔÚÕâÀï´¦Àí£¬ÒòΪֻÓвúÆ·×Ô¼º²ÅÖªµÀstring/jsonµÄ×Ô¶¨Òå½âÎö */
|
/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѿ<EFBFBD><EFBFBD><EFBFBD>_handle_delta<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͳһ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˣ<EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>json<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ﴦ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊֻ<EFBFBD>в<EFBFBD>Ʒ<EFBFBD>Լ<EFBFBD><EFBFBD><EFBFBD>֪<EFBFBD><EFBFBD>string/json<6F><6E><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
||||||
if (strcmp(light_property_handler.property_wrappers[i].property.key, property->key) != 0) {
|
if (strcmp(light_property_handler.property_wrappers[i].property.key, property->key) != 0) {
|
||||||
continue;
|
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);
|
QCLOUD_LOG_E("property=%s changed no match", property->key);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ×¢²áÊý¾ÝÄ£°åÊôÐÔ */
|
/* ע<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
||||||
static qcloud_err_t data_template_property_register(qcloud_shadow_client_t *client)
|
static qcloud_err_t data_template_property_register(qcloud_shadow_client_t *client)
|
||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
@@ -324,17 +324,17 @@ __weak void OLED_ShowString(int x, int y, uint8_t *str, int bold)
|
|||||||
// handle the light(simulated)
|
// handle the light(simulated)
|
||||||
static void light_change_color(const char *color)
|
static void light_change_color(const char *color)
|
||||||
{
|
{
|
||||||
// 作为demo,这里用oledå±å—ç¬¦æ˜¾ç¤ºæ¥æ¨¡æ‹Ÿç¯é¢œè‰²çš„切æ¢
|
// <EFBFBD><EFBFBD>Ϊdemo<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>oled<EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>ģ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ<EFBFBD><EFBFBD><EFBFBD>л<EFBFBD>
|
||||||
// 这里应该由用户实现硬件æ“作代ç ï¼Œæ¥æ”¹å˜æ™ºèƒ½ç¯çš„颜色
|
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>ʵ<EFBFBD><EFBFBD>Ӳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>룬<EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܵƵ<EFBFBD><EFBFBD><EFBFBD>ɫ
|
||||||
// æ¤å¤„demoï¼Œåœ¨å¼€å‘æ¿æ˜¾ç¤ºå±ä¸Šæ˜¾ç¤ºå…·ä½“的颜色
|
// <EFBFBD>˴<EFBFBD>demo<EFBFBD><EFBFBD><EFBFBD>ڿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ
|
||||||
OLED_ShowString(0, 0, (uint8_t *)color, 8);
|
OLED_ShowString(0, 0, (uint8_t *)color, 8);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void light_change_brightness(template_float_t brightness)
|
static void light_change_brightness(template_float_t brightness)
|
||||||
{
|
{
|
||||||
// 作为demo,这里用oledå±å—ç¬¦æ˜¾ç¤ºæ¥æ¨¡æ‹Ÿç¯äº®åº¦çš„切æ¢
|
// <EFBFBD><EFBFBD>Ϊdemo<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>oled<EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>ģ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ<EFBFBD><EFBFBD><EFBFBD>л<EFBFBD>
|
||||||
// 这里应该由用户实现硬件æ“作代ç ï¼Œæ¥æ”¹å˜æ™ºèƒ½ç¯çš„亮度
|
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>ʵ<EFBFBD><EFBFBD>Ӳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>룬<EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܵƵ<EFBFBD><EFBFBD><EFBFBD>ɫ
|
||||||
// æ¤å¤„demoï¼Œåœ¨å¼€å‘æ¿æ˜¾ç¤ºå±ä¸Šæ˜¾ç¤ºå…·ä½“的亮度
|
// <EFBFBD>˴<EFBFBD>demo<EFBFBD><EFBFBD><EFBFBD>ڿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ
|
||||||
char brightness_str[12];
|
char brightness_str[12];
|
||||||
|
|
||||||
snprintf(brightness_str, sizeof(brightness_str), "%f", brightness);
|
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)
|
static void light_power_on(void)
|
||||||
{
|
{
|
||||||
// 作为demo,这里用oledå±å—ç¬¦æ˜¾ç¤ºæ¥æ¨¡æ‹Ÿç¯å¼€å…³çжæ€çš„切æ¢
|
// <EFBFBD><EFBFBD>Ϊdemo<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>oled<EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>ģ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ<EFBFBD><EFBFBD><EFBFBD>л<EFBFBD>
|
||||||
OLED_Clear();
|
OLED_Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void light_power_off(void)
|
static void light_power_off(void)
|
||||||
{
|
{
|
||||||
// 作为demo,这里用oledå±å—ç¬¦æ˜¾ç¤ºæ¥æ¨¡æ‹Ÿç¯å¼€å…³çжæ€çš„切æ¢
|
// <EFBFBD><EFBFBD>Ϊdemo<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>oled<EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>ģ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɫ<EFBFBD><EFBFBD><EFBFBD>л<EFBFBD>
|
||||||
char *info = "light off";
|
char *info = "light off";
|
||||||
OLED_Clear();
|
OLED_Clear();
|
||||||
OLED_ShowString(0, 0, (uint8_t *)info, 16);
|
OLED_ShowString(0, 0, (uint8_t *)info, 16);
|
||||||
@@ -403,11 +403,12 @@ static void incoming_messsage_handler(void *client, void *context, mqtt_event_t
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ʾÀýµÆ¹â¿ØÖÆ´¦ÀíÂß¼ */
|
/* ʾ<EFBFBD><EFBFBD><EFBFBD>ƹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
||||||
static void deal_down_stream_user_logic(void)
|
static void deal_down_stream_user_logic(void)
|
||||||
{
|
{
|
||||||
char *color_name;
|
char *color_name;
|
||||||
|
|
||||||
|
/* <20>ƹ<EFBFBD><C6B9><EFBFBD>ɫ */
|
||||||
switch (light_profile.color) {
|
switch (light_profile.color) {
|
||||||
case LIGHT_COLOR_RED:
|
case LIGHT_COLOR_RED:
|
||||||
color_name = " RED ";
|
color_name = " RED ";
|
||||||
@@ -423,10 +424,12 @@ static void deal_down_stream_user_logic(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (light_profile.switch_state == LIGHT_SWTICH_STATE_ON) {
|
if (light_profile.switch_state == LIGHT_SWTICH_STATE_ON) {
|
||||||
|
/* <20>ƹ<C6B9><E2BFAA>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD><EFBFBD>տ<EFBFBD><D5BF>Ʋ<EFBFBD><C6B2><EFBFBD>չʾ */
|
||||||
light_power_on();
|
light_power_on();
|
||||||
light_change_color(color_name);
|
light_change_color(color_name);
|
||||||
light_change_brightness(light_profile.brightness);
|
light_change_brightness(light_profile.brightness);
|
||||||
} else {
|
} else {
|
||||||
|
/* <20>ƹ<EFBFBD><C6B9>ر<EFBFBD>չʾ */
|
||||||
light_power_off();
|
light_power_off();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -445,14 +448,13 @@ static void deal_down_stream_user_logic(void)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Óû§ÐèҪʵÏÖµÄÉÏÐÐÊý¾ÝµÄÒµÎñÂß¼,´Ë´¦½ö¹©Ê¾Àý */
|
/* <EFBFBD>û<EFBFBD><EFBFBD><EFBFBD>Ҫʵ<EFBFBD>ֵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵ<EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C>˴<EFBFBD><CBB4><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE> */
|
||||||
static void deal_up_stream_user_logic(shadow_dev_property_t *properties_report[], int *count)
|
static void deal_up_stream_user_logic(shadow_dev_property_t *properties_report[], int *count)
|
||||||
{
|
{
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
*count = 0;
|
*count = 0;
|
||||||
|
|
||||||
/* ÌáÈ¡³ö·¢Éú±ä¸üÁ˵ÄÊôÐÔ£¬Éϱ¨µ½ÔÆ */
|
|
||||||
for (i = 0, j = 0; i < LIGHT_PROPERTY_COUNT; ++i) {
|
for (i = 0, j = 0; i < LIGHT_PROPERTY_COUNT; ++i) {
|
||||||
if (light_property_handler.property_wrappers[i].state == PROPERTY_STATE_CHANGED) {
|
if (light_property_handler.property_wrappers[i].state == PROPERTY_STATE_CHANGED) {
|
||||||
properties_report[j++] = &(light_property_handler.property_wrappers[i].property);
|
properties_report[j++] = &(light_property_handler.property_wrappers[i].property);
|
||||||
@@ -471,7 +473,7 @@ static void on_shadow_update_handler(void *client,
|
|||||||
QCLOUD_LOG_I("recv shadow update response, request state: %d", req_state);
|
QCLOUD_LOG_I("recv shadow update response, request state: %d", req_state);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 5s¶¨Ê±Éϱ¨ÊôÐÔ״̬,¿É¸ù¾ÝÒµÎñ²Ã¼ô£¬´Ë´¦½ö¹©Ê¾Àý */
|
/* 5s<EFBFBD><EFBFBD>ʱ<EFBFBD>ϱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬,<2C>ɸ<EFBFBD><C9B8><EFBFBD>ҵ<EFBFBD><D2B5><EFBFBD>ü<EFBFBD><C3BC><EFBFBD><EFBFBD>˴<EFBFBD><CBB4><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE> */
|
||||||
qcloud_err_t timely_reporting(shadow_dev_property_t *properties_report[], osal_timer_t *report_timer)
|
qcloud_err_t timely_reporting(shadow_dev_property_t *properties_report[], osal_timer_t *report_timer)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@@ -512,10 +514,12 @@ int data_template_light_thread(void)
|
|||||||
|
|
||||||
qcloud_device_create(&device, "XC31USKYPL", "dev001", "Pz1wK0fVJHxSojqxDuuvmg==");
|
qcloud_device_create(&device, "XC31USKYPL", "dev001", "Pz1wK0fVJHxSojqxDuuvmg==");
|
||||||
|
|
||||||
|
// init connection
|
||||||
qcloud_shadow_client_create(&shadow_client, &device, incoming_messsage_handler, SHADOW_TYPE_TEMPLATE);
|
qcloud_shadow_client_create(&shadow_client, &device, incoming_messsage_handler, SHADOW_TYPE_TEMPLATE);
|
||||||
|
|
||||||
light_power_off();
|
light_power_off();
|
||||||
|
|
||||||
|
// init data template
|
||||||
data_template_init(&device);
|
data_template_init(&device);
|
||||||
|
|
||||||
#if (QCLOUD_CFG_EVENT_EN > 0u)
|
#if (QCLOUD_CFG_EVENT_EN > 0u)
|
||||||
@@ -526,6 +530,7 @@ int data_template_light_thread(void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// register data template propertys here
|
||||||
rc = data_template_property_register(&shadow_client);
|
rc = data_template_property_register(&shadow_client);
|
||||||
if (rc == QCLOUD_ERR_SUCCESS) {
|
if (rc == QCLOUD_ERR_SUCCESS) {
|
||||||
QCLOUD_LOG_I("data template propertys register success");
|
QCLOUD_LOG_I("data template propertys register success");
|
||||||
@@ -535,13 +540,14 @@ int data_template_light_thread(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#define SHADOW_REQUEST_TIMEOUT (10) // in seconds
|
#define SHADOW_REQUEST_TIMEOUT (10) // in seconds
|
||||||
|
// <20><><EFBFBD><EFBFBD><EFBFBD>ڼ<EFBFBD><DABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˿<EFBFBD><CBBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˴<EFBFBD>ʵ<EFBFBD><CAB5>ͬ<EFBFBD><CDAC><EFBFBD><EFBFBD>versionͬ<6E><CDAC><EFBFBD><EFBFBD>̨<EFBFBD>DZ<EFBFBD>Ҫ
|
||||||
rc = qcloud_shadow_client_get_sync(&shadow_client, SHADOW_REQUEST_TIMEOUT);
|
rc = qcloud_shadow_client_get_sync(&shadow_client, SHADOW_REQUEST_TIMEOUT);
|
||||||
if (rc != QCLOUD_ERR_SUCCESS) {
|
if (rc != QCLOUD_ERR_SUCCESS) {
|
||||||
QCLOUD_LOG_E("device shadow get failed, err: %d", rc);
|
QCLOUD_LOG_E("device shadow get failed, err: %d", rc);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 属性定时上报timer,å¯ä»¥æ ¹æ®ä¸šåŠ¡éœ€è¦è£å‰ªã€‚
|
// <EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD>ʱ<EFBFBD>ϱ<EFBFBD>timer<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ը<EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD>ü<EFBFBD><EFBFBD><EFBFBD>
|
||||||
osal_timer_init(&report_timer);
|
osal_timer_init(&report_timer);
|
||||||
|
|
||||||
while (qcloud_shadow_client_is_connected(&shadow_client) ||
|
while (qcloud_shadow_client_is_connected(&shadow_client) ||
|
||||||
@@ -558,19 +564,19 @@ int data_template_light_thread(void)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ·þÎñ¶ËÏÂÐÐÏûÏ¢£¬ÒµÎñ´¦ÀíÂß¼1Èë¿Ú */
|
/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1<EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
||||||
if (is_light_property_changed) {
|
if (is_light_property_changed) {
|
||||||
// æœåС噍䏋å‘了控制指令,更改了设备的状æ€
|
// æœåС噍䏋å‘了控制指令,更改了设备的状æ€
|
||||||
deal_down_stream_user_logic();
|
deal_down_stream_user_logic();
|
||||||
|
|
||||||
/* ÒµÎñÂß¼´¦ÀíÍêºóÐèҪͬ²½Í¨Öª·þÎñ¶Ë:É豸Êý¾ÝÒѸüУ¬É¾³ýdseireÊý¾Ý */
|
/* ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫͬ<EFBFBD><EFBFBD>֪ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><EFBFBD>Ѹ<EFBFBD><D1B8>£<EFBFBD>ɾ<EFBFBD><C9BE>dseire<EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
||||||
rc = qcloud_shadow_client_desire_null_construct(&shadow_client, shadow_update_buffer, sizeof(shadow_update_buffer));
|
rc = qcloud_shadow_client_desire_null_construct(&shadow_client, shadow_update_buffer, sizeof(shadow_update_buffer));
|
||||||
if (rc == QCLOUD_ERR_SUCCESS) {
|
if (rc == QCLOUD_ERR_SUCCESS) {
|
||||||
rc = qcloud_shadow_client_update_sync(&shadow_client, shadow_update_buffer, sizeof(shadow_update_buffer), 5);
|
rc = qcloud_shadow_client_update_sync(&shadow_client, shadow_update_buffer, sizeof(shadow_update_buffer), 5);
|
||||||
if (rc == QCLOUD_ERR_SUCCESS) {
|
if (rc == QCLOUD_ERR_SUCCESS) {
|
||||||
is_light_property_changed = QCLOUD_FALSE;
|
is_light_property_changed = QCLOUD_FALSE;
|
||||||
|
|
||||||
// Óû§ÐèÒª¸ù¾ÝÒµÎñÇé¿öÐÞ¸ÄÉϱ¨flagµÄ¸³ÖµÎ»ÖÃ,´Ë´¦½öΪʾÀý¡£
|
// <EFBFBD>û<EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD>flag<EFBFBD>ĸ<EFBFBD>ֵλ<EFBFBD><EFBFBD>,<2C>˴<EFBFBD><CBB4><EFBFBD>Ϊʾ<CEAA><CABE><EFBFBD><EFBFBD>
|
||||||
is_new_property_reported = QCLOUD_TRUE;
|
is_new_property_reported = QCLOUD_TRUE;
|
||||||
QCLOUD_LOG_I("shadow update(desired) success");
|
QCLOUD_LOG_I("shadow update(desired) success");
|
||||||
} else {
|
} else {
|
||||||
@@ -581,9 +587,9 @@ int data_template_light_thread(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* É豸ÉÏÐÐÏûÏ¢,ÒµÎñÂß¼2Èë¿Ú */
|
/* <EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ,ҵ<><D2B5><EFBFBD><EFBFBD>2<EFBFBD><32><EFBFBD><EFBFBD> */
|
||||||
if (is_new_property_reported) {
|
if (is_new_property_reported) {
|
||||||
/* deltaÏûÏ¢ÊÇÊôÐÔµÄdesireºÍÊôÐÔµÄreportµÄ²îÒ켯£¬ÊÕµ½deseireÏûÏ¢´¦Àíºó£¬ÒªreportÊôÐÔµÄ״̬ */
|
/* delta<EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ե<EFBFBD>desire<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ե<EFBFBD>report<EFBFBD>IJ<EFBFBD><EFBFBD>켯<EFBFBD><EFBFBD><EFBFBD>յ<EFBFBD>deseire<EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫreport<EFBFBD><EFBFBD><EFBFBD>Ե<EFBFBD>״̬ */
|
||||||
deal_up_stream_user_logic(properties_report, &properties_report_count);
|
deal_up_stream_user_logic(properties_report, &properties_report_count);
|
||||||
if (properties_report_count > 0) {
|
if (properties_report_count > 0) {
|
||||||
rc = qcloud_shadow_client_report_construct_array(&shadow_client, shadow_update_buffer, sizeof(shadow_update_buffer),
|
rc = qcloud_shadow_client_report_construct_array(&shadow_client, shadow_update_buffer, sizeof(shadow_update_buffer),
|
||||||
@@ -627,7 +633,7 @@ int data_template_light_thread(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if (QCLOUD_CFG_EVENT_EN > 0u)
|
#if (QCLOUD_CFG_EVENT_EN > 0u)
|
||||||
// ʼþÉϱ¨
|
// <EFBFBD>¼<EFBFBD><EFBFBD>ϱ<EFBFBD>
|
||||||
event_count = 0;
|
event_count = 0;
|
||||||
event_flag = event_flag_get();
|
event_flag = event_flag_get();
|
||||||
if (EVENT_COUNTS > 0 && event_flag > 0) {
|
if (EVENT_COUNTS > 0 && event_flag > 0) {
|
||||||
|
Reference in New Issue
Block a user