diff --git a/TC1/main.c b/TC1/main.c index 4b69972..1fa9945 100644 --- a/TC1/main.c +++ b/TC1/main.c @@ -151,12 +151,12 @@ int application_start(void) } MicoSysLed(0); -// if (user_config->version != USER_CONFIG_VERSION) -// { -// tc1_log("WARNGIN: user params restored!"); -// err = mico_system_context_restore(sys_config); -// require_noerr(err, exit); -// } + if (user_config->version != USER_CONFIG_VERSION) + { + tc1_log("WARNGIN: user params restored!"); + err = mico_system_context_restore(sys_config); + require_noerr(err, exit); + } if (sys_config->micoSystemConfig.name[0] == 1) { diff --git a/TC1/mqtt_server/user_mqtt_client.c b/TC1/mqtt_server/user_mqtt_client.c index 3c35b67..215bdb9 100644 --- a/TC1/mqtt_server/user_mqtt_client.c +++ b/TC1/mqtt_server/user_mqtt_client.c @@ -547,6 +547,7 @@ void UserMqttHassPower(void) sprintf(send_buf, "{\"powerConsumption\":\"%.3f\"}", (17.1 * p_count) / 1000 / 36000); UserMqttSendTopic(topic_buf, send_buf, 0); +// tc1_log("p_count %ld, p_count_1_day_ago %ld ,p_count_2_days_ago %ld, result %ld",p_count,user_config->p_count_1_day_ago,user_config->p_count_2_days_ago,((p_count-user_config->p_count_1_day_ago)<0?0:(p_count-user_config->p_count_1_day_ago))); sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionToday/state", str_mac); sprintf(send_buf, "{\"powerConsumptionToday\":\"%.3f\"}", (17.1 * ((p_count-user_config->p_count_1_day_ago)<0?0:(p_count-user_config->p_count_1_day_ago))) / 1000 / 36000); UserMqttSendTopic(topic_buf, send_buf, 0); diff --git a/TC1/user_wifi.c b/TC1/user_wifi.c index dbe0929..492bfa7 100644 --- a/TC1/user_wifi.c +++ b/TC1/user_wifi.c @@ -186,7 +186,7 @@ void ApInit(bool use_defaul) { sprintf(user_config->ap_name, ZZ_AP_NAME, str_mac + 6); sprintf(user_config->ap_key, "%s", ZZ_AP_KEY); - wifi_log("ApInit use_defaul[true] key[12345678]"); + wifi_log("ApInit use_defaul[true] key[]"); } network_InitTypeDef_st wNetConfig; diff --git a/TC1/user_wifi.h b/TC1/user_wifi.h index 6e1ace8..8ad4345 100644 --- a/TC1/user_wifi.h +++ b/TC1/user_wifi.h @@ -14,7 +14,7 @@ enum }; #define ZZ_AP_NAME "TC1-AP-%s" -#define ZZ_AP_KEY "12345678" +#define ZZ_AP_KEY "" #define ZZ_AP_LOCAL_IP "192.168.0.1" #define ZZ_AP_DNS_SERVER "192.168.0.1" #define ZZ_AP_NET_MASK "255.255.255.0"