From 9746c102ed337d9385c1b72f5dca0e198c7558b7 Mon Sep 17 00:00:00 2001 From: nhkefus Date: Mon, 10 Mar 2025 13:36:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?=E6=97=A5=E8=80=97=E7=94=B5=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E5=99=A8=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BC=98=E5=8C=96=E9=87=8D=E5=90=AF=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TC1/http_server/app_httpd.c | 3 +- TC1/main.c | 147 ++++++++++++++++-------------------- 2 files changed, 67 insertions(+), 83 deletions(-) diff --git a/TC1/http_server/app_httpd.c b/TC1/http_server/app_httpd.c index 4aabefe..a53aad2 100644 --- a/TC1/http_server/app_httpd.c +++ b/TC1/http_server/app_httpd.c @@ -293,8 +293,7 @@ static int HttpSetRebootSystem(httpd_request_t *req) send_http("OK", 2, exit, &err); - char c[1] = { 0 }; - sprintf(c, "reboot now !%s", "reboot"); + MicoSystemReboot(); exit: return err; diff --git a/TC1/main.c b/TC1/main.c index 84b0bce..6f11559 100644 --- a/TC1/main.c +++ b/TC1/main.c @@ -14,22 +14,21 @@ char rtc_init = 0; //sntp校时成功标志位 uint32_t total_time = 0; -char str_mac[16] = { 0 }; +char str_mac[16] = {0}; -system_config_t* sys_config; -user_config_t* user_config; +system_config_t *sys_config; +user_config_t *user_config; -mico_gpio_t Relay[Relay_NUM] = { Relay_0, Relay_1, Relay_2, Relay_3, Relay_4, Relay_5 }; +mico_gpio_t Relay[Relay_NUM] = {Relay_0, Relay_1, Relay_2, Relay_3, Relay_4, Relay_5}; /* MICO system callback: Restore default configuration provided by application */ -void appRestoreDefault_callback(void * const user_config_data, uint32_t size) -{ +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[1] = 0; - user_config_t* userConfigDefault = user_config_data; + user_config_t *userConfigDefault = user_config_data; userConfigDefault->user[0] = 0; userConfigDefault->mqtt_ip[0] = 0; userConfigDefault->mqtt_port = 0; @@ -43,36 +42,38 @@ void appRestoreDefault_callback(void * const user_config_data, uint32_t size) userConfigDefault->version = USER_CONFIG_VERSION; int i; - for (i = 0; i < SOCKET_NUM; i++) - { + for (i = 0; i < SOCKET_NUM; i++) { userConfigDefault->socket_status[i] = 1; } - for (i = 0; i < MAX_TASK_NUM; i++) - { + for (i = 0; i < MAX_TASK_NUM; i++) { userConfigDefault->timed_tasks[i].on_use = false; } //mico_system_context_update(sys_config); } -void recordDailyPcount(){ - if(user_config->p_count_1_day_ago != 0){ - user_config->p_count_2_days_ago = user_config->p_count_1_day_ago; - } - user_config->p_count_1_day_ago = p_count; - mico_system_context_update(sys_config); - tc1_log("WARNGIN: p_count record!"); +void recordDailyPCount() { + // 获取当前时间 + time_t now; + time(&now); + struct tm *current_time = localtime(&now); + if (current_time->tm_hour != 0 || current_time->tm_min != 0) { + return; + } + if (user_config->p_count_1_day_ago != 0) { + user_config->p_count_2_days_ago = user_config->p_count_1_day_ago; + } + user_config->p_count_1_day_ago = p_count; + mico_system_context_update(sys_config);tc1_log("WARNGIN: p_count record!"); } -void schedule_p_count_task(mico_thread_arg_t arg){ - mico_thread_msleep(20000); - tc1_log("WARNGIN: p_count timer thread created!"); +void schedule_p_count_task(mico_thread_arg_t arg) { + mico_thread_msleep(20000);tc1_log("WARNGIN: p_count timer thread created!"); while (1) { // 获取当前时间 time_t now; struct tm next_run; time(&now); - struct tm *current_time = localtime(&now); - tc1_log("local time %s", asctime(current_time)); + struct tm *current_time = localtime(&now);tc1_log("local time %s", asctime(current_time)); // 计算下次执行时间，目标是 0 点 0 分 next_run = *current_time; next_run.tm_hour = 0; @@ -86,43 +87,40 @@ void schedule_p_count_task(mico_thread_arg_t arg){ double seconds_until_next_run = difftime(next_time, now); if (seconds_until_next_run > 0) { // 休眠直到目标时间 - tc1_log("record p_count after %f seconds", seconds_until_next_run); - mico_thread_msleep(seconds_until_next_run * 1000); - }else{ - mico_thread_msleep(1000); - continue; + tc1_log("record p_count after %f seconds", seconds_until_next_run); + mico_thread_msleep(seconds_until_next_run * 1000); + } else { + mico_thread_msleep(1000); + continue; } // 执行任务 - recordDailyPcount(); + recordDailyPCount(); mico_thread_msleep(1000); } } -void reportMqttPowerInfoThread(){ - while (1) - { - UserMqttHassPower(); - int freq = user_config->mqtt_report_freq; +void reportMqttPowerInfoThread() { + while (1) { + UserMqttHassPower(); + int freq = user_config->mqtt_report_freq; - if(freq == 0){ - freq = 2; - } + if (freq == 0) { + freq = 2; + } - mico_thread_msleep(1000*freq); - } + mico_thread_msleep(1000 * freq); + } } -int application_start(void) -{ - int i; - tc1_log("start version[%s]", VERSION); +int application_start(void) { + int i;tc1_log("start version[%s]", VERSION); //char main_num=0; OSStatus err = kNoErr; // Create mico system context and read application's config data from flash sys_config = mico_system_context_init(sizeof(user_config_t)); - user_config = ((system_context_t*)sys_config)->user_config_data; + user_config = ((system_context_t *) sys_config)->user_config_data; require_action(user_config, exit, err = kNoMemoryErr); err = mico_system_init(sys_config); @@ -131,57 +129,47 @@ int application_start(void) uint8_t mac[8]; mico_wlan_get_mac_address(mac); sprintf(str_mac, "%02X%02X%02X%02X%02X%02X", - mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); - tc1_log("str_mac[%s]", str_mac); + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);tc1_log("str_mac[%s]", str_mac); bool open_ap = false; - MicoGpioInitialize((mico_gpio_t)Button, INPUT_PULL_UP); - if (!MicoGpioInputGet(Button)) - { //开机时按钮状态 + MicoGpioInitialize((mico_gpio_t) Button, INPUT_PULL_UP); + if (!MicoGpioInputGet(Button)) { //开机时按钮状态 tc1_log("press ap_init"); ApInit(false); open_ap = true; } MicoGpioInitialize((mico_gpio_t) Led, OUTPUT_PUSH_PULL); - for (i = 0; i < Relay_NUM; i++) - { + for (i = 0; i < Relay_NUM; i++) { MicoGpioInitialize(Relay[i], OUTPUT_PUSH_PULL); UserRelaySet(i, user_config->socket_status[i]); } MicoSysLed(0); - if (user_config->version != USER_CONFIG_VERSION) - { - tc1_log("WARNGIN: user params restored!"); + 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) - { - sprintf(sys_config->micoSystemConfig.name, ZTC1_NAME, str_mac+8); + if (sys_config->micoSystemConfig.name[0] == 1) { + sprintf(sys_config->micoSystemConfig.name, ZTC1_NAME, str_mac + 8); } - tc1_log("user:%s",user_config->user); - tc1_log("device name:%s",sys_config->micoSystemConfig.name); - tc1_log("mqtt_ip:%s",user_config->mqtt_ip); - tc1_log("mqtt_port:%d",user_config->mqtt_port); - tc1_log("mqtt_user:%s",user_config->mqtt_user); + tc1_log("user:%s", user_config->user);tc1_log("device name:%s", + sys_config->micoSystemConfig.name);tc1_log( + "mqtt_ip:%s", user_config->mqtt_ip);tc1_log("mqtt_port:%d", + user_config->mqtt_port);tc1_log( + "mqtt_user:%s", user_config->mqtt_user); //tc1_log("mqtt_password:%s",user_config->mqtt_password); - tc1_log("version:%d",user_config->version); + tc1_log("version:%d", user_config->version); WifiInit(); - if (!open_ap) - { - if (sys_config->micoSystemConfig.reserved != NOTIFY_STATION_UP) - { + if (!open_ap) { + if (sys_config->micoSystemConfig.reserved != NOTIFY_STATION_UP) { ApInit(true); - } - else - { + } else { WifiConnect(sys_config->micoSystemConfig.ssid, - sys_config->micoSystemConfig.user_key); + sys_config->micoSystemConfig.user_key); } } KeyInit(); @@ -193,29 +181,26 @@ int application_start(void) AppHttpdStart(); // start http server thread err = mico_rtos_create_thread(NULL, MICO_APPLICATION_PRIORITY, "p_count", - (mico_thread_function_t) schedule_p_count_task, - 0x2000, 0); + (mico_thread_function_t) schedule_p_count_task, + 0x2000, 0); require_noerr_string(err, exit, "ERROR: Unable to start the p_count thread."); err = mico_rtos_create_thread(NULL, MICO_APPLICATION_PRIORITY, "mqtt_power_report", - (mico_thread_function_t) reportMqttPowerInfoThread, - 0x2000, 0); + (mico_thread_function_t) reportMqttPowerInfoThread, + 0x2000, 0); require_noerr_string(err, exit, "ERROR: Unable to start the mqtt_power_report thread."); - while (1) - { + while (1) { time_t now = time(NULL); - if (user_config->task_top && now >= user_config->task_top->prs_time) - { + if (user_config->task_top && now >= user_config->task_top->prs_time) { ProcessTask(); } mico_thread_msleep(1000); } -exit: - tc1_log("application_start ERROR!"); + exit:tc1_log("application_start ERROR!"); return 0; }