修复插座命名功能的一些问题

向ha mqtt增加设备，而不是只增加实体

README.md

@@ -8,10 +8,10 @@
 
 # 固件web界面
 
-<img src="doc/2.png"><img src="doc/1.png">
+<img src="doc/IMG_0863.png"><img src="doc/1.png">
 
 # HASS接入效果
-<img src="doc/3.png">
+<img src="doc/IMG_0862.png">
 
 固件启动后, 会开启一个热点 TC1-AP-XXXXXX，连接热点后, 直接用浏览器访问: http://192.168.0.1 即可看到如上web界面.
 
@@ -52,11 +52,13 @@ TC1 排插硬件分 A1 A2 两个版本, 本固件仅支持 **A1 版本**. A1 A2
 
 - [x] HomeAssistant中增加总耗电量传感器，今日耗电量传感器，昨日耗电量传感器，数据来自于插座历史统计
 - [x] 可以设置mqtt数据上报频率，默认2秒
+- [x] 可以设置电源 led 是否打开，默认打开（系统自检以及错误指示灯仍会工作）
+- [x] 后台和ha mqtt增加总开关控制
 
 # 编译固件
 
-- windows环境，先安装python2.7
-- 安装[mico-cube 1.0.0](https://files.pythonhosted.org/packages/a8/4e/687a3ef2edabfd9fdd797747d6eeb2ddbe70e65c49fa4062268281a0ded4/mico-cube-1.0.0.tar.gz#sha256=4a930d394344f72c862c203d5d8a832357c3b3dc940c825ca3e528453dd2f17f)
+- windows环境，先安装python2.7,下载安装的时候添加环境变量到Path，默认安装路径需要添加两个环境变量C:\Python27；C:\Python27\Scripts
+- 安装[mico-cube 1.0.0](https://files.pythonhosted.org/packages/a8/4e/687a3ef2edabfd9fdd797747d6eeb2ddbe70e65c49fa4062268281a0ded4/mico-cube-1.0.0.tar.gz#sha256=4a930d394344f72c862c203d5d8a832357c3b3dc940c825ca3e528453dd2f17f) python2 -m pip install ./mico-cube-1.0.0.tar.gz
 - 安装[Micoder](http://firmware.mxchip.com/MiCoder_v1.3_Win32:64.zip)下载完解压出来（不要有中文路径）
 - 安装完成后添加micoder路径 mico config --global MICODER (micoder所在路径)/MiCoder
 - 最后切换到此项目根目录执行build.sh即可编译固件

TC1/http_server/app_httpd.c

@@ -52,7 +52,7 @@
 static bool is_http_init;
 static bool is_handlers_registered;
 const struct httpd_wsgi_call g_app_handlers[];
-char power_info_json[1552] = {0};
+char power_info_json[1952] = {0};
 char up_time[16] = "00:00:00";
 
 /*
@@ -149,18 +149,27 @@ static int HttpGetAssets(httpd_request_t *req) {
 
 static int HttpGetTc1Status(httpd_request_t *req) {
     char *sockets = GetSocketStatus();
-    char *tc1_status = malloc(512);
+    char *tc1_status = malloc(1024);
+    char *socket_names = malloc(512);
+    sprintf(socket_names, "%s,%s,%s,%s,%s,%s",
+            user_config->socket_names[0],
+            user_config->socket_names[1],
+            user_config->socket_names[2],
+            user_config->socket_names[3],
+            user_config->socket_names[4],
+            user_config->socket_names[5]);
     sprintf(tc1_status, TC1_STATUS_JSON, sockets, ip_status.mode,
             sys_config->micoSystemConfig.ssid, sys_config->micoSystemConfig.user_key,
             user_config->ap_name, user_config->ap_key, MQTT_SERVER, MQTT_SERVER_PORT,
             MQTT_SERVER_USR, MQTT_SERVER_PWD,
             VERSION, ip_status.ip, ip_status.mask, ip_status.gateway, user_config->mqtt_report_freq,
-            user_config->power_led_enabled, 0L);
+            user_config->power_led_enabled, 0L,socket_names);
 
     OSStatus err = kNoErr;
     send_http(tc1_status, strlen(tc1_status), exit, &err);
 
     exit:
+    if (socket_names) free(socket_names);
     if (tc1_status) free(tc1_status);
     return err;
 }
@@ -183,6 +192,27 @@ static int HttpSetSocketStatus(httpd_request_t *req) {
     return err;
 }
 
+static int HttpSetSocketName(httpd_request_t *req) {
+    OSStatus err = kNoErr;
+
+    int buf_size = 512;
+    char *buf = malloc(buf_size);
+
+    err = httpd_get_data(req, buf, buf_size);
+    require_noerr(err, exit);
+    int index;
+    char name[64];
+    sscanf(buf, "%d %s",&index,name);
+    strcpy(user_config->socket_names[index],name);
+    mico_system_context_update(sys_config);
+    registerMqttEvents();
+    send_http("OK", 2, exit, &err);
+
+    exit:
+    if (buf) free(buf);
+    return err;
+}
+
 static int HttpGetPowerInfo(httpd_request_t *req) {
     OSStatus err = kNoErr;
     char buf[16];
@@ -204,9 +234,18 @@ static int HttpGetPowerInfo(httpd_request_t *req) {
 
     char *powers = GetPowerRecord(idx);
     char *sockets = GetSocketStatus();
+    char *socket_names = malloc(512);
+    sprintf(socket_names, "%s,%s,%s,%s,%s,%s",
+            user_config->socket_names[0],
+            user_config->socket_names[1],
+            user_config->socket_names[2],
+            user_config->socket_names[3],
+            user_config->socket_names[4],
+            user_config->socket_names[5]);
     sprintf(power_info_json, POWER_INFO_JSON, sockets, power_record.idx, PW_NUM, p_count, powers,
-            up_time,user_config->power_led_enabled);
+            up_time,user_config->power_led_enabled,RelayOut()?1:0,socket_names);
     send_http(power_info_json, strlen(power_info_json), exit, &err);
+    if (socket_names) free(socket_names);
     exit:
     return err;
 }
@@ -328,6 +367,7 @@ static int HttpGetMqttReportFreq(httpd_request_t *req) {
     send_http(freq, strlen(freq), exit, &err);
 
     exit:
+    if(freq) free(freq);
     return err;
 }
 
@@ -378,6 +418,7 @@ static int HttpAddTask(httpd_request_t *req) {
     char *mess = (re == 4 && AddTask(task)) ? "OK" : "NO";
 
     send_http(mess, strlen(mess), exit, &err);
+    if(mess) free(mess);
     exit:
     return err;
 }
@@ -397,6 +438,7 @@ static int HttpDelTask(httpd_request_t *req) {
 
     send_http(mess, strlen(mess), exit, &err);
     exit:
+    if(time_str) free(time_str);
     return err;
 }
 
@@ -409,6 +451,7 @@ static int LedStatus(httpd_request_t *req) {
     send_http(led, strlen(led), exit, &err);
 
     exit:
+    if(led) free(led);
     return err;
 }
 
@@ -427,6 +470,7 @@ static int LedSetEnabled(httpd_request_t *req) {
     } else {
         UserLedSet(0);
     }
+    UserMqttSendLedState();
     mico_system_context_update(sys_config);
 
     send_http("OK", 2, exit, &err);
@@ -436,6 +480,30 @@ static int LedSetEnabled(httpd_request_t *req) {
     return err;
 }
 
+static int TotalSocketSetEnabled(httpd_request_t *req){
+    OSStatus err = kNoErr;
+
+    int buf_size = 97;
+    int on;
+    char *buf = malloc(buf_size);
+
+    err = httpd_get_data(req, buf, buf_size);
+    require_noerr(err, exit);
+
+    sscanf(buf, "%d", &on);
+    UserRelaySetAll(on);
+    int i = 0;
+    for (; i < SOCKET_NUM; i++) {
+        UserMqttSendSocketState(i);
+    }
+    UserMqttSendTotalSocketState();
+    send_http("OK", 2, exit, &err);
+
+    exit:
+    if (buf) free(buf);
+    return err;
+}
+
 static int Otastatus(httpd_request_t *req) {
     OSStatus err = kNoErr;
     char buf[16] = {0};
@@ -476,6 +544,8 @@ const struct httpd_wsgi_call g_app_handlers[] = {
         {"/task",             HTTPD_HDR_DEFORT, APP_HTTP_FLAGS_NO_EXACT_MATCH, HttpGetTasks,          HttpAddTask,           NULL, HttpDelTask},
         {"/ota",              HTTPD_HDR_DEFORT, 0,                             Otastatus,             OtaStart,              NULL, NULL},
         {"/led",              HTTPD_HDR_DEFORT, 0,                             LedStatus,             LedSetEnabled,         NULL, NULL},
+        {"/socketAll",              HTTPD_HDR_DEFORT, 0,                             NULL,             TotalSocketSetEnabled,         NULL, NULL},
+        {"/socketNames",           HTTPD_HDR_DEFORT, 0, NULL,                                              HttpSetSocketName,   NULL, NULL},
 };
 
 static int g_app_handlers_no = sizeof(g_app_handlers) / sizeof(struct httpd_wsgi_call);

TC1/http_server/app_httpd.h

@@ -64,10 +64,11 @@
     'gateway':'%s',\
 	'reportFreq':'%d',\
     'ledEnabled':%d,\
-    'up_time':%ld\
+    'up_time':%ld,\
+    'socketNames':'%s'\
 }"
 
-#define POWER_INFO_JSON "{'sockets':'%s','idx':%d,'len':%d,'p_count':%ld,'powers':[%s],'up_time':'%s','led_enabled':%d}"
+#define POWER_INFO_JSON "{'sockets':'%s','idx':%d,'len':%d,'p_count':%ld,'powers':[%s],'up_time':'%s','led_enabled':%d,'total_switch_on':%d,'socketNames':'%s'}"
 
 int AppHttpdStart(void);
 

TC1/http_server/web/index.html

@@ -135,7 +135,26 @@
                             </li>
                             <li class="mdl-list__item">
                     <span class="mdl-list__item-primary-content">
-                      <span class="lang" langKey="Socket">插座</span>-1
+                      <span class="lang" langKey="SocketAll">总开关</span>
+                    </span>
+                                <span class="mdl-list__item-secondary-action">
+                      <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
+                             for="list-switch-all">
+                        <input type="checkbox" id="list-switch-all" class="mdl-switch__input"
+                               checked/>
+                      </label>
+                    </span>
+                            </li>
+                            <li class="mdl-list__item">
+                    <span class="mdl-list__item-primary-content">
+                        <button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon edit-socket-name">
+                <i class="material-icons">
+                    <svg>
+                        <use xlink:href="#icon-edit"/>
+                    </svg>
+                </i>
+            </button>
+                      <span class="lang" langKey="Socket">插座</span><span class="socket-index">-1</span>
                     </span>
                                 <span class="mdl-list__item-secondary-action">
                       <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
@@ -147,7 +166,14 @@
                             </li>
                             <li class="mdl-list__item">
                     <span class="mdl-list__item-primary-content">
-                      <span class="lang" langKey="Socket">插座</span>-2
+                        <button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon edit-socket-name">
+                <i class="material-icons">
+                    <svg>
+                        <use xlink:href="#icon-edit"/>
+                    </svg>
+                </i>
+            </button>
+                      <span class="lang" langKey="Socket">插座</span><span class="socket-index">-2</span>
                     </span>
                                 <span class="mdl-list__item-secondary-action">
                       <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
@@ -159,7 +185,14 @@
                             </li>
                             <li class="mdl-list__item">
                     <span class="mdl-list__item-primary-content">
-                      <span class="lang" langKey="Socket">插座</span>-3
+                        <button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon edit-socket-name">
+                <i class="material-icons">
+                    <svg>
+                        <use xlink:href="#icon-edit"/>
+                    </svg>
+                </i>
+            </button>
+                      <span class="lang" langKey="Socket">插座</span><span class="socket-index">-3</span>
                     </span>
                                 <span class="mdl-list__item-secondary-action">
                       <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
@@ -171,7 +204,14 @@
                             </li>
                             <li class="mdl-list__item">
                     <span class="mdl-list__item-primary-content">
-                      <span class="lang" langKey="Socket">插座</span>-4
+                        <button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon edit-socket-name">
+                <i class="material-icons">
+                    <svg>
+                        <use xlink:href="#icon-edit"/>
+                    </svg>
+                </i>
+            </button>
+                      <span class="lang" langKey="Socket">插座</span><span class="socket-index">-4</span>
                     </span>
                                 <span class="mdl-list__item-secondary-action">
                       <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
@@ -183,7 +223,14 @@
                             </li>
                             <li class="mdl-list__item">
                     <span class="mdl-list__item-primary-content">
-                      <span class="lang" langKey="Socket">插座</span>-5
+                        <button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon edit-socket-name">
+                <i class="material-icons">
+                    <svg>
+                        <use xlink:href="#icon-edit"/>
+                    </svg>
+                </i>
+            </button>
+                      <span class="lang" langKey="Socket">插座</span><span class="socket-index">-5</span>
                     </span>
                                 <span class="mdl-list__item-secondary-action">
                       <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
@@ -195,7 +242,14 @@
                             </li>
                             <li class="mdl-list__item">
                     <span class="mdl-list__item-primary-content">
-                      <span class="lang" langKey="Socket">插座</span>-6
+                        <button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon edit-socket-name">
+                <i class="material-icons">
+                    <svg>
+                        <use xlink:href="#icon-edit"/>
+                    </svg>
+                </i>
+            </button>
+                      <span class="lang" langKey="Socket">插座</span><span class="socket-index">-6</span>
                     </span>
                                 <span class="mdl-list__item-secondary-action">
                       <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
@@ -465,6 +519,7 @@
                     </tr>
                 </table>
                 <div class="mdl-card__actions mdl-card--border">
+                    <span>提示：长按电源按钮5s可开启热点重新配网，10s恢复出厂设置</span>
                     <div class="mdl-layout-spacer"></div>
                     <i class="material-icons">
                         <svg>
@@ -532,6 +587,10 @@
             <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
             <path d="M0 0h24v24H0z" fill="none"/>
         </g>
+        <g id="icon-edit">
+            <path d="M5,3C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19H5V5H12V3H5M17.78,4C17.61,4 17.43,4.07 17.3,4.2L16.08,5.41L18.58,7.91L19.8,6.7C20.06,6.44 20.06,6 19.8,5.75L18.25,4.2C18.12,4.07 17.95,4 17.78,4M15.37,6.12L8,13.5V16H10.5L17.87,8.62L15.37,6.12Z" />
+            <path d="M0 0h24v24H0z" fill="none"/>
+        </g>
         <g id="icon-translate">
             <path d="M0 0h24v24H0z" fill="none"/>
             <path d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z"/>
@@ -634,7 +693,8 @@
       About: {en: "About", cn: "关于"},
       //主页
       Socket: {en: "Socket", cn: "插座"},
-      Led:{en: "PowerLed", cn: "电源指示灯"}
+      Led:{en: "PowerLed", cn: "电源指示灯"},
+      SocketAll:{en: "Total switch", cn: "总开关"}
     }
     function ChangeLanguage(lang) {
       if (lang == "jp") {
@@ -718,12 +778,18 @@
     HttpGet("/status", function (re) {
       var status = JSON.parse(re);
       var status_arr = status.sockets.split(",");
+      var names_arr = status.socketNames.split(",");
+      var switchTexts = document.querySelectorAll('.mdl-list__item-primary-content');
       for (var i = 0; i < status_arr.length; i++) {
+          var langSpan = switchTexts[i+2].querySelector('.lang');
+          var indexSpan = switchTexts[i+2].querySelector('.socket-index');
+          if (langSpan) langSpan.textContent = names_arr[i];   // 修改插座名称
+          if (indexSpan) indexSpan.textContent = ""; // 修改序号，可自定义起始数字
           //checkboxs[i].checked = status_arr[i] == "1";
           if (status_arr[i] == "1") {
-            switch_lables[i].MaterialSwitch.on();
+            switch_lables[i+2].MaterialSwitch.on();
           } else {
-            switch_lables[i].MaterialSwitch.off();
+            switch_lables[i+2].MaterialSwitch.off();
           }
         }
 
@@ -788,15 +854,56 @@
     var checkboxs = socket_ul.getElementsByClassName("mdl-switch__input");
     var switch_lables = socket_ul.getElementsByClassName("mdl-switch");
     $(".mdl-switch__input").on("click", function() {
+    if("list-switch-all" == this.id){
+    return;
+    }
       var sockets_st = "";
-      for (var i = 1; i < checkboxs.length; i++) {
+      for (var i = 2; i < checkboxs.length; i++) {
         sockets_st += (checkboxs[i].checked ? "1," : "0,");
       }
       HttpPost("/socket", function (re) {
       }, sockets_st);
         HttpPost("/led", function (re) {
       }, checkboxs[0].checked ? "1" : "0");
+
     });
+
+    $(".edit-socket-name").on("click", function () {
+    // 获取当前按钮所在的 li 元素
+    var $li = $(this).closest(".mdl-list__item");
+
+    // 获取当前索引
+    var index = $(".edit-socket-name").index(this);
+
+    // 获取 lang 名称和 socket-index 元素
+    var $lang = $li.find(".lang");
+    var $index = $li.find(".socket-index");
+
+    // 原名称
+    var oldName = $lang.text().trim();
+
+    // 弹窗编辑
+    var newName = prompt("请输入新的插座名称", oldName);
+    if (newName && newName.trim() !== "") {
+    if(newName.trim().includes(" ")){
+    ShowToast("名称不能包含空格");
+    return;
+    }
+    if(newName.trim().length>16){
+     ShowToast("名称不能超过16个字");
+    return;
+    }
+      $lang.text(newName.trim());
+      // 可选：更新序号
+      $index.text("");
+      HttpPost("/socketNames", function (re) {
+      }, index+' '+newName.trim());}
+  });
+
+    document.getElementById("list-switch-all").addEventListener("click", function() {
+     HttpPost("/socketAll", function (re) {
+      }, checkboxs[1].checked ? "1" : "0");});
+
     //Socket-end
 
     //Config-start
@@ -951,14 +1058,25 @@
             switch_lables[0].MaterialSwitch.on();
           } else {
             switch_lables[0].MaterialSwitch.off();
+          }
+              if (power.total_switch_on == 1) {
+            switch_lables[1].MaterialSwitch.on();
+          } else {
+            switch_lables[1].MaterialSwitch.off();
           }
         var status_arr = power.sockets.split(",");
+        var names_arr = power.socketNames.split(",");
+        var switchTexts = document.querySelectorAll('.mdl-list__item-primary-content');    
         for (var i = 0; i < status_arr.length; i++) {
           //checkboxs[i].checked = status_arr[i] == "1";
+          var langSpan = switchTexts[i+2].querySelector('.lang');
+          var indexSpan = switchTexts[i+2].querySelector('.socket-index');
+          if (langSpan) langSpan.textContent = names_arr[i];   // 修改插座名称
+          if (indexSpan) indexSpan.textContent = ""; // 修改序号，可自定义起始数字
           if (status_arr[i] == "1") {
-            switch_lables[i+1].MaterialSwitch.on();
+            switch_lables[i+2].MaterialSwitch.on();
           } else {
-            switch_lables[i+1].MaterialSwitch.off();
+            switch_lables[i+2].MaterialSwitch.off();
           }
         }
 

TC1/main.c

@@ -4,6 +4,7 @@
 #include "time.h"
 #include "unistd.h"
 #include "TimeUtils.h"
+#include "mico_system.h"
 
 #include "user_gpio.h"
 #include "user_wifi.h"
@@ -16,6 +17,7 @@
 char rtc_init = 0; //sntp校时成功标志位
 uint32_t total_time = 0;
 char str_mac[16] = {0};
+int last_check_day = 0;
 
 system_config_t *sys_config;
 user_config_t *user_config;
@@ -46,6 +48,7 @@ void appRestoreDefault_callback(void *const user_config_data, uint32_t size) {
     int i;
     for (i = 0; i < SOCKET_NUM; i++) {
         userConfigDefault->socket_status[i] = 1;
+        snprintf(userConfigDefault->socket_names[i], SOCKET_NAME_LENGTH, "插座-%d", i+1);
     }
     for (i = 0; i < MAX_TASK_NUM; i++) {
         userConfigDefault->timed_tasks[i].on_use = false;
@@ -55,19 +58,36 @@ void appRestoreDefault_callback(void *const user_config_data, uint32_t size) {
 
 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;
+  mico_utc_time_t utc_time;
+  mico_time_get_utc_time(&utc_time);
+  utc_time += 28800;
+  struct tm * current_time = localtime((const time_t *) &utc_time);
+    // 判断上次检查的时间与当前时间的日期是否不同
+    if (last_check_day != 0) {
+        // 如果日期发生变化（即跨天了），则进行记录
+        if (current_time->tm_mday != last_check_day) {
+    tc1_log("WARNGIN: pcount day changed! now day %d hour %d min %d ,lastCheck day %d",current_time->tm_mday,current_time->tm_hour,current_time->tm_min,last_check_day);
+
+//            tc1_log("WARNGIN: pcount day changed! ");
+            // 记录数据
+            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! p_count_1_day_ago:%d p_count_2_days_ago:%d",
+                    user_config->p_count_1_day_ago, user_config->p_count_2_days_ago);
+        } else {
+//        	tc1_log("WARNGIN: pcount day not changed , waiting for next run! ");
+        }
+    }else{
+        	    tc1_log("WARNGIN: now day %d hour %d min %d ,lastCheck day %d",current_time->tm_mday,current_time->tm_hour,current_time->tm_min,last_check_day);
     }
-    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! p_count_1_day_ago:%d p_count_2_days_ago:%d",
-            user_config->p_count_1_day_ago, user_config->p_count_2_days_ago);
+    // 更新上次检查时间
+    last_check_day = current_time->tm_mday;
 }
 
 void schedule_p_count_task(mico_thread_arg_t arg) {
@@ -105,8 +125,6 @@ int application_start(void) {
     err = mico_system_init(sys_config);
     require_noerr(err, exit);
 
-    p_count = user_config->p_count_1_day_ago;
-
     uint8_t mac[8];
     mico_wlan_get_mac_address(mac);
     sprintf(str_mac, "%02X%02X%02X%02X%02X%02X",

TC1/main.h

@@ -23,10 +23,10 @@
 
 #define ZTC1_NAME "zTC1-%s"
 
-#define USER_CONFIG_VERSION 8
+#define USER_CONFIG_VERSION 9
 #define SETTING_MQTT_STRING_LENGTH_MAX 32 //必须4字节对齐。
 
-#define SOCKET_NAME_LENGTH   32
+#define SOCKET_NAME_LENGTH   64
 #define SOCKET_NUM           6  //插座数量
 
 #define Led    MICO_GPIO_5
@@ -51,6 +51,7 @@ typedef struct
 {
     char version;
     char mqtt_ip[SETTING_MQTT_STRING_LENGTH_MAX];
+    char socket_names[SOCKET_NUM][SOCKET_NAME_LENGTH];
     int mqtt_port;
     int mqtt_report_freq;
     char mqtt_user[SETTING_MQTT_STRING_LENGTH_MAX];
@@ -75,4 +76,5 @@ extern system_config_t* sys_config;
 extern user_config_t* user_config;
 extern mico_gpio_t Relay[Relay_NUM];
 
+
 #endif

TC1/mqtt_server/user_mqtt_client.c

@@ -27,8 +27,7 @@
 #include "user_power.h"
 #include "user_mqtt_client.h"
 
-typedef struct
-{
+typedef struct {
     char topic[MAX_MQTT_TOPIC_SIZE];
     char qos;
     char retained;
@@ -38,11 +37,16 @@ typedef struct
 } mqtt_recv_msg_t, *p_mqtt_recv_msg_t, mqtt_send_msg_t, *p_mqtt_send_msg_t;
 
 static void MqttClientThread(mico_thread_arg_t arg);
-static void MessageArrived(MessageData* md);
-static OSStatus MqttMsgPublish(Client *c, const char* topic, char qos, char retained, const unsigned char* msg, uint32_t msg_len);
+
+static void MessageArrived(MessageData *md);
+
+static OSStatus
+MqttMsgPublish(Client *c, const char *topic, char qos, char retained, const unsigned char *msg,
+               uint32_t msg_len);
 
 OSStatus UserRecvHandler(void *arg);
-void ProcessHaCmd(char* cmd);
+
+void ProcessHaCmd(char *cmd);
 
 bool isconnect = false;
 mico_queue_t mqtt_msg_send_queue = NULL;
@@ -58,92 +62,92 @@ char topic_set[MAX_MQTT_TOPIC_SIZE];
 
 mico_timer_t timer_handle;
 static char timer_status = 0;
-void UserMqttTimerFunc(void *arg)
-{
+
+void UserMqttTimerFunc(void *arg) {
     LinkStatusTypeDef LinkStatus;
     micoWlanGetLinkStatus(&LinkStatus);
-    if (LinkStatus.is_connected != 1)
-    {
+    if (LinkStatus.is_connected != 1) {
         mico_stop_timer(&timer_handle);
         return;
     }
-    if (mico_rtos_is_queue_empty(&mqtt_msg_send_queue))
-    {
-        timer_status++;
-        switch (timer_status)
-        {
-        case 1:
-        case 2:
-        case 3:
-        case 4:
-        case 5:
-        case 6:
-            UserMqttHassAuto(timer_status);
-            break;
-        case 7:
-            UserMqttHassAutoPower();
-            break;
-        default:
-            mico_stop_timer(&timer_handle);
-            break;
+    if (mico_rtos_is_queue_empty(&mqtt_msg_send_queue)) {
+
+        switch (timer_status) {
+            case 0:
+                UserMqttHassAutoLed();
+                UserMqttHassAutoTotalSocket();
+                break;
+            case 1:
+            case 2:
+            case 3:
+            case 4:
+            case 5:
+            case 6:
+                UserMqttHassAuto(timer_status);
+                break;
+            case 7:
+                UserMqttHassAutoPower();
+                break;
+            default:
+                mico_stop_timer(&timer_handle);
+                break;
         }
+        timer_status++;
     }
 }
 
 /* Application entrance */
-OSStatus UserMqttInit(void)
-{
+OSStatus UserMqttInit(void) {
     OSStatus err = kNoErr;
 
     sprintf(topic_set, MQTT_CLIENT_SUB_TOPIC1);
     sprintf(topic_state, MQTT_CLIENT_PUB_TOPIC, str_mac);
     //TODO size:0x800
     int mqtt_thread_stack_size = 0x2000;
-    uint32_t mqtt_lib_version = MQTTClientLibVersion();
-    mqtt_log("MQTT client version: [%ld.%ld.%ld]",
-        0xFF & (mqtt_lib_version >> 16), 0xFF & (mqtt_lib_version >> 8), 0xFF & mqtt_lib_version);
+    uint32_t mqtt_lib_version = MQTTClientLibVersion();mqtt_log(
+            "MQTT client version: [%ld.%ld.%ld]",
+            0xFF & (mqtt_lib_version >> 16), 0xFF & (mqtt_lib_version >> 8),
+            0xFF & mqtt_lib_version);
 
     /* create mqtt msg send queue */
-    err = mico_rtos_init_queue(&mqtt_msg_send_queue, "mqtt_msg_send_queue", sizeof(p_mqtt_send_msg_t),
-    MAX_MQTT_SEND_QUEUE_SIZE);
+    err = mico_rtos_init_queue(&mqtt_msg_send_queue, "mqtt_msg_send_queue",
+                               sizeof(p_mqtt_send_msg_t),
+                               MAX_MQTT_SEND_QUEUE_SIZE);
     require_noerr_action(err, exit, mqtt_log("ERROR: create mqtt msg send queue err=%d.", err));
 
     /* start mqtt client */
     err = mico_rtos_create_thread(NULL, MICO_APPLICATION_PRIORITY, "mqtt_client",
-                                   (mico_thread_function_t) MqttClientThread,
-                                   mqtt_thread_stack_size, 0);
+                                  (mico_thread_function_t) MqttClientThread,
+                                  mqtt_thread_stack_size, 0);
     require_noerr_string(err, exit, "ERROR: Unable to start the mqtt client thread.");
 
     /* Create a worker thread for user handling MQTT data event  */
-    err = mico_rtos_create_worker_thread(&mqtt_client_worker_thread, MICO_APPLICATION_PRIORITY, 0x800, 5);
+    err = mico_rtos_create_worker_thread(&mqtt_client_worker_thread, MICO_APPLICATION_PRIORITY,
+                                         0x800, 5);
     require_noerr_string(err, exit, "ERROR: Unable to start the mqtt client worker thread.");
 
     exit:
-    if (kNoErr != err) mqtt_log("ERROR2, app thread exit err: %d kNoErr[%d]", err, kNoErr);
+    if (kNoErr != err)mqtt_log("ERROR2, app thread exit err: %d kNoErr[%d]", err, kNoErr);
     return err;
 }
 
-static OSStatus UserMqttClientRelease(Client *c, Network *n)
-{
+static OSStatus UserMqttClientRelease(Client *c, Network *n) {
     OSStatus err = kNoErr;
 
     if (c->isconnected) MQTTDisconnect(c);
 
     n->disconnect(n);  // close connection
 
-    if (MQTT_SUCCESS != MQTTClientDeinit(c))
-    {
-        mqtt_log("MQTTClientDeinit failed!");
+    if (MQTT_SUCCESS != MQTTClientDeinit(c)) { mqtt_log("MQTTClientDeinit failed!");
         err = kDeletedErr;
     }
     return err;
 }
 
 // publish msg to mqtt server
-static OSStatus MqttMsgPublish(Client *c, const char* topic, char qos, char retained,
-                                  const unsigned char* msg,
-                                  uint32_t msg_len)
-{
+static OSStatus MqttMsgPublish(Client *c, const char *topic, char qos, char retained,
+                               const unsigned char *msg,
+                               uint32_t msg_len) {
     OSStatus err = kUnknownErr;
     int ret = 0;
     MQTTMessage publishData = MQTTMessage_publishData_initializer;
@@ -153,19 +157,16 @@ static OSStatus MqttMsgPublish(Client *c, const char* topic, char qos, char reta
     // upload data qos0
     publishData.qos = (enum QoS) qos;
     publishData.retained = retained;
-    publishData.payload = (void*) msg;
+    publishData.payload = (void *) msg;
     publishData.payloadlen = msg_len;
 
     ret = MQTTPublish(c, topic, &publishData);
 
-    if (MQTT_SUCCESS == ret)
-    {
+    if (MQTT_SUCCESS == ret) {
         err = kNoErr;
-    } else if (MQTT_SOCKET_ERR == ret)
-    {
+    } else if (MQTT_SOCKET_ERR == ret) {
         err = kConnectionErr;
-    } else
-    {
+    } else {
         err = kUnknownErr;
     }
 
@@ -173,13 +174,16 @@ static OSStatus MqttMsgPublish(Client *c, const char* topic, char qos, char reta
     return err;
 }
 
-void MqttClientThread(mico_thread_arg_t arg)
-{
+void registerMqttEvents(void) {
+    mico_start_timer(&timer_handle);
+}
+
+void MqttClientThread(mico_thread_arg_t arg) {
     OSStatus err = kUnknownErr;
 
     int rc = -1;
     fd_set readfds;
-    struct timeval t = { 0, MQTT_YIELD_TMIE * 1000 };
+    struct timeval t = {0, MQTT_YIELD_TMIE * 1000};
 
     ssl_opts ssl_settings;
     MQTTPacket_connectData connectData = MQTTPacket_connectData_initializer;
@@ -195,7 +199,8 @@ void MqttClientThread(mico_thread_arg_t arg)
 
     /* create msg send queue event fd */
     msg_send_event_fd = mico_create_event_fd(mqtt_msg_send_queue);
-    require_action(msg_send_event_fd >= 0, exit, mqtt_log("ERROR: create msg send queue event fd failed!!!"));
+    require_action(msg_send_event_fd >= 0, exit,
+                   mqtt_log("ERROR: create msg send queue event fd failed!!!"));
 
     MQTT_start:
 
@@ -203,16 +208,15 @@ void MqttClientThread(mico_thread_arg_t arg)
     /* 1. create network connection */
     ssl_settings.ssl_enable = false;
     LinkStatusTypeDef LinkStatus;
-    while (1)
-    {
+    while (1) {
         isconnect = false;
         mico_rtos_thread_sleep(3);
-        if (MQTT_SERVER[0] < 0x20 || MQTT_SERVER[0] > 0x7f || MQTT_SERVER_PORT < 1) continue;  //鏈厤缃甿qtt鏈嶅姟鍣ㄦ椂涓嶈繛鎺<E7B99B>
+        if (MQTT_SERVER[0] < 0x20 || MQTT_SERVER[0] > 0x7f || MQTT_SERVER_PORT < 1)
+            continue;  //鏈厤缃甿qtt鏈嶅姟鍣ㄦ椂涓嶈繛鎺<E7B99B>
 
         micoWlanGetLinkStatus(&LinkStatus);
-        if (LinkStatus.is_connected != 1)
-        {
-            mqtt_log("ERROR:WIFI not connect, waiting 3s for connecting and then connecting MQTT ");
+        if (LinkStatus.is_connected != 1) { mqtt_log(
+                    "ERROR:WIFI not connect, waiting 3s for connecting and then connecting MQTT ");
             mico_rtos_thread_sleep(3);
             continue;
         }
@@ -221,8 +225,7 @@ void MqttClientThread(mico_thread_arg_t arg)
         if (rc == MQTT_SUCCESS) break;
 
         //mqtt_log("ERROR: MQTT network connect err=%d, reconnect after 3s...", rc);
-    }
-    mqtt_log("MQTT network connect success!");
+    }mqtt_log("MQTT network connect success!");
 
     /* 2. init mqtt client */
     //c.heartbeat_retry_max = 2;
@@ -245,26 +248,26 @@ void MqttClientThread(mico_thread_arg_t arg)
 
     mqtt_log("MQTT client connect success!");
 
-    UserLedSet(user_config->power_led_enabled);
+    UserLedSet(RelayOut() && user_config->power_led_enabled);
 
     /* 4. mqtt client subscribe */
     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);
+    require_noerr_string(rc, MQTT_reconnect, "ERROR: MQTT client subscribe err.");mqtt_log(
+            "MQTT client subscribe success! recv_topic=[%s].", topic_set);
     /*4.1 杩炴帴鎴愬姛鍚庡厛鏇存柊鍙戦<E98D99>佷竴娆℃暟鎹<E69A9F>*/
     isconnect = true;
 
     int i = 0;
-    for (; i < SOCKET_NUM; i++)
-    {
+    for (; i < SOCKET_NUM; i++) {
         UserMqttSendSocketState(i);
     }
 
+    UserMqttSendLedState();
+
     mico_init_timer(&timer_handle, 150, UserMqttTimerFunc, &arg);
-    mico_start_timer(&timer_handle);
+    registerMqttEvents();
     /* 5. client loop for recv msg && keepalive */
-    while (1)
-    {
+    while (1) {
         isconnect = true;
         no_mqtt_msg_exchange = true;
         FD_ZERO(&readfds);
@@ -273,26 +276,23 @@ void MqttClientThread(mico_thread_arg_t arg)
         select(msg_send_event_fd + 1, &readfds, NULL, NULL, &t);
 
         /* recv msg from server */
-        if (FD_ISSET(c.ipstack->my_socket, &readfds))
-        {
+        if (FD_ISSET(c.ipstack->my_socket, &readfds)) {
             rc = MQTTYield(&c, (int) MQTT_YIELD_TMIE);
             require_noerr(rc, MQTT_reconnect);
             no_mqtt_msg_exchange = false;
         }
 
         /* recv msg from user worker thread to be sent to server */
-        if (FD_ISSET(msg_send_event_fd, &readfds))
-        {
-            while (mico_rtos_is_queue_empty(&mqtt_msg_send_queue) == false)
-            {
+        if (FD_ISSET(msg_send_event_fd, &readfds)) {
+            while (mico_rtos_is_queue_empty(&mqtt_msg_send_queue) == false) {
                 // get msg from send queue
                 mico_rtos_pop_from_queue(&mqtt_msg_send_queue, &p_send_msg, 0);
                 require_string(p_send_msg, exit, "Wrong data point");
 
                 // send message to server
                 err = MqttMsgPublish(&c, p_send_msg->topic, p_send_msg->qos, p_send_msg->retained,
-                                        (const unsigned char*)p_send_msg->data,
-                                        p_send_msg->datalen);
+                                     (const unsigned char *) p_send_msg->data,
+                                     p_send_msg->datalen);
 
                 require_noerr_string(err, MQTT_reconnect, "ERROR: MQTT publish data err");
 
@@ -304,8 +304,7 @@ void MqttClientThread(mico_thread_arg_t arg)
         }
 
         /* if no msg exchange, we need to check ping msg to keep alive. */
-        if (no_mqtt_msg_exchange)
-        {
+        if (no_mqtt_msg_exchange) {
             rc = keepalive(&c);
             require_noerr_string(rc, MQTT_reconnect, "ERROR: keepalive err");
         }
@@ -313,9 +312,9 @@ void MqttClientThread(mico_thread_arg_t arg)
 
     MQTT_reconnect:
 
-    mqtt_log("Disconnect MQTT client, and reconnect after 5s, reason: mqtt_rc = %d, err = %d", rc, err);
+mqtt_log("Disconnect MQTT client, and reconnect after 5s, reason: mqtt_rc = %d, err = %d", rc, err);
 
-    timer_status=100;
+    timer_status = 100;
 
     UserMqttClientRelease(&c, &n);
     isconnect = false;
@@ -326,18 +325,16 @@ void MqttClientThread(mico_thread_arg_t arg)
     goto MQTT_start;
 
     exit:
-    isconnect = false;
-    mqtt_log("EXIT: MQTT client exit with err = %d.", err);
+    isconnect = false;mqtt_log("EXIT: MQTT client exit with err = %d.", err);
     UserMqttClientRelease(&c, &n);
     mico_rtos_delete_thread(NULL);
 }
 
 // callback, msg received from mqtt server
-static void MessageArrived(MessageData* md)
-{
+static void MessageArrived(MessageData *md) {
     OSStatus err = kUnknownErr;
     p_mqtt_recv_msg_t p_recv_msg = NULL;
-    MQTTMessage* message = md->message;
+    MQTTMessage *message = md->message;
 
     p_recv_msg = (p_mqtt_recv_msg_t) calloc(1, sizeof(mqtt_recv_msg_t));
     require_action(p_recv_msg, exit, err = kNoMemoryErr);
@@ -349,26 +346,25 @@ static void MessageArrived(MessageData* md)
     memcpy(p_recv_msg->data, message->payload, message->payloadlen);
 
     mqtt_log("MessageArrived topic[%s] data[%s]", p_recv_msg->topic, p_recv_msg->data);
-    err = mico_rtos_send_asynchronous_event(&mqtt_client_worker_thread, UserRecvHandler, p_recv_msg);
+    err = mico_rtos_send_asynchronous_event(&mqtt_client_worker_thread, UserRecvHandler,
+                                            p_recv_msg);
     require_noerr(err, exit);
 
     exit:
-    if (err != kNoErr)
-    {
-        mqtt_log("ERROR: Recv data err = %d", err);
+    if (err != kNoErr) { mqtt_log("ERROR: Recv data err = %d", err);
         if (p_recv_msg) free(p_recv_msg);
     }
     return;
 }
 
 /* Application process MQTT received data */
-OSStatus UserRecvHandler(void *arg)
-{
+OSStatus UserRecvHandler(void *arg) {
     OSStatus err = kUnknownErr;
     p_mqtt_recv_msg_t p_recv_msg = arg;
     require(p_recv_msg, exit);
 
-    mqtt_log("user get data success! from_topic=[%s], msg=[%ld].", p_recv_msg->topic, p_recv_msg->datalen);
+    mqtt_log("user get data success! from_topic=[%s], msg=[%ld].", p_recv_msg->topic,
+             p_recv_msg->datalen);
     //UserFunctionCmdReceived(0, p_recv_msg->data);
 
     ProcessHaCmd(p_recv_msg->data);
@@ -379,33 +375,52 @@ OSStatus UserRecvHandler(void *arg)
     return err;
 }
 
-void ProcessHaCmd(char* cmd)
-{
+void ProcessHaCmd(char *cmd) {
     mqtt_log("ProcessHaCmd[%s]", cmd);
-    char mac[20] = { 0 };
+    char mac[20] = {0};
 
-    if (strcmp(cmd, "set socket") == ' ')
-    {
+    if (strcmp(cmd, "set socket") == ' ') {
         int i, on;
         sscanf(cmd, "set socket %s %d %d", mac, &i, &on);
-        if (strcmp(mac, str_mac)) return;
-        mqtt_log("set socket[%d] on[%d]", i, on);
+        if (strcmp(mac, str_mac)) return;mqtt_log("set socket[%d] on[%d]", i, on);
         UserRelaySet(i, on);
         UserMqttSendSocketState(i);
+        UserMqttSendTotalSocketState();
         mico_system_context_update(sys_config);
+    } else if (strcmp(cmd, "set led") == ' ') {
+        int on;
+        sscanf(cmd, "set led %s %d", mac, &on);
+        if (strcmp(mac, str_mac)) return;mqtt_log("set led on[%d]", on);
+        user_config->power_led_enabled = on;
+        if (RelayOut() && user_config->power_led_enabled) {
+            UserLedSet(1);
+        } else {
+            UserLedSet(0);
+        }
+        UserMqttSendLedState();
+        mico_system_context_update(sys_config);
+    } else if (strcmp(cmd, "set total_socket") == ' ') {
+        int on;
+        sscanf(cmd, "set total_socket %s %d", mac, &on);
+        if (strcmp(mac, str_mac)) return;mqtt_log("set total_socket on[%d]", on);
+        UserRelaySetAll(on);
+        int i = 0;
+        for (i = 0; i < SOCKET_NUM; i++) {
+            UserRelaySet(i, user_config->socket_status[i]);
+            UserMqttSendSocketState(i);
+        }
+        UserMqttSendTotalSocketState();
     }
 }
 
-OSStatus UserMqttSendTopic(char *topic, char *arg, char retained)
-{
+OSStatus UserMqttSendTopic(char *topic, char *arg, char retained) {
     OSStatus err = kUnknownErr;
     p_mqtt_send_msg_t p_send_msg = NULL;
 
 //  mqtt_log("======App prepare to send ![%d]======", MicoGetMemoryInfo()->free_memory);
 
     /* Send queue is full, pop the oldest */
-    if (mico_rtos_is_queue_full(&mqtt_msg_send_queue) == true)
-    {
+    if (mico_rtos_is_queue_full(&mqtt_msg_send_queue) == true) {
         mico_rtos_pop_from_queue(&mqtt_msg_send_queue, &p_send_msg, 0);
         free(p_send_msg);
         p_send_msg = NULL;
@@ -432,21 +447,49 @@ OSStatus UserMqttSendTopic(char *topic, char *arg, char retained)
 }
 
 /* Application collect data and seng them to MQTT send queue */
-OSStatus UserMqttSend(char *arg)
-{
+OSStatus UserMqttSend(char *arg) {
     return UserMqttSendTopic(topic_state, arg, 0);
 }
 
 //鏇存柊ha寮<61>鍏崇姸鎬<E5A7B8>
-OSStatus UserMqttSendSocketState(char socket_id)
-{
+OSStatus UserMqttSendSocketState(char socket_id) {
     char *send_buf = malloc(64);
     char *topic_buf = malloc(64);
     OSStatus oss_status = kUnknownErr;
-    if (send_buf != NULL && topic_buf != NULL)
-    {
-        sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/state", str_mac, (int)socket_id);
-        sprintf(send_buf, "set socket %s %d %d", str_mac, socket_id, (int)user_config->socket_status[(int)socket_id]);
+    if (send_buf != NULL && topic_buf != NULL) {
+        sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/state", str_mac, (int) socket_id);
+        sprintf(send_buf, "set socket %s %d %d", str_mac, socket_id,
+                (int) user_config->socket_status[(int) socket_id]);
+        oss_status = UserMqttSendTopic(topic_buf, send_buf, 1);
+    }
+    if (send_buf) free(send_buf);
+    if (topic_buf) free(topic_buf);
+
+    return oss_status;
+}
+
+OSStatus UserMqttSendTotalSocketState(void) {
+    char *send_buf = malloc(64);
+    char *topic_buf = malloc(64);
+    OSStatus oss_status = kUnknownErr;
+    if (send_buf != NULL && topic_buf != NULL) {
+        sprintf(topic_buf, "homeassistant/switch/%s/total_socket/state", str_mac);
+        sprintf(send_buf, "set total_socket %s %d", str_mac, RelayOut() ? 1 : 0);
+        oss_status = UserMqttSendTopic(topic_buf, send_buf, 1);
+    }
+    if (send_buf) free(send_buf);
+    if (topic_buf) free(topic_buf);
+
+    return oss_status;
+}
+
+OSStatus UserMqttSendLedState(void) {
+    char *send_buf = malloc(64);
+    char *topic_buf = malloc(64);
+    OSStatus oss_status = kUnknownErr;
+    if (send_buf != NULL && topic_buf != NULL) {
+        sprintf(topic_buf, "homeassistant/switch/%s/led/state", str_mac);
+        sprintf(send_buf, "set led %s %d", str_mac, (int) user_config->power_led_enabled);
         oss_status = UserMqttSendTopic(topic_buf, send_buf, 1);
     }
     if (send_buf) free(send_buf);
@@ -456,24 +499,29 @@ OSStatus UserMqttSendSocketState(char socket_id)
 }
 
 //hass mqtt鑷姩鍙戠幇鏁版嵁寮<E5B581>鍏冲彂閫<E5BD82>
-void UserMqttHassAuto(char socket_id)
-{
+void UserMqttHassAuto(char socket_id) {
     socket_id--;
     char *send_buf = NULL;
     char *topic_buf = NULL;
-    send_buf = (char *) malloc(300);
+    send_buf = (char *) malloc(600);
     topic_buf = (char *) malloc(64);
-    if (send_buf != NULL && topic_buf != NULL)
-    {
+    if (send_buf != NULL && topic_buf != NULL) {
         sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/config", str_mac, socket_id);
-        sprintf(send_buf, 
-            "{\"name\":\"TC1_%s_Socket_%d\","
-            "\"uniq_id\":\"%s_s%d\","
-            "\"stat_t\":\"homeassistant/switch/%s/socket_%d/state\","
-            "\"cmd_t\":\"device/ztc1/set\","
-            "\"pl_on\":\"set socket %s %d 1\","
-            "\"pl_off\":\"set socket %s %d 0\"}",
-            str_mac+8, socket_id+1, str_mac, socket_id, str_mac, socket_id, str_mac, socket_id, str_mac, socket_id);
+        sprintf(send_buf,
+                "{\"name\":\"%s\","
+                "\"uniq_id\":\"%s_s%d\","
+                "\"stat_t\":\"homeassistant/switch/%s/socket_%d/state\","
+                "\"cmd_t\":\"device/ztc1/set\","
+                "\"pl_on\":\"set socket %s %d 1\","
+                "\"pl_off\":\"set socket %s %d 0\","
+                "\"device\":{"
+                "\"identifiers\":[\"tc1_%s\"],"
+                "\"name\":\"TC1_%s\","
+                "\"model\":\"TC1\","
+                "\"manufacturer\":\"PHICOMM\"}}",
+                user_config->socket_names[(int)socket_id], str_mac, socket_id, str_mac, socket_id,
+                str_mac,
+                socket_id, str_mac, socket_id, str_mac, str_mac);
         UserMqttSendTopic(topic_buf, send_buf, 1);
     }
     if (send_buf)
@@ -481,68 +529,139 @@ void UserMqttHassAuto(char socket_id)
     if (topic_buf)
         free(topic_buf);
 }
-//hass mqtt鑷姩鍙戠幇鏁版嵁鍔熺巼鍙戦<E98D99><E688A6>
-void UserMqttHassAutoPower(void)
-{
+
+void UserMqttHassAutoLed(void) {
     char *send_buf = NULL;
     char *topic_buf = NULL;
-    send_buf = malloc(512);
+    send_buf = (char *) malloc(600);
+    topic_buf = (char *) malloc(64);
+    if (send_buf != NULL && topic_buf != NULL) {
+        sprintf(topic_buf, "homeassistant/switch/%s/led/config", str_mac);
+        sprintf(send_buf,
+                "{\"name\":\"LED指示灯\","
+                "\"uniq_id\":\"%s_led\","
+                "\"stat_t\":\"homeassistant/switch/%s/led/state\","
+                "\"cmd_t\":\"device/ztc1/set\","
+                "\"pl_on\":\"set led %s 1\","
+                "\"pl_off\":\"set led %s 0\","
+                "\"device\":{"
+                "\"identifiers\":[\"tc1_%s\"],"
+                "\"name\":\"TC1_%s\","
+                "\"model\":\"TC1\","
+                "\"manufacturer\":\"PHICOMM\"}}",
+                str_mac, str_mac, str_mac, str_mac, str_mac, str_mac);
+        UserMqttSendTopic(topic_buf, send_buf, 1);
+    }
+    if (send_buf)
+        free(send_buf);
+    if (topic_buf)
+        free(topic_buf);
+}
+
+void UserMqttHassAutoTotalSocket(void) {
+    char *send_buf = NULL;
+    char *topic_buf = NULL;
+    send_buf = (char *) malloc(600);
+    topic_buf = (char *) malloc(64);
+    if (send_buf != NULL && topic_buf != NULL) {
+        sprintf(topic_buf, "homeassistant/switch/%s/total_socket/config", str_mac);
+        sprintf(send_buf,
+                "{\"name\":\"总开关\","
+                "\"uniq_id\":\"%s_total_socket\","
+                "\"stat_t\":\"homeassistant/switch/%s/total_socket/state\","
+                "\"cmd_t\":\"device/ztc1/set\","
+                "\"pl_on\":\"set total_socket %s 1\","
+                "\"pl_off\":\"set total_socket %s 0\","
+                "\"device\":{"
+                "\"identifiers\":[\"tc1_%s\"],"
+                "\"name\":\"TC1_%s\","
+                "\"model\":\"TC1\","
+                "\"manufacturer\":\"PHICOMM\"}}",
+                str_mac, str_mac, str_mac, str_mac, str_mac, str_mac);
+        UserMqttSendTopic(topic_buf, send_buf, 1);
+    }
+    if (send_buf)
+        free(send_buf);
+    if (topic_buf)
+        free(topic_buf);
+}
+
+//hass mqtt鑷姩鍙戠幇鏁版嵁鍔熺巼鍙戦<E98D99><E688A6>
+void UserMqttHassAutoPower(void) {
+    char *send_buf = NULL;
+    char *topic_buf = NULL;
+    send_buf = malloc(600);
     topic_buf = malloc(128);
-    if (send_buf != NULL && topic_buf != NULL)
-    {
+    if (send_buf != NULL && topic_buf != NULL) {
         sprintf(topic_buf, "homeassistant/sensor/%s/power/config", str_mac);
-        sprintf(send_buf, 
-            "{\"name\":\"TC1_%s_Power\","
-            "\"uniq_id\":\"%s_p\","
-            "\"state_topic\":\"homeassistant/sensor/%s/power/state\","
-            "\"unit_of_measurement\":\"W\","
-            "\"icon\":\"mdi:gauge\","
-            "\"value_template\":\"{{ value_json.power }}\"}",
-            str_mac+8, str_mac, str_mac);
+        sprintf(send_buf,
+                "{\"name\":\"功率\","
+                "\"uniq_id\":\"%s_p\","
+                "\"state_topic\":\"homeassistant/sensor/%s/power/state\","
+                "\"unit_of_measurement\":\"W\","
+                "\"icon\":\"mdi:gauge\","
+                "\"value_template\":\"{{ value_json.power }}\",""\"device\":{"
+                "\"identifiers\":[\"tc1_%s\"],"
+                "\"name\":\"TC1_%s\","
+                "\"model\":\"TC1\","
+                "\"manufacturer\":\"PHICOMM\"}}",
+                str_mac, str_mac, str_mac, str_mac);
         UserMqttSendTopic(topic_buf, send_buf, 1);
         sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumption/config", str_mac);
         sprintf(send_buf,
-                    "{\"name\":\"TC1_%s_PowerConsumption\","
-                    "\"uniq_id\":\"%s_pc\","
-                    "\"state_topic\":\"homeassistant/sensor/%s/powerConsumption/state\","
-                    "\"unit_of_measurement\":\"kWh\","
-                    "\"icon\":\"mdi:fence-electric\","
-                    "\"value_template\":\"{{ value_json.powerConsumption }}\"}",
-                    str_mac+8, str_mac, str_mac);
+                "{\"name\":\"总耗电量\","
+                "\"uniq_id\":\"%s_pc\","
+                "\"state_topic\":\"homeassistant/sensor/%s/powerConsumption/state\","
+                "\"unit_of_measurement\":\"kWh\","
+                "\"icon\":\"mdi:fence-electric\","
+                "\"value_template\":\"{{ value_json.powerConsumption }}\",""\"device\":{"
+                "\"identifiers\":[\"tc1_%s\"],"
+                "\"name\":\"TC1_%s\","
+                "\"model\":\"TC1\","
+                "\"manufacturer\":\"PHICOMM\"}}",
+                str_mac, str_mac, str_mac, str_mac);
         UserMqttSendTopic(topic_buf, send_buf, 1);
 
         sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionToday/config", str_mac);
-                sprintf(send_buf,
-                            "{\"name\":\"TC1_%s_powerConsumptionToday\","
-                            "\"uniq_id\":\"%s_pc_today\","
-                            "\"state_topic\":\"homeassistant/sensor/%s/powerConsumptionToday/state\","
-                            "\"unit_of_measurement\":\"kWh\","
-                            "\"icon\":\"mdi:fence-electric\","
-                            "\"value_template\":\"{{ value_json.powerConsumptionToday }}\"}",
-                            str_mac+8, str_mac, str_mac);
+        sprintf(send_buf,
+                "{\"name\":\"今日耗电量\","
+                "\"uniq_id\":\"%s_pc_today\","
+                "\"state_topic\":\"homeassistant/sensor/%s/powerConsumptionToday/state\","
+                "\"unit_of_measurement\":\"kWh\","
+                "\"icon\":\"mdi:fence-electric\","
+                "\"value_template\":\"{{ value_json.powerConsumptionToday }}\",""\"device\":{"
+                "\"identifiers\":[\"tc1_%s\"],"
+                "\"name\":\"TC1_%s\","
+                "\"model\":\"TC1\","
+                "\"manufacturer\":\"PHICOMM\"}}",
+                str_mac, str_mac, str_mac, str_mac);
         UserMqttSendTopic(topic_buf, send_buf, 1);
 
         sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionYesterday/config", str_mac);
-                        sprintf(send_buf,
-                                    "{\"name\":\"TC1_%s_powerConsumptionYesterday\","
-                                    "\"uniq_id\":\"%s_pc_yesterday\","
-                                    "\"state_topic\":\"homeassistant/sensor/%s/powerConsumptionYesterday/state\","
-                                    "\"unit_of_measurement\":\"kWh\","
-                                    "\"icon\":\"mdi:fence-electric\","
-                                    "\"value_template\":\"{{ value_json.powerConsumptionYesterday }}\"}",
-                                    str_mac+8, str_mac, str_mac);
+        sprintf(send_buf,
+                "{\"name\":\"昨日耗电量\","
+                "\"uniq_id\":\"%s_pc_yesterday\","
+                "\"state_topic\":\"homeassistant/sensor/%s/powerConsumptionYesterday/state\","
+                "\"unit_of_measurement\":\"kWh\","
+                "\"icon\":\"mdi:fence-electric\","
+                "\"value_template\":\"{{ value_json.powerConsumptionYesterday }}\",""\"device\":{"
+                "\"identifiers\":[\"tc1_%s\"],"
+                "\"name\":\"TC1_%s\","
+                "\"model\":\"TC1\","
+                "\"manufacturer\":\"PHICOMM\"}}",
+                str_mac, str_mac, str_mac, str_mac);
         UserMqttSendTopic(topic_buf, send_buf, 1);
     }
     if (send_buf) free(send_buf);
     if (topic_buf) free(topic_buf);
 }
 
-char topic_buf[128] = { 0 };
-char send_buf[128] = { 0 };
-void UserMqttHassPower(void)
-{
+char topic_buf[128] = {0};
+char send_buf[128] = {0};
+
+void UserMqttHassPower(void) {
     sprintf(topic_buf, "homeassistant/sensor/%s/power/state", str_mac);
-    sprintf(send_buf, "{\"power\":\"%.3f\"}", real_time_power/10);
+    sprintf(send_buf, "{\"power\":\"%.3f\"}", real_time_power / 10);
     UserMqttSendTopic(topic_buf, send_buf, 0);
 
     sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumption/state", str_mac);
@@ -551,15 +670,24 @@ void UserMqttHassPower(void)
 
 //    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);
+    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);
 
     sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionYesterday/state", str_mac);
-    sprintf(send_buf, "{\"powerConsumptionYesterday\":\"%.3f\"}", (17.1 * ((user_config->p_count_1_day_ago-user_config->p_count_2_days_ago)<0?0:(user_config->p_count_1_day_ago-user_config->p_count_2_days_ago))) / 1000 / 36000);
+    sprintf(send_buf, "{\"powerConsumptionYesterday\":\"%.3f\"}", (17.1 *
+                                                                   ((user_config->p_count_1_day_ago -
+                                                                     user_config->p_count_2_days_ago) <
+                                                                    0 ? 0 : (
+                                                                            user_config->p_count_1_day_ago -
+                                                                            user_config->p_count_2_days_ago))) /
+                                                                  1000 / 36000);
     UserMqttSendTopic(topic_buf, send_buf, 0);
 }
 
-bool UserMqttIsConnect()
-{
+bool UserMqttIsConnect() {
     return isconnect;
 }

TC1/mqtt_server/user_mqtt_client.h

@@ -29,10 +29,20 @@ extern bool UserMqttIsConnect(void);
 
 extern OSStatus UserMqttSendSocketState(char socket_id);
 
+extern OSStatus UserMqttSendLedState(void);
+
+extern OSStatus UserMqttSendTotalSocketState(void);
+
 extern void UserMqttHassAuto(char socket_id);
 
 extern void UserMqttHassPower(void);
 
 extern void UserMqttHassAutoPower(void);
 
+extern void UserMqttHassAutoLed(void);
+
+extern void UserMqttHassAutoTotalSocket(void);
+
+extern void registerMqttEvents(void);
+
 #endif

TC1/user_gpio.c

@@ -57,6 +57,7 @@ void SetSocketStatus(char* socket_status)
         UserRelaySet(i, user_config->socket_status[i]);
         UserMqttSendSocketState(i);
     }
+    UserMqttSendTotalSocketState();
     mico_system_context_update(sys_config);
 }
 
@@ -102,19 +103,20 @@ void UserRelaySetAll(char y)
         UserRelaySet(i, y);
 }
 
-static void KeyLongPress(void)
+static void KeyLong5sPress(void)
 {
-//  key_log("KeyLongPress");
-//  UserLedSet(1);
-//  UserMqttSend("mqtt test");
+    key_log("WARNGIN: wifi ap started!");
+    sys_config->micoSystemConfig.ssid[0] = 0;
+    mico_system_context_update(mico_system_context_get());
 }
 
 static void KeyLong10sPress(void)
 {
     key_log("WARNGIN: user params restored!");
-    appRestoreDefault_callback(user_config, sizeof(user_config_t));
-    sys_config->micoSystemConfig.ssid[0] = 0;
-    mico_system_context_update(mico_system_context_get());
+    mico_system_context_restore(sys_config);
+//    appRestoreDefault_callback(user_config, sizeof(user_config_t));
+//    sys_config->micoSystemConfig.ssid[0] = 0;
+//    mico_system_context_update(mico_system_context_get());
 }
 static void KeyShortPress(void)
 {
@@ -133,6 +135,7 @@ static void KeyShortPress(void)
     {
         UserMqttSendSocketState(i);
     }
+    UserMqttSendTotalSocketState();
 }
 mico_timer_t user_key_timer;
 uint16_t key_time = 0;
@@ -150,13 +153,13 @@ static void KeyTimeoutHandler(void* arg)
     {
         //any button pressed
         key_time++;
-        if (key_time <= BUTTON_LONG_PRESS_TIME)
+        if (key_time > BUTTON_LONG_PRESS_TIME)
         {
             key_log("button long pressed:%d",key_time);
 
-            if (key_time == 30)
+            if (key_time == 50)
             {
-                KeyLongPress();
+                KeyLong5sPress();
             }
             else if (key_time == 100)
             {

TC1/user_power.c

@@ -7,26 +7,23 @@
 #include "user_power.h"
 
 uint32_t p_count = 0;
-PowerRecord power_record = { 1,{ 0 } };
-char power_record_str[1101] = { 0 };
+PowerRecord power_record = {1, {0}};
+char power_record_str[1101] = {0};
 float real_time_power = 0;
 
-void SetPowerRecord(PowerRecord* pr, uint32_t pw)
-{
-    pr->powers[(++pr->idx)% PW_NUM] = pw;
+void SetPowerRecord(PowerRecord *pr, uint32_t pw) {
+    pr->powers[(++pr->idx) % PW_NUM] = pw;
 }
 
-char* GetPowerRecord(int idx)
-{
+char *GetPowerRecord(int idx) {
     if (idx > power_record.idx) return "";
     idx = idx <= power_record.idx - PW_NUM ? 0 : idx;
 
     int i = idx > 0 ? idx : (power_record.idx - PW_NUM + 1);
     i = i < 0 ? 0 : i;
-    char* tmp = power_record_str;
-    for (; i <= power_record.idx; i++)
-    {
-        sprintf(tmp, "%lu,", power_record.powers[i%PW_NUM]);
+    char *tmp = power_record_str;
+    for (; i <= power_record.idx; i++) {
+        sprintf(tmp, "%lu,", power_record.powers[i % PW_NUM]);
         tmp += strlen(tmp);
     }
     *(--tmp) = 0;
@@ -38,9 +35,11 @@ float n_1s = 0;       //在当前这一秒功率中断次数
 uint64_t past_ns = 0; //系统运行的纳秒数
 uint64_t irq_old = 0; //上次中断的时间(纳秒)
 
-static void PowerIrqHandler(void* arg)
-{
+static void PowerIrqHandler(void *arg) {
     //警告! 不能在此函数里调用任何有关moloc()的操作
+    if (p_count == 0) {
+        p_count = user_config->p_count_1_day_ago;
+    }
 
     p_count++;
 
@@ -48,30 +47,27 @@ static void PowerIrqHandler(void* arg)
     past_ns = mico_nanosecond_clock_value(); //系统运行纳秒数
     uint64_t spend_ns = past_ns - irq_old;
 
-    if (irq_old % NS + spend_ns <= NS)
-    {
+    if (irq_old % NS + spend_ns <= NS) {
         n_1s += 1;
         irq_old = past_ns;
         return;
     }
 
     int n = (spend_ns - past_ns % NS) / NS;
-    n_1s += (float)(NS - irq_old % NS) / spend_ns;
+    n_1s += (float) (NS - irq_old % NS) / spend_ns;
     real_time_power = 17.1 * n_1s;
-    SetPowerRecord(&power_record, (int)real_time_power);
+    SetPowerRecord(&power_record, (int) real_time_power);
 
     int i = 0;
-    for (; i < n; i++)
-    {
+    for (; i < n; i++) {
         real_time_power = 17.1 * NS / spend_ns;
-        SetPowerRecord(&power_record, (int)real_time_power);
+        SetPowerRecord(&power_record, (int) real_time_power);
     }
     irq_old = past_ns;
-    n_1s = (float)(past_ns % NS) / spend_ns;
+    n_1s = (float) (past_ns % NS) / spend_ns;
 }
 
-void PowerInit(void)
-{
+void PowerInit(void) {
     power_log("PowerInit");
     MicoGpioInitialize(POWER, INPUT_PULL_UP);
     MicoGpioEnableIRQ(POWER, IRQ_TRIGGER_FALLING_EDGE, PowerIrqHandler, NULL);