From 3f2605cd7888f099e3d8c80a78e7acac7bd4c480 Mon Sep 17 00:00:00 2001 From: zogodo <742782908@qq.com> Date: Wed, 25 Sep 2019 17:10:21 +0800 Subject: [PATCH] utf-8 --- TC1/main.c | 18 +++++------ TC1/main.h | 20 ++++++------ TC1/user_function.c | 72 +++++++++++++++++++++--------------------- TC1/user_gpio.c | 16 +++++----- TC1/user_mqtt_client.c | 16 ++++------ TC1/user_rtc.c | 14 ++++---- TC1/user_sntp.c | 2 +- TC1/user_wifi.c | 28 ++++++++-------- 8 files changed, 91 insertions(+), 95 deletions(-) diff --git a/TC1/main.c b/TC1/main.c index 25b911a..cab7292 100644 --- a/TC1/main.c +++ b/TC1/main.c @@ -13,7 +13,7 @@ -char rtc_init = 0; //sntp校时成功标志位 +char rtc_init = 0; //sntp鏍℃椂鎴愬姛鏍囧織浣 uint32_t total_time = 0; char strMac[16] = { 0 }; uint32_t power = 0; @@ -31,7 +31,7 @@ void appRestoreDefault_callback(void * const user_config_data, uint32_t size) UNUSED_PARAMETER(size); - mico_system_context_get()->micoSystemConfig.name[0] = 1; //在下次重启时使用默认名称 + mico_system_context_get()->micoSystemConfig.name[0] = 1; //鍦ㄤ笅娆￠噸鍚椂浣跨敤榛樿鍚嶇О mico_system_context_get()->micoSystemConfig.name[1] = 0; user_config_t* userConfigDefault = user_config_data; @@ -47,7 +47,7 @@ void appRestoreDefault_callback(void * const user_config_data, uint32_t size) { userConfigDefault->plug[i].on = 1; - //插座名称 插口1-6 + //鎻掑骇鍚嶇О 鎻掑彛1-6 userConfigDefault->plug[i].name[0] = 0xe6; userConfigDefault->plug[i].name[1] = 0x8f; userConfigDefault->plug[i].name[2] = 0x92; @@ -57,7 +57,7 @@ void appRestoreDefault_callback(void * const user_config_data, uint32_t size) userConfigDefault->plug[i].name[6] = i + '1'; userConfigDefault->plug[i].name[7] = 0; -// sprintf(userConfigDefault->plug[i].name, "插座%d", i);//编码异常 +// sprintf(userConfigDefault->plug[i].name, "鎻掑骇%d", i);//缂栫爜寮傚父 for (j = 0; j < PLUG_TIME_TASK_NUM; j++) { userConfigDefault->plug[i].task[j].hour = 0; @@ -97,9 +97,9 @@ int application_start(void) MicoGpioInitialize((mico_gpio_t) Button, INPUT_PULL_UP); if (!MicoGpioInputGet(Button)) - { //开机时按钮状态 + { //寮鏈烘椂鎸夐挳鐘舵 os_log("wifi_start_easylink"); - wifi_status = WIFI_STATE_NOEASYLINK; //wifi_init中启动easylink + wifi_status = WIFI_STATE_NOEASYLINK; //wifi_init涓惎鍔╡asylink } MicoGpioInitialize((mico_gpio_t) Led, OUTPUT_PUSH_PULL); @@ -120,7 +120,7 @@ int application_start(void) if (sys_config->micoSystemConfig.name[0] == 1) { IPStatusTypedef para; - os_log("micoWlanGetIPStatus:%d", micoWlanGetIPStatus(¶, Station)); //mac读出来全部是0??!!! + os_log("micoWlanGetIPStatus:%d", micoWlanGetIPStatus(¶, Station)); //mac璇诲嚭鏉ュ叏閮ㄦ槸0??!!! strcpy(strMac, para.mac); os_log("result:%s",strMac); os_log("result:%s",para.mac); @@ -153,7 +153,7 @@ int application_start(void) // } // } - //sys_config = mico_system_context_init(sizeof(user_config_t)); //获取Flash中的配置 + //sys_config = mico_system_context_init(sizeof(user_config_t)); //鑾峰彇Flash涓殑閰嶇疆 ap_init(); wifi_init(); user_udp_init(); @@ -169,7 +169,7 @@ int application_start(void) while (1) { main_num++; - //发送功率数据 + //鍙戦佸姛鐜囨暟鎹 if (power_last != power || main_num>4) { power_last = power; diff --git a/TC1/main.h b/TC1/main.h index 181b566..5706d08 100644 --- a/TC1/main.h +++ b/TC1/main.h @@ -12,11 +12,11 @@ #define ZTC1_NAME "zTC1_%02X%02X" #define USER_CONFIG_VERSION 2 -#define SETTING_MQTT_STRING_LENGTH_MAX 32 //必须 4 字节对齐。 +#define SETTING_MQTT_STRING_LENGTH_MAX 32 //蹇呴』 4 瀛楄妭瀵归綈銆 #define PLUG_NAME_LENGTH 32 -#define PLUG_NUM 6 //插座数量 -#define PLUG_TIME_TASK_NUM 5 //每个插座最多5组定时任务 +#define PLUG_NUM 6 //鎻掑骇鏁伴噺 +#define PLUG_TIME_TASK_NUM 5 //姣忎釜鎻掑骇鏈澶5缁勫畾鏃朵换鍔 #define Led MICO_GPIO_5 #define Button MICO_GPIO_23 @@ -35,22 +35,22 @@ typedef struct { - char hour; //小时 - char minute; //分钟 - char repeat; //bit7:一次 bit6-0:周日-周一 - char action; //动作 - char on; //开关 + char hour; //灏忔椂 + char minute; //鍒嗛挓 + char repeat; //bit7:涓娆 bit6-0:鍛ㄦ棩-鍛ㄤ竴 + char action; //鍔ㄤ綔 + char on; //寮鍏 } user_plug_task_config_t; typedef struct { char name[PLUG_NAME_LENGTH]; - char on; //记录当前开关 + char on; //璁板綍褰撳墠寮鍏 user_plug_task_config_t task[PLUG_TIME_TASK_NUM]; } user_plug_config_t; -//用户保存参数结构体 +//鐢ㄦ埛淇濆瓨鍙傛暟缁撴瀯浣 typedef struct { char mqtt_ip[SETTING_MQTT_STRING_LENGTH_MAX]; //mqtt service ip diff --git a/TC1/user_function.c b/TC1/user_function.c index a912954..1a65e31 100644 --- a/TC1/user_function.c +++ b/TC1/user_function.c @@ -22,7 +22,7 @@ bool json_plug_task_analysis(unsigned char x, unsigned char y, cJSON * pJsonRoot void user_send(int udp_flag, char *s) { if (udp_flag || !user_mqtt_isconnect()) - user_udp_send(s); //发送数据 + user_udp_send(s); //鍙戦佹暟鎹 else user_mqtt_send(s); } @@ -31,8 +31,8 @@ void user_function_cmd_received(int udp_flag, char* pusrdata) { unsigned char i; - bool update_user_config_flag = false; //标志位,记录最后是否需要更新储存的数据 - bool return_flag = true; //为true时返回json结果,否则不返回 + bool update_user_config_flag = false; //鏍囧織浣,璁板綍鏈鍚庢槸鍚﹂渶瑕佹洿鏂板偍瀛樼殑鏁版嵁 + bool return_flag = true; //涓簍rue鏃惰繑鍥瀓son缁撴灉,鍚﹀垯涓嶈繑鍥 cJSON * pJsonRoot = cJSON_Parse(pusrdata); if (!pJsonRoot) @@ -41,7 +41,7 @@ void user_function_cmd_received(int udp_flag, char* pusrdata) return; } - //解析UDP命令device report(MQTT同样回复命令) + //瑙ｆ瀽UDP鍛戒护device report(MQTT鍚屾牱鍥炲鍛戒护) cJSON *p_cmd = cJSON_GetObjectItem(pJsonRoot, "cmd"); if (p_cmd && cJSON_IsString(p_cmd) && strcmp(p_cmd->valuestring, "device report") == 0) { @@ -57,17 +57,17 @@ void user_function_cmd_received(int udp_flag, char* pusrdata) char *s = cJSON_Print(pRoot); // os_log("pRoot: %s\r\n", s); - user_send(udp_flag, s); //发送数据 + user_send(udp_flag, s); //鍙戦佹暟鎹 free((void *) s); cJSON_Delete(pRoot); // cJSON_Delete(p_cmd); } - //以下为解析命令部分 + //浠ヤ笅涓鸿В鏋愬懡浠ら儴鍒 cJSON *p_name = cJSON_GetObjectItem(pJsonRoot, "name"); cJSON *p_mac = cJSON_GetObjectItem(pJsonRoot, "mac"); - //开始正式处理所有命令 + //寮濮嬫寮忓鐞嗘墍鏈夊懡浠 if ((p_name && cJSON_IsString(p_name) && strcmp(p_name->valuestring, sys_config->micoSystemConfig.name) == 0) //name || (p_mac && cJSON_IsString(p_mac) && strcmp(p_mac->valuestring, strMac) == 0) //mac ) @@ -75,7 +75,7 @@ void user_function_cmd_received(int udp_flag, char* pusrdata) cJSON *json_send = cJSON_CreateObject(); cJSON_AddStringToObject(json_send, "mac", strMac); - //解析重启命令 + //瑙ｆ瀽閲嶅惎鍛戒护 // cJSON *p_cmd = cJSON_GetObjectItem(pJsonRoot, "name"); if(p_cmd && cJSON_IsString(p_cmd) && strcmp(p_cmd->valuestring, "restart") == 0) { @@ -83,20 +83,20 @@ void user_function_cmd_received(int udp_flag, char* pusrdata) mico_system_power_perform(mico_system_context_get(), eState_Software_Reset); } - //解析版本 + //瑙ｆ瀽鐗堟湰 cJSON *p_version = cJSON_GetObjectItem(pJsonRoot, "version"); if (p_version) { os_log("version:%s",VERSION); cJSON_AddStringToObject(json_send, "version", VERSION); } - //解析运行时间 + //瑙ｆ瀽杩愯鏃堕棿 cJSON *p_total_time = cJSON_GetObjectItem(pJsonRoot, "total_time"); if (p_total_time) { cJSON_AddNumberToObject(json_send, "total_time", total_time); } - //解析功率 + //瑙ｆ瀽鍔熺巼 cJSON *p_power = cJSON_GetObjectItem(pJsonRoot, "power"); if (p_power) { @@ -109,11 +109,11 @@ void user_function_cmd_received(int udp_flag, char* pusrdata) } os_log("power:%d", (int)power); } - //解析主机setting----------------------------------------------------------------- + //瑙ｆ瀽涓绘満setting----------------------------------------------------------------- cJSON *p_setting = cJSON_GetObjectItem(pJsonRoot, "setting"); if (p_setting) { - //解析ota + //瑙ｆ瀽ota cJSON *p_ota = cJSON_GetObjectItem(p_setting, "ota"); if (p_ota) { @@ -122,7 +122,7 @@ void user_function_cmd_received(int udp_flag, char* pusrdata) } cJSON *json_setting_send = cJSON_CreateObject(); - //设置设备名称/deviceid + //璁剧疆璁惧鍚嶇О/deviceid cJSON *p_setting_name = cJSON_GetObjectItem(p_setting, "name"); if (p_setting_name && cJSON_IsString(p_setting_name)) { @@ -130,7 +130,7 @@ void user_function_cmd_received(int udp_flag, char* pusrdata) sprintf(sys_config->micoSystemConfig.name, p_setting_name->valuestring); } - //设置mqtt ip + //璁剧疆mqtt ip cJSON *p_mqtt_ip = cJSON_GetObjectItem(p_setting, "mqtt_uri"); if (p_mqtt_ip && cJSON_IsString(p_mqtt_ip)) { @@ -138,7 +138,7 @@ void user_function_cmd_received(int udp_flag, char* pusrdata) sprintf(user_config->mqtt_ip, p_mqtt_ip->valuestring); } - //设置mqtt port + //璁剧疆mqtt port cJSON *p_mqtt_port = cJSON_GetObjectItem(p_setting, "mqtt_port"); if (p_mqtt_port && cJSON_IsNumber(p_mqtt_port)) { @@ -146,7 +146,7 @@ void user_function_cmd_received(int udp_flag, char* pusrdata) user_config->mqtt_port = p_mqtt_port->valueint; } - //设置mqtt user + //璁剧疆mqtt user cJSON *p_mqtt_user = cJSON_GetObjectItem(p_setting, "mqtt_user"); if (p_mqtt_user && cJSON_IsString(p_mqtt_user)) { @@ -154,7 +154,7 @@ void user_function_cmd_received(int udp_flag, char* pusrdata) sprintf(user_config->mqtt_user, p_mqtt_user->valuestring); } - //设置mqtt password + //璁剧疆mqtt password cJSON *p_mqtt_password = cJSON_GetObjectItem(p_setting, "mqtt_password"); if (p_mqtt_password && cJSON_IsString(p_mqtt_password)) { @@ -162,25 +162,25 @@ void user_function_cmd_received(int udp_flag, char* pusrdata) sprintf(user_config->mqtt_password, p_mqtt_password->valuestring); } - //开发返回数据 - //返回设备ota + //寮鍙戣繑鍥炴暟鎹 + //杩斿洖璁惧ota if (p_ota) cJSON_AddStringToObject(json_setting_send, "ota", p_ota->valuestring); - //返回设备名称/deviceid + //杩斿洖璁惧鍚嶇О/deviceid if (p_setting_name) cJSON_AddStringToObject(json_setting_send, "name", sys_config->micoSystemConfig.name); - //返回mqtt ip + //杩斿洖mqtt ip if (p_mqtt_ip) cJSON_AddStringToObject(json_setting_send, "mqtt_uri", user_config->mqtt_ip); - //返回mqtt port + //杩斿洖mqtt port if (p_mqtt_port) cJSON_AddNumberToObject(json_setting_send, "mqtt_port", user_config->mqtt_port); - //返回mqtt user + //杩斿洖mqtt user if (p_mqtt_user) cJSON_AddStringToObject(json_setting_send, "mqtt_user", user_config->mqtt_user); - //返回mqtt password + //杩斿洖mqtt password if (p_mqtt_password) cJSON_AddStringToObject(json_setting_send, "mqtt_password", user_config->mqtt_password); cJSON_AddItemToObject(json_send, "setting", json_setting_send); } - //解析plug----------------------------------------------------------------- + //瑙ｆ瀽plug----------------------------------------------------------------- for (i = 0; i < PLUG_NUM; i++) { if (json_plug_analysis(udp_flag, i, pJsonRoot, json_send)) @@ -193,7 +193,7 @@ void user_function_cmd_received(int udp_flag, char* pusrdata) { char *json_str = cJSON_Print(json_send); // os_log("pRoot: %s\r\n", json_str); - user_send(udp_flag, json_str); //发送数据 + user_send(udp_flag, json_str); //鍙戦佹暟鎹 free((void *) json_str); } cJSON_Delete(json_send); @@ -210,9 +210,9 @@ void user_function_cmd_received(int udp_flag, char* pusrdata) } /* - *解析处理定时任务json - *udp_flag:发送udp/mqtt标志位,此处修改插座开关状态时,需要实时更新给domoticz - *x:插座编号 + *瑙ｆ瀽澶勭悊瀹氭椂浠诲姟json + *udp_flag:鍙戦乽dp/mqtt鏍囧織浣,姝ゅ淇敼鎻掑骇寮鍏崇姸鎬佹椂,闇瑕佸疄鏃舵洿鏂扮粰domoticz + *x:鎻掑骇缂栧彿 */ bool json_plug_analysis(int udp_flag, unsigned char x, cJSON * pJsonRoot, cJSON * pJsonSend) { @@ -228,7 +228,7 @@ bool json_plug_analysis(int udp_flag, unsigned char x, cJSON * pJsonRoot, cJSON cJSON *json_plug_send = cJSON_CreateObject(); - //解析plug on------------------------------------------------------ + //瑙ｆ瀽plug on------------------------------------------------------ if (p_plug) { cJSON *p_plug_on = cJSON_GetObjectItem(p_plug, "on"); @@ -242,12 +242,12 @@ bool json_plug_analysis(int udp_flag, unsigned char x, cJSON * pJsonRoot, cJSON user_mqtt_send_plug_state(x); } - //解析plug中setting项目---------------------------------------------- + //瑙ｆ瀽plug涓璼etting椤圭洰---------------------------------------------- cJSON *p_plug_setting = cJSON_GetObjectItem(p_plug, "setting"); if (p_plug_setting) { cJSON *json_plug_setting_send = cJSON_CreateObject(); - //解析plug中setting中name---------------------------------------- + //瑙ｆ瀽plug涓璼etting涓璶ame---------------------------------------- cJSON *p_plug_setting_name = cJSON_GetObjectItem(p_plug_setting, "name"); if (p_plug_setting_name) { @@ -260,7 +260,7 @@ bool json_plug_analysis(int udp_flag, unsigned char x, cJSON * pJsonRoot, cJSON cJSON_AddStringToObject(json_plug_setting_send, "name", user_config->plug[x].name); } - //解析plug中setting中task---------------------------------------- + //瑙ｆ瀽plug涓璼etting涓璽ask---------------------------------------- for (i = 0; i < PLUG_TIME_TASK_NUM; i++) { if (json_plug_task_analysis(x, i, p_plug_setting, json_plug_setting_send)) @@ -279,8 +279,8 @@ bool json_plug_analysis(int udp_flag, unsigned char x, cJSON * pJsonRoot, cJSON } /* - *解析处理定时任务json - *x:插座编号 y:任务编号 + *瑙ｆ瀽澶勭悊瀹氭椂浠诲姟json + *x:鎻掑骇缂栧彿 y:浠诲姟缂栧彿 */ bool json_plug_task_analysis(unsigned char x, unsigned char y, cJSON * pJsonRoot, cJSON * pJsonSend) { diff --git a/TC1/user_gpio.c b/TC1/user_gpio.c index 90153ab..8f15046 100644 --- a/TC1/user_gpio.c +++ b/TC1/user_gpio.c @@ -56,9 +56,9 @@ void set_socket_status(char* socket_status) } /*user_relay_set - * 设置继电器开关 - * i:编号 0-5 - * on:开关 0:关 1:开 + * 璁剧疆缁х數鍣ㄥ紑鍏 + * i:缂栧彿 0-5 + * on:寮鍏 0:鍏 1:寮 */ void user_relay_set(unsigned char i, unsigned char on) { @@ -86,8 +86,8 @@ void user_relay_set(unsigned char i, unsigned char on) } /* - * 设置所有继电器开关 - * y: 0:全部关 1:全部开 + * 璁剧疆鎵鏈夌户鐢靛櫒寮鍏 + * y: 0:鍏ㄩ儴鍏 1:鍏ㄩ儴寮 * */ void user_relay_set_all(char y) @@ -144,12 +144,12 @@ uint16_t key_time = 0; static void key_timeout_handler(void* arg) { static char key_trigger, key_continue; - //按键扫描程序 + //鎸夐敭鎵弿绋嬪簭 char tmp = ~(0xfe | MicoGpioInputGet(Button)); key_trigger = tmp & (tmp ^ key_continue); key_continue = tmp; // os_log("button scan:%02x %02x",key_trigger,key_continue); - if (key_trigger != 0) key_time = 0; //新按键按下时,重新开始按键计时 + if (key_trigger != 0) key_time = 0; //鏂版寜閿寜涓嬫椂,閲嶆柊寮濮嬫寜閿鏃 if (key_continue != 0) { //any button pressed @@ -181,7 +181,7 @@ static void key_timeout_handler(void* arg) { //button released if (key_time < BUTTON_LONG_PRESS_TIME) - { //100ms*10=1s 大于1s为长按 + { //100ms*10=1s 澶т簬1s涓洪暱鎸 key_time = 0; os_log("button short pressed:%d",key_time); key_short_press(); diff --git a/TC1/user_mqtt_client.c b/TC1/user_mqtt_client.c index 306a28a..8709ae6 100644 --- a/TC1/user_mqtt_client.c +++ b/TC1/user_mqtt_client.c @@ -102,7 +102,7 @@ mico_timer_t timer_handle; static char timer_status = 0; void user_mqtt_timer_func(void *arg) { - char* buf1 = malloc(1024); //idx涓1浣嶆椂闀垮害涓24 + char* buf1 = malloc(1024); //idx娑?娴ｅ秵妞傞梹鍨娑?4 LinkStatusTypeDef LinkStatus; micoWlanGetLinkStatus(&LinkStatus); @@ -302,8 +302,7 @@ void mqtt_client_thread(mico_thread_arg_t arg) { isconnect = false; mico_rtos_thread_sleep(3); - if (MQTT_SERVER[0] < 0x20 || MQTT_SERVER[0] > 0x7f || MQTT_SERVER_PORT < 1) continue; //鏈厤缃甿qtt鏈嶅姟鍣ㄦ椂涓嶈繛鎺 - + if (MQTT_SERVER[0] < 0x20 || MQTT_SERVER[0] > 0x7f || MQTT_SERVER_PORT < 1) continue; //閺堫亪鍘ょ純鐢縬tt閺堝秴濮熼崳銊︽娑撳秷绻涢幒? micoWlanGetLinkStatus(&LinkStatus); if (LinkStatus.is_connected != 1) { @@ -344,7 +343,7 @@ void mqtt_client_thread(mico_thread_arg_t arg) rc = MQTTSubscribe(&c, topic_set, QOS0, messageArrived); require_noerr_string(rc, MQTT_reconnect, "ERROR: MQTT client subscribe err."); mqtt_log("MQTT client subscribe success! recv_topic=[%s].", topic_set); - /*4.1 杩炴帴鎴愬姛鍚庡厛鏇存柊鍙戦佷竴娆℃暟鎹*/ + /*4.1 鏉╃偞甯撮幋鎰閸氬骸鍘涢弴瀛樻煀閸欐垿鈧椒绔村▎鈩冩殶閹?/ isconnect = true; mico_init_timer(&timer_handle, 150, user_mqtt_timer_func, &arg); @@ -503,8 +502,7 @@ OSStatus user_mqtt_send(char *arg) return user_mqtt_send_topic(topic_state, arg, 0); } -//鏇存柊ha寮鍏崇姸鎬 -OSStatus user_mqtt_send_plug_state(char plug_id) +//閺囧瓨鏌奾a瀵偓閸忓磭濮搁幀?OSStatus user_mqtt_send_plug_state(char plug_id) { char *send_buf = NULL; @@ -521,8 +519,7 @@ OSStatus user_mqtt_send_plug_state(char plug_id) if (topic_buf) free(topic_buf); } -//hass mqtt鑷姩鍙戠幇鏁版嵁寮鍏冲彂閫 -void user_mqtt_hass_auto(char plug_id) +//hass mqtt閼奉亜濮╅崣鎴犲箛閺佺増宓佸鈧崗鍐插絺闁?void user_mqtt_hass_auto(char plug_id) { char *send_buf = NULL; char *topic_buf = NULL; @@ -569,8 +566,7 @@ void user_mqtt_hass_auto_name(char plug_id) if (topic_buf) free(topic_buf); } -//hass mqtt鑷姩鍙戠幇鏁版嵁鍔熺巼鍙戦 -void user_mqtt_hass_auto_power(void) +//hass mqtt閼奉亜濮╅崣鎴犲箛閺佺増宓侀崝鐔哄芳閸欐垿鈧?void user_mqtt_hass_auto_power(void) { char *send_buf = NULL; char *topic_buf = NULL; diff --git a/TC1/user_rtc.c b/TC1/user_rtc.c index adc93f6..d1d7c13 100644 --- a/TC1/user_rtc.c +++ b/TC1/user_rtc.c @@ -124,7 +124,7 @@ OSStatus user_rtc_init(void) void rtc_thread(mico_thread_arg_t arg) { int i, j; - char task_flag[PLUG_NUM] = { -1, -1, -1, -1, -1, -1 }; //记录每个插座哪个任务需要返回数据 + char task_flag[PLUG_NUM] = { -1, -1, -1, -1, -1, -1 }; //璁板綍姣忎釜鎻掑骇鍝釜浠诲姟闇瑕佽繑鍥炴暟鎹 OSStatus err = kUnknownErr; LinkStatusTypeDef LinkStatus; mico_rtc_time_t rtc_time; @@ -133,7 +133,7 @@ void rtc_thread(mico_thread_arg_t arg) mico_utc_time_t utc_time; mico_utc_time_t utc_time_last = 0; while (1) - { //上电后连接了wifi才开始走时否则等待连接 + { //涓婄數鍚庤繛鎺ヤ簡wifi鎵嶅紑濮嬭蛋鏃跺惁鍒欑瓑寰呰繛鎺 micoWlanGetLinkStatus(&LinkStatus); if (LinkStatus.is_connected == 1) { @@ -170,7 +170,7 @@ void rtc_thread(mico_thread_arg_t arg) rtc_time.month = currentTime->tm_mon + 1; rtc_time.year = (currentTime->tm_year + 1900) % 100; -// MicoRtcSetTime(&rtc_time); //MicoRtc不自动走时! +// MicoRtcSetTime(&rtc_time); //MicoRtc涓嶈嚜鍔ㄨ蛋鏃! if (rtc_time.sec == 0) os_log("time:20%02d/%02d/%02d %d %02d:%02d:%02d",rtc_time.year,rtc_time.month,rtc_time.date,rtc_time.weekday,rtc_time.hr,rtc_time.min,rtc_time.sec); @@ -184,7 +184,7 @@ void rtc_thread(mico_thread_arg_t arg) { char repeat = user_config->plug[i].task[j].repeat; - if ( //符合条件则改变继电器状态: 秒为0 时分符合设定值, 重复符合设定值 + if ( //绗﹀悎鏉′欢鍒欐敼鍙樼户鐢靛櫒鐘舵: 绉掍负0 鏃跺垎绗﹀悎璁惧畾鍊, 閲嶅绗﹀悎璁惧畾鍊 rtc_time.sec == 0 && rtc_time.min == user_config->plug[i].task[j].minute && rtc_time.hr == user_config->plug[i].task[j].hour && ((repeat == 0x00) || repeat & (1 << (rtc_time.weekday - 1))) @@ -207,7 +207,7 @@ void rtc_thread(mico_thread_arg_t arg) } } - //更新储存数据 更新定时任务数据 + //鏇存柊鍌ㄥ瓨鏁版嵁 鏇存柊瀹氭椂浠诲姟鏁版嵁 if (update_user_config_flag == 1) { os_log("update_user_config_flag"); @@ -247,14 +247,14 @@ void rtc_thread(mico_thread_arg_t arg) } char *json_str = cJSON_Print(json_send); - user_send(false, json_str); //发送数据 + user_send(false, json_str); //鍙戦佹暟鎹 free(json_str); cJSON_Delete(json_send); // os_log("cJSON_Delete"); } - //SNTP服务 开机及每小时校准一次 + //SNTP鏈嶅姟 寮鏈哄強姣忓皬鏃舵牎鍑嗕竴娆 if (rtc_init != 1 || (rtc_time.sec == 0 && rtc_time.min == 0)) { micoWlanGetLinkStatus(&LinkStatus); diff --git a/TC1/user_sntp.c b/TC1/user_sntp.c index cbc00ee..a59c7a0 100644 --- a/TC1/user_sntp.c +++ b/TC1/user_sntp.c @@ -42,7 +42,7 @@ void sntp_init(void) { struct in_addr ipp;ipp.s_addr=0xd248912c; sntp_set_server_ip_address (0,ipp); - sntp_start_auto_time_sync (15000, sntp_time_call_back); //每小时校准一次 + sntp_start_auto_time_sync (15000, sntp_time_call_back); //姣忓皬鏃舵牎鍑嗕竴娆 mico_rtc_time_t rtc_time; MicoRtcGetTime(&rtc_time); diff --git a/TC1/user_wifi.c b/TC1/user_wifi.c index 4629dbf..a81b0b5 100644 --- a/TC1/user_wifi.c +++ b/TC1/user_wifi.c @@ -38,7 +38,7 @@ void wifi_start_easylink() user_led_set(1); } -//easylink 完成回调 +//easylink 瀹屾垚鍥炶皟 void wifi_easylink_completed_handle(network_InitTypeDef_st *nwkpara, void * arg) { os_log("wifi_easylink_wps_completed_handle:"); @@ -51,7 +51,7 @@ void wifi_easylink_completed_handle(network_InitTypeDef_st *nwkpara, void * arg) os_log("ssid:\"%s\",\"%s\"",nwkpara->wifi_ssid,nwkpara->wifi_key); - //保存wifi及密码 + //淇濆瓨wifi鍙婂瘑鐮 strcpy(sys_config->micoSystemConfig.ssid, nwkpara->wifi_ssid); strcpy(sys_config->micoSystemConfig.user_key, nwkpara->wifi_key); sys_config->micoSystemConfig.user_keyLength = strlen(nwkpara->wifi_key); @@ -62,26 +62,26 @@ void wifi_easylink_completed_handle(network_InitTypeDef_st *nwkpara, void * arg) micoWlanStopEasyLink(); } -//wifi已连接获取到IP地址 回调 +//wifi宸茶繛鎺ヨ幏鍙栧埌IP鍦板潃 鍥炶皟 static void wifi_get_ip_callback(IPStatusTypedef *pnet, void * arg) { os_log("got IP:%s", pnet->ip); wifi_status = WIFI_STATE_CONNECTED; user_function_cmd_received(1,"{\"cmd\":\"device report\"}"); } -//wifi连接状态改变回调 +//wifi杩炴帴鐘舵佹敼鍙樺洖璋 static void wifi_status_callback(WiFiEvent status, void *arg) { - if (status == NOTIFY_STATION_UP) //wifi连接成功 + if (status == NOTIFY_STATION_UP) //wifi杩炴帴鎴愬姛 { //wifi_status = WIFI_STATE_CONNECTED; - } else if (status == NOTIFY_STATION_DOWN) //wifi断开 + } else if (status == NOTIFY_STATION_DOWN) //wifi鏂紑 { wifi_status = WIFI_STATE_NOCONNECT; if (!mico_rtos_is_timer_running(&wifi_led_timer)) mico_rtos_start_timer(&wifi_led_timer); } } -//100ms定时器回调 +//100ms瀹氭椂鍣ㄥ洖璋 static void wifi_led_timer_callback(void* arg) { static unsigned int num = 0; @@ -124,7 +124,7 @@ static void wifi_led_timer_callback(void* arg) void wifi_connect(char* wifi_ssid, char* wifi_key) { - //wifi配置初始化 + //wifi閰嶇疆鍒濆鍖 network_InitTypeDef_st wNetConfig; memset(&wNetConfig, 0, sizeof(network_InitTypeDef_st)); @@ -135,7 +135,7 @@ void wifi_connect(char* wifi_ssid, char* wifi_key) wNetConfig.wifi_retry_interval = 6000; micoWlanStart(&wNetConfig); - //保存wifi及密码到Flash + //淇濆瓨wifi鍙婂瘑鐮佸埌Flash strcpy(sys_config->micoSystemConfig.ssid, wifi_ssid); strcpy(sys_config->micoSystemConfig.user_key, wifi_key); sys_config->micoSystemConfig.user_keyLength = strlen(wifi_key); @@ -145,16 +145,16 @@ void wifi_connect(char* wifi_ssid, char* wifi_key) void wifi_init(void) { - //wifi状态下led闪烁定时器初始化 + //wifi鐘舵佷笅led闂儊瀹氭椂鍣ㄥ垵濮嬪寲 mico_rtos_init_timer(&wifi_led_timer, 100, (void *) wifi_led_timer_callback, NULL); - //easylink 完成回调 + //easylink 瀹屾垚鍥炶皟 mico_system_notify_register(mico_notify_EASYLINK_WPS_COMPLETED, (void *) wifi_easylink_completed_handle, NULL); - //wifi已连接获取到IP地址 回调 + //wifi宸茶繛鎺ヨ幏鍙栧埌IP鍦板潃 鍥炶皟 mico_system_notify_register(mico_notify_DHCP_COMPLETED, (void *) wifi_get_ip_callback, NULL); - //wifi连接状态改变回调 + //wifi杩炴帴鐘舵佹敼鍙樺洖璋 mico_system_notify_register(mico_notify_WIFI_STATUS_CHANGED, (void*) wifi_status_callback, NULL); //sntp_init(); - //启动定时器开始进行wifi连接 + //鍚姩瀹氭椂鍣ㄥ紑濮嬭繘琛寃ifi杩炴帴 if (!mico_rtos_is_timer_running(&wifi_led_timer)) mico_rtos_start_timer(&wifi_led_timer); IPStatusTypedef para;