修改了Web后台的部分界面，增加了HAmqtt中的总电量传感器，后台新增mqtt上报频率设置

TC1/timed_task/timed_task.c

@@ -1,175 +1,175 @@
-#include<stdio.h>
-#include<stdlib.h>
-#include<string.h>
-#include<stdbool.h>
-#include<time.h>
-
-#include"main.h"
-#include"user_gpio.h"
-#include"timed_task/timed_task.h"
-#include"http_server/web_log.h"
-
-int day_sec = 86400;
-
-pTimedTask NewTask()
-{
-    for (int i = 0; i < MAX_TASK_NUM; i++)
-    {
-        pTimedTask task = &user_config->timed_tasks[i];
-        if (!task->on_use)
-        {
-            task->on_use = true;
-            return task;
-        }
-    }
-    return NULL;
-}
-
-bool AddTaskSingle(pTimedTask task)
-{
-    user_config->task_count++;
-    if (user_config->task_top == NULL)
-    {
-        task->next = NULL;
-        user_config->task_top = task;
-        return true;
-    }
-
-    if (task->prs_time <= user_config->task_top->prs_time)
-    {
-        task->next = user_config->task_top;
-        user_config->task_top = task;
-        return true;
-    }
-
-    pTimedTask tmp = user_config->task_top;
-    while (tmp)
-    {
-        if (tmp->next == NULL
-            || (task->prs_time >= tmp->prs_time
-             && task->prs_time < tmp->next->prs_time))
-        {
-            task->next = tmp->next;
-            tmp->next = task;
-            return true;
-        }
-        tmp = tmp->next;
-    }
-    user_config->task_count--;
-    return false;
-}
-
-bool AddTaskWeek(pTimedTask task)
-{
-    time_t now = time(NULL);
-    int today_weekday = (now / day_sec + 3) % 7 + 1; //1970-01-01 星期五
-    int next_day = task->weekday - today_weekday;
-    bool next_day_is_today = next_day == 0 && task->prs_time % day_sec > now % day_sec;
-    next_day = next_day > 0 || next_day_is_today ? next_day : next_day + 7;
-    task->prs_time = (now - now % day_sec) + (next_day * day_sec) + task->prs_time % day_sec;
-
-    return AddTaskSingle(task);
-}
-
-bool AddTask(pTimedTask task)
-{
-    if (task->weekday == 0 || task->weekday == 8)
-        return AddTaskSingle(task);
-    return AddTaskWeek(task);
-}
-
-bool DelFirstTask()
-{
-    if (user_config->task_top)
-    {
-        pTimedTask tmp = user_config->task_top;
-        user_config->task_top = user_config->task_top->next;
-        user_config->task_count--;
-        if (tmp->weekday == 0)
-        {
-            tmp->on_use = false;
-        }
-        else if (tmp->weekday == 8) //8代表每日任务
-        {
-            tmp->prs_time += day_sec;
-            AddTask(tmp);
-        }
-        else
-        {
-            tmp->prs_time += 7 * day_sec;
-            AddTask(tmp);
-        }
-        return true;
-    }
-    return false;
-}
-
-bool DelTask(int time)
-{
-    if (user_config->task_top == NULL)
-    {
-        return false;
-    }
-
-    if (time == user_config->task_top->prs_time)
-    {
-        pTimedTask tmp = user_config->task_top;
-        user_config->task_top = user_config->task_top->next;
-        tmp->on_use = false;
-        user_config->task_count--;
-        return true;
-    }
-    else if (user_config->task_top->next == NULL)
-    {
-        return false;
-    }
-
-    pTimedTask pre_tsk = user_config->task_top;
-    pTimedTask tmp_tsk = user_config->task_top->next;
-    while (tmp_tsk)
-    {
-        if (time == tmp_tsk->prs_time)
-        {
-            pre_tsk->next = tmp_tsk->next;
-            tmp_tsk->on_use = false;
-            user_config->task_count--;
-            return true;
-        }
-        tmp_tsk = tmp_tsk->next;
-    }
-    return false;
-}
-
-void ProcessTask()
-{
-    task_log("process task time[%ld] socket_idx[%d] on[%d]",
-        user_config->task_top->prs_time, user_config->task_top->socket_idx, user_config->task_top->on);
-    UserRelaySet(user_config->task_top->socket_idx, user_config->task_top->on);
-    DelFirstTask();
-}
-
-char* GetTaskStr()
-{
-    char* str = (char*)malloc(sizeof(char)*(user_config->task_count*89+2));
-    pTimedTask tmp_tsk = user_config->task_top;
-    char* tmp_str = str;
-    tmp_str[0] = '[';
-    tmp_str[2] = 0;
-    tmp_str++;
-    while (tmp_tsk)
-    {
-        char buffer[26];
-        struct tm* tm_info;
-        time_t prs_time = tmp_tsk->prs_time + 28800;
-        tm_info = localtime(&prs_time);
-        strftime(buffer, 26, "%m-%d %H:%M", tm_info);
-
-        sprintf(tmp_str, "{'timestamp':%ld,'prs_time':'%s','socket_idx':%d,'on':%d,'weekday':%d},",
-            tmp_tsk->prs_time, buffer, tmp_tsk->socket_idx+1, tmp_tsk->on, tmp_tsk->weekday);
-        tmp_str += strlen(tmp_str);
-        tmp_tsk = tmp_tsk->next;
-    }
-    if (user_config->task_count > 0) --tmp_str;
-    *tmp_str = ']';
-    return str;
-}
+#include<stdio.h>
+#include<stdlib.h>
+#include<string.h>
+#include<stdbool.h>
+#include<time.h>
+
+#include"main.h"
+#include"user_gpio.h"
+#include"timed_task/timed_task.h"
+#include"http_server/web_log.h"
+
+int day_sec = 86400;
+
+pTimedTask NewTask()
+{
+    for (int i = 0; i < MAX_TASK_NUM; i++)
+    {
+        pTimedTask task = &user_config->timed_tasks[i];
+        if (!task->on_use)
+        {
+            task->on_use = true;
+            return task;
+        }
+    }
+    return NULL;
+}
+
+bool AddTaskSingle(pTimedTask task)
+{
+    user_config->task_count++;
+    if (user_config->task_top == NULL)
+    {
+        task->next = NULL;
+        user_config->task_top = task;
+        return true;
+    }
+
+    if (task->prs_time <= user_config->task_top->prs_time)
+    {
+        task->next = user_config->task_top;
+        user_config->task_top = task;
+        return true;
+    }
+
+    pTimedTask tmp = user_config->task_top;
+    while (tmp)
+    {
+        if (tmp->next == NULL
+            || (task->prs_time >= tmp->prs_time
+             && task->prs_time < tmp->next->prs_time))
+        {
+            task->next = tmp->next;
+            tmp->next = task;
+            return true;
+        }
+        tmp = tmp->next;
+    }
+    user_config->task_count--;
+    return false;
+}
+
+bool AddTaskWeek(pTimedTask task)
+{
+    time_t now = time(NULL);
+    int today_weekday = (now / day_sec + 3) % 7 + 1; //1970-01-01 星期五
+    int next_day = task->weekday - today_weekday;
+    bool next_day_is_today = next_day == 0 && task->prs_time % day_sec > now % day_sec;
+    next_day = next_day > 0 || next_day_is_today ? next_day : next_day + 7;
+    task->prs_time = (now - now % day_sec) + (next_day * day_sec) + task->prs_time % day_sec;
+
+    return AddTaskSingle(task);
+}
+
+bool AddTask(pTimedTask task)
+{
+    if (task->weekday == 0 || task->weekday == 8)
+        return AddTaskSingle(task);
+    return AddTaskWeek(task);
+}
+
+bool DelFirstTask()
+{
+    if (user_config->task_top)
+    {
+        pTimedTask tmp = user_config->task_top;
+        user_config->task_top = user_config->task_top->next;
+        user_config->task_count--;
+        if (tmp->weekday == 0)
+        {
+            tmp->on_use = false;
+        }
+        else if (tmp->weekday == 8) //8代表每日任务
+        {
+            tmp->prs_time += day_sec;
+            AddTask(tmp);
+        }
+        else
+        {
+            tmp->prs_time += 7 * day_sec;
+            AddTask(tmp);
+        }
+        return true;
+    }
+    return false;
+}
+
+bool DelTask(int time)
+{
+    if (user_config->task_top == NULL)
+    {
+        return false;
+    }
+
+    if (time == user_config->task_top->prs_time)
+    {
+        pTimedTask tmp = user_config->task_top;
+        user_config->task_top = user_config->task_top->next;
+        tmp->on_use = false;
+        user_config->task_count--;
+        return true;
+    }
+    else if (user_config->task_top->next == NULL)
+    {
+        return false;
+    }
+
+    pTimedTask pre_tsk = user_config->task_top;
+    pTimedTask tmp_tsk = user_config->task_top->next;
+    while (tmp_tsk)
+    {
+        if (time == tmp_tsk->prs_time)
+        {
+            pre_tsk->next = tmp_tsk->next;
+            tmp_tsk->on_use = false;
+            user_config->task_count--;
+            return true;
+        }
+        tmp_tsk = tmp_tsk->next;
+    }
+    return false;
+}
+
+void ProcessTask()
+{
+    task_log("process task time[%ld] socket_idx[%d] on[%d]",
+        user_config->task_top->prs_time, user_config->task_top->socket_idx, user_config->task_top->on);
+    UserRelaySet(user_config->task_top->socket_idx, user_config->task_top->on);
+    DelFirstTask();
+}
+
+char* GetTaskStr()
+{
+    char* str = (char*)malloc(sizeof(char)*(user_config->task_count*89+2));
+    pTimedTask tmp_tsk = user_config->task_top;
+    char* tmp_str = str;
+    tmp_str[0] = '[';
+    tmp_str[2] = 0;
+    tmp_str++;
+    while (tmp_tsk)
+    {
+        char buffer[26];
+        struct tm* tm_info;
+        time_t prs_time = tmp_tsk->prs_time + 28800;
+        tm_info = localtime(&prs_time);
+        strftime(buffer, 26, "%m-%d %H:%M", tm_info);
+
+        sprintf(tmp_str, "{'timestamp':%ld,'prs_time':'%s','socket_idx':%d,'on':%d,'weekday':%d},",
+            tmp_tsk->prs_time, buffer, tmp_tsk->socket_idx+1, tmp_tsk->on, tmp_tsk->weekday);
+        tmp_str += strlen(tmp_str);
+        tmp_tsk = tmp_tsk->next;
+    }
+    if (user_config->task_count > 0) --tmp_str;
+    *tmp_str = ']';
+    return str;
+}

TC1/timed_task/timed_task.h

@@ -1,21 +1,21 @@
-#pragma once
-#include <time.h>
-
-struct TimedTask;
-typedef struct TimedTask* pTimedTask;
-struct TimedTask
-{
-    bool on_use;     //正在使用
-    time_t prs_time; //被执行的格林尼治时间戳
-    int socket_idx;  //要控制的插孔
-    int on;          //开或者关
-    int weekday;     //星期重复 0代表不重复 8代表每日重复
-    pTimedTask next; //下一个任务(按之间排序)
-};
-
-pTimedTask NewTask();
-bool AddTask(pTimedTask task);
-bool DelTask(int time);
-bool DelFirstTask();
-void ProcessTask();
-char* GetTaskStr();
+#pragma once
+#include <time.h>
+
+struct TimedTask;
+typedef struct TimedTask* pTimedTask;
+struct TimedTask
+{
+    bool on_use;     //正在使用
+    time_t prs_time; //被执行的格林尼治时间戳
+    int socket_idx;  //要控制的插孔
+    int on;          //开或者关
+    int weekday;     //星期重复 0代表不重复 8代表每日重复
+    pTimedTask next; //下一个任务(按之间排序)
+};
+
+pTimedTask NewTask();
+bool AddTask(pTimedTask task);
+bool DelTask(int time);
+bool DelFirstTask();
+void ProcessTask();
+char* GetTaskStr();