修复自定义按键功能的问题，修复后台UI的问题

Update user_gpio.c
Update build.sh
2026-03-24 04:59:50 +08:00 · 2025-03-20 22:41:37 +08:00 · 2025-03-20 21:27:09 +08:00 · 2025-03-20 19:42:58 +08:00 · 2025-03-20 18:11:30 +08:00 · 2025-03-20 16:04:38 +08:00
23 changed files with 1761 additions and 1032 deletions
--- a/.cproject
+++ b/.cproject
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="0.2123886510">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.2123886510" moduleId="org.eclipse.cdt.core.settings" name="Default">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.2123886510" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+					<folderInfo id="0.2123886510." name="/" resourcePath="">
+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1020810961" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1020810961.1245561758" name=""/>
+							<builder buildPath="${ProjDirPath}/" command="${ProjDirPath}/make.exe" id="org.eclipse.cdt.build.core.settings.default.builder.1574076724" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1419411456" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.1269034716" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2077730760" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.416463984" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1802293645" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.545607982" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1775218918" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+			<storageModule moduleId="ilg.gnuarmeclipse.managedbuild.packs"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="MiCO-3-0.null.804040427" name="MiCO-3-0"/>
+	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="0.2123886510">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="0.1826818492">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Default">
+			<resource resourceType="PROJECT" workspacePath="/MiCO-3-0"/>
+		</configuration>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+		<buildTargets>
+			<target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildTarget>clean</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="helloworld@MK3165 total download" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>${ProjDirPath}/make.exe</buildCommand>
+				<buildArguments/>
+				<buildTarget>helloworld@MK3165 total download</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="helloworld@MK3165" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>${ProjDirPath}/make</buildCommand>
+				<buildArguments/>
+				<buildTarget>helloworld@MK3165</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="standard release" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>${ProjDirPath}/make.exe</buildCommand>
+				<buildTarget>standard release</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="helloworld@MK3165 total" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>${ProjDirPath}/make.exe</buildCommand>
+				<buildArguments/>
+				<buildTarget>helloworld@MK3165 total</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="bluetooth.ble_hello_sensor@MK3238" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>${ProjDirPath}/make.exe</buildCommand>
+				<buildArguments/>
+				<buildTarget>bluetooth.ble_hello_sensor@MK3238</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="bluetooth.ble_hello_sensor@MK3238 total" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>${ProjDirPath}/make.exe</buildCommand>
+				<buildArguments/>
+				<buildTarget>bluetooth.ble_hello_sensor@MK3238 total</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="bluetooth.ble_hello_sensor@MK3238 total download" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>${ProjDirPath}/make.exe</buildCommand>
+				<buildArguments/>
+				<buildTarget>bluetooth.ble_hello_sensor@MK3238 total download</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+		</buildTargets>
+	</storageModule>
+</cproject>
--- a/.gdbinit
+++ b/.gdbinit
@@ -0,0 +1,2 @@
+set remotetimeout 20 
+shell start /B C:\Users\ooo\Desktop\MiCoder/OpenOCD/Win32/openocd_mico.exe -s ./ -f ./mico-os/makefiles/OpenOCD/interface/jlink_swd.cfg -f ./mico-os/makefiles/OpenOCD/mw3xx/mw3xx.cfg -f ./mico-os/makefiles/OpenOCD/mw3xx/mw3xx_gdb_jtag.cfg -l ./build/openocd_log.txt 
--- a/.openocd_cfg
+++ b/.openocd_cfg
@@ -0,0 +1,3 @@
+source [find C:\Users\ooo\Desktop\MiCoder/OpenOCD/jlink_swd.cfg] 
+source [find C:\Users\ooo\Desktop\MiCoder/OpenOCD/mw3xx.cfg] 
+source [find C:\Users\ooo\Desktop\MiCoder/OpenOCD/mw3xx_gdb_jtag.cfg] 
--- a/.project
+++ b/.project
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>zTC1</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>cleanfullincremental</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>fullincremental</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -0,0 +1,18 @@
+{
+  "configurations": [
+    {
+      "name": "windows-gcc-x64",
+      "includePath": [
+        "${workspaceFolder}/**"
+      ],
+      "compilerPath": "gcc",
+      "cStandard": "${default}",
+      "cppStandard": "${default}",
+      "intelliSenseMode": "windows-gcc-x64",
+      "compilerArgs": [
+        ""
+      ]
+    }
+  ],
+  "version": 4
+}
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -0,0 +1,24 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "C/C++ Runner: Debug Session",
+      "type": "cppdbg",
+      "request": "launch",
+      "args": [],
+      "stopAtEntry": false,
+      "externalConsole": true,
+      "cwd": "e:/15_GitHub/TC1/zTC1/TC1",
+      "program": "e:/15_GitHub/TC1/zTC1/TC1/build/Debug/outDebug",
+      "MIMode": "gdb",
+      "miDebuggerPath": "gdb",
+      "setupCommands": [
+        {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+        }
+      ]
+    }
+  ]
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -0,0 +1,59 @@
+{
+  "C_Cpp_Runner.cCompilerPath": "gcc",
+  "C_Cpp_Runner.cppCompilerPath": "g++",
+  "C_Cpp_Runner.debuggerPath": "gdb",
+  "C_Cpp_Runner.cStandard": "",
+  "C_Cpp_Runner.cppStandard": "",
+  "C_Cpp_Runner.msvcBatchPath": "C:/Program Files/Microsoft Visual Studio/VR_NR/Community/VC/Auxiliary/Build/vcvarsall.bat",
+  "C_Cpp_Runner.useMsvc": false,
+  "C_Cpp_Runner.warnings": [
+    "-Wall",
+    "-Wextra",
+    "-Wpedantic",
+    "-Wshadow",
+    "-Wformat=2",
+    "-Wcast-align",
+    "-Wconversion",
+    "-Wsign-conversion",
+    "-Wnull-dereference"
+  ],
+  "C_Cpp_Runner.msvcWarnings": [
+    "/W4",
+    "/permissive-",
+    "/w14242",
+    "/w14287",
+    "/w14296",
+    "/w14311",
+    "/w14826",
+    "/w44062",
+    "/w44242",
+    "/w14905",
+    "/w14906",
+    "/w14263",
+    "/w44265",
+    "/w14928"
+  ],
+  "C_Cpp_Runner.enableWarnings": true,
+  "C_Cpp_Runner.warningsAsError": false,
+  "C_Cpp_Runner.compilerArgs": [],
+  "C_Cpp_Runner.linkerArgs": [],
+  "C_Cpp_Runner.includePaths": [],
+  "C_Cpp_Runner.includeSearch": [
+    "*",
+    "**/*"
+  ],
+  "C_Cpp_Runner.excludeSearch": [
+    "**/build",
+    "**/build/**",
+    "**/.*",
+    "**/.*/**",
+    "**/.vscode",
+    "**/.vscode/**"
+  ],
+  "C_Cpp_Runner.useAddressSanitizer": false,
+  "C_Cpp_Runner.useUndefinedSanitizer": false,
+  "C_Cpp_Runner.useLeakSanitizer": false,
+  "C_Cpp_Runner.showCompilationTime": false,
+  "C_Cpp_Runner.useLinkTimeOptimization": false,
+  "C_Cpp_Runner.msvcSecureNoWarnings": false
+}
--- a/README.md
+++ b/README.md
@@ -54,6 +54,10 @@ TC1 排插硬件分 A1 A2 两个版本, 本固件仅支持 **A1 版本**. A1 A2
 - [x] 可以设置mqtt数据上报频率，默认2秒
 - [x] 可以设置电源 led 是否打开，默认打开（系统自检以及错误指示灯仍会工作）
 - [x] 后台和ha mqtt增加总开关控制
+- [x] 后台可以自定义6个插座的名称，名称将会自动同步到ha mqtt
+- [x] 修复了原代码中电源按钮长按 (现在是5秒)重新配网和(10秒)恢复出厂的逻辑错误 
+- [x] 后台和ha mqtt中增加了童锁开关，开启童锁则上电以后不再响应任何电源按钮的事件，上电时同时按住按钮的话会开启配网热点（防止开了童锁，wifi又嗝屁，导致插座功能暴毙的救命逻辑）
+- [x] 后台可自定义设备名称，此名称将会同至ha mqtt作为mqtt中插座名称的前缀

 # 编译固件

@@ -63,8 +67,10 @@ TC1 排插硬件分 A1 A2 两个版本, 本固件仅支持 **A1 版本**. A1 A2
 - 安装完成后添加micoder路径 mico config --global MICODER (micoder所在路径)/MiCoder
 - 最后切换到此项目根目录执行build.sh即可编译固件

-
-
+# 注意事项
+- 使用pip安装mico-cube失败，请使用下列命令安装（执行命令时注意路径位置）
+
+-  `python -m pip install mico-cube-1.0.0.tar.gz`



--- a/TC1/TC1.mk
+++ b/TC1/TC1.mk
@@ -19,7 +19,7 @@
 #  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 #  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR 
 #  IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-############################################################################### 
+###############################################################################


 NAME := App_TC1
--- a/TC1/http_server/app_httpd.c
+++ b/TC1/http_server/app_httpd.c
@@ -149,6 +149,7 @@ static int HttpGetAssets(httpd_request_t *req) {

 static int HttpGetTc1Status(httpd_request_t *req) {
    char *sockets = GetSocketStatus();
+    char *short_click_config = GetShortClickConfig();
    char *tc1_status = malloc(1024);
    char *socket_names = malloc(512);
    sprintf(socket_names, "%s,%s,%s,%s,%s,%s",
@@ -163,7 +164,8 @@ static int HttpGetTc1Status(httpd_request_t *req) {
            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,socket_names);
+            user_config->power_led_enabled, 0L, socket_names, childLockEnabled,
+            sys_config->micoSystemConfig.name, short_click_config);

    OSStatus err = kNoErr;
    send_http(tc1_status, strlen(tc1_status), exit, &err);
@@ -195,15 +197,15 @@ static int HttpSetSocketStatus(httpd_request_t *req) {
 static int HttpSetSocketName(httpd_request_t *req) {
    OSStatus err = kNoErr;

-    int buf_size = 512;
+    int buf_size = 70;
    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);
+    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);
@@ -213,6 +215,68 @@ static int HttpSetSocketName(httpd_request_t *req) {
    return err;
 }

+static int HttpSetShortClickEvent(httpd_request_t *req) {
+    OSStatus err = kNoErr;
+
+    int buf_size = 10;
+    char *buf = malloc(buf_size);
+
+    err = httpd_get_data(req, buf, buf_size);
+    require_noerr(err, exit);
+    int index;
+    int func;
+    sscanf(buf, "%d %d", &index, &func);
+    user_config->user[index + 1] = func;
+    mico_system_context_update(sys_config);
+
+    send_http("OK", 2, exit, &err);
+
+    exit:
+    if (buf) free(buf);
+    return err;
+}
+
+static int HttpSetDeviceName(httpd_request_t *req) {
+    OSStatus err = kNoErr;
+
+    int buf_size = 70;
+    char *buf = malloc(buf_size);
+
+    err = httpd_get_data(req, buf, buf_size);
+    require_noerr(err, exit);
+    char name[64];
+    sscanf(buf, "%s", name);
+    strcpy(sys_config->micoSystemConfig.name, name);
+    mico_system_context_update(sys_config);
+    registerMqttEvents();
+    send_http("OK", 2, exit, &err);
+
+    exit:
+    if (buf) free(buf);
+    return err;
+}
+
+static int HttpSetChildLock(httpd_request_t *req) {
+    OSStatus err = kNoErr;
+
+    int buf_size = 32;
+    char *buf = malloc(buf_size);
+
+    err = httpd_get_data(req, buf, buf_size);
+    require_noerr(err, exit);
+    int enableLock;
+    sscanf(buf, "%d", &enableLock);
+    user_config->user[0] = enableLock;
+    childLockEnabled = enableLock;
+    mico_system_context_update(sys_config);
+    UserMqttSendChildLockState();
+    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];
@@ -234,6 +298,7 @@ static int HttpGetPowerInfo(httpd_request_t *req) {

    char *powers = GetPowerRecord(idx);
    char *sockets = GetSocketStatus();
+    char *short_click_config = GetShortClickConfig();
    char *socket_names = malloc(512);
    sprintf(socket_names, "%s,%s,%s,%s,%s,%s",
            user_config->socket_names[0],
@@ -243,7 +308,9 @@ static int HttpGetPowerInfo(httpd_request_t *req) {
            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,RelayOut()?1:0,socket_names);
+            up_time, user_config->power_led_enabled, RelayOut() ? 1 : 0, socket_names,
+            user_config->p_count_1_day_ago, user_config->p_count_2_days_ago, childLockEnabled,
+            sys_config->micoSystemConfig.name, short_click_config);
    send_http(power_info_json, strlen(power_info_json), exit, &err);
    if (socket_names) free(socket_names);
    exit:
@@ -367,7 +434,7 @@ static int HttpGetMqttReportFreq(httpd_request_t *req) {
    send_http(freq, strlen(freq), exit, &err);

    exit:
-    if(freq) free(freq);
+    if (freq) free(freq);
    return err;
 }

@@ -390,6 +457,16 @@ static int HttpGetTasks(httpd_request_t *req) {
    return err;
 }

+static int HttpGetShortClickEvents(httpd_request_t *req) {
+    OSStatus err = kNoErr;
+    char *clicks = GetShortClickConfig();
+    send_http(clicks, strlen(clicks), exit, &err);
+
+    exit:
+    if (clicks) free(clicks);
+    return err;
+}
+
 static int HttpAddTask(httpd_request_t *req) {
    OSStatus err = kNoErr;

@@ -418,7 +495,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);
+    if (mess) free(mess);
    exit:
    return err;
 }
@@ -438,7 +515,7 @@ static int HttpDelTask(httpd_request_t *req) {

    send_http(mess, strlen(mess), exit, &err);
    exit:
-    if(time_str) free(time_str);
+    if (time_str) free(time_str);
    return err;
 }

@@ -451,7 +528,7 @@ static int LedStatus(httpd_request_t *req) {
    send_http(led, strlen(led), exit, &err);

    exit:
-    if(led) free(led);
+    if (led) free(led);
    return err;
 }

@@ -480,7 +557,7 @@ static int LedSetEnabled(httpd_request_t *req) {
    return err;
 }

-static int TotalSocketSetEnabled(httpd_request_t *req){
+static int TotalSocketSetEnabled(httpd_request_t *req) {
    OSStatus err = kNoErr;

    int buf_size = 97;
@@ -544,8 +621,11 @@ 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},
+        {"/socketAll",        HTTPD_HDR_DEFORT, 0, NULL,                                              TotalSocketSetEnabled, NULL, NULL},
+        {"/socketNames",      HTTPD_HDR_DEFORT, 0, NULL,                                              HttpSetSocketName,     NULL, NULL},
+        {"/childLock",        HTTPD_HDR_DEFORT, 0, NULL,                                              HttpSetChildLock,      NULL, NULL},
+        {"/deviceName",       HTTPD_HDR_DEFORT, 0, NULL,                                              HttpSetDeviceName,     NULL, NULL},
+        {"/shortClickEvent",      HTTPD_HDR_DEFORT, 0, HttpGetShortClickEvents,                                              HttpSetShortClickEvent,     NULL, NULL},
 };

 static int g_app_handlers_no = sizeof(g_app_handlers) / sizeof(struct httpd_wsgi_call);
--- a/TC1/http_server/app_httpd.h
+++ b/TC1/http_server/app_httpd.h
@@ -65,10 +65,13 @@
 	'reportFreq':'%d',\
    'ledEnabled':%d,\
    'up_time':%ld,\
-    'socketNames':'%s'\
+    'socketNames':'%s',\
+    'child_lock_enabled':%d,\
+    'deviceName':'%s',\
+    'shortClicks':'%s'\
 }"

-#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'}"
+#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','p_count_1_day_ago':%d,'p_count_2_days_ago':%d,'child_lock_enabled':%d,'deviceName':'%s','shortClicks':'%s'}"

 int AppHttpdStart(void);

--- a/TC1/http_server/web/index.html
+++ b/TC1/http_server/web/index.html
@@ -20,27 +20,39 @@
    <meta name="msapplication-TileColor" content="#3372DF">
    <link rel="shortcut icon" href="http://yuntong.icu/tc1/images/favicon.png">
    <link rel="stylesheet" href="assets/css_pack.css">
+    <style>
+        .mdl-menu {
+         z-index: 9999 !important;
+        }
+    </style>
 </head>
 <body>
 <div class="demo-layout mdl-layout mdl-js-layout mdl-layout--fixed-drawer mdl-layout--fixed-header">
    <header class="demo-header mdl-layout__header">
        <div class="mdl-layout__header-row">
-            <span class="mdl-layout-title">TC1智能插座</span>
-            <div class="mdl-layout-spacer"></div>
-            <button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon"
-                    id="hdrbtn">
+            <button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon edit-device-name">
                <i class="material-icons">
                    <svg>
-                        <use xlink:href="#icon-translate"/>
+                        <use xlink:href="#icon-edit"/>
                    </svg>
                </i>
            </button>
-            <ul class="mdl-menu mdl-js-menu mdl-js-ripple-effect mdl-menu--bottom-right"
-                for="hdrbtn">
-                <li class="mdl-menu__item" onclick="ChangeLanguage('en')">English</li>
-                <li class="mdl-menu__item" onclick="ChangeLanguage('cn')">中文</li>
-                <li class="mdl-menu__item" onclick="ChangeLanguage('jp')">日本語</li>
-            </ul>
+            <span class="mdl-layout-title">TC1智能插座</span>
+            <div class="mdl-layout-spacer"></div>
+<!--            <button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button&#45;&#45;icon"-->
+<!--                    id="hdrbtn">-->
+<!--                <i class="material-icons">-->
+<!--                    <svg>-->
+<!--                        <use xlink:href="#icon-translate"/>-->
+<!--                    </svg>-->
+<!--                </i>-->
+<!--            </button>-->
+<!--            <ul class="mdl-menu mdl-js-menu mdl-js-ripple-effect mdl-menu&#45;&#45;bottom-right"-->
+<!--                for="hdrbtn">-->
+<!--                <li class="mdl-menu__item" onclick="ChangeLanguage('en')">English</li>-->
+<!--                <li class="mdl-menu__item" onclick="ChangeLanguage('cn')">中文</li>-->
+<!--                <li class="mdl-menu__item" onclick="ChangeLanguage('jp')">日本語</li>-->
+<!--            </ul>-->
            <button onclick="reboot()"
                    class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon"
                    id="rebootbtn">
@@ -108,20 +120,27 @@
        <div class="mdl-grid demo-content">


-            <div class="page page1 demo-cards mdl-cell mdl-cell--4-col mdl-cell--8-col-tablet mdl-grid mdl-grid--no-spacing">
-                <div class="demo-options mdl-card mdl-shadow--2dp mdl-cell mdl-cell--4-col mdl-cell--3-col-tablet mdl-cell--12-col-desktop">
-                    <div class="mdl-card__supporting-text">

-                        <h3>插座控制</h3>
-                        <!--
-                        <span class="mdl-list__item-secondary-action">
-                          <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="list-switch-0">
-                            <input type="checkbox" id="list-switch-0" class="mdl-switch__input" checked />
-                          </label>
-                        </span>
-                        -->
+            <div class="page page1 mdl-cell mdl-cell--5-col demo-card-square mdl-card mdl-shadow--2dp"
+                 style="overflow: unset;">
+
+                        <div class="mdl-card__title mdl-card--expand">
+                            <h2 class="mdl-card__title-text">插座控制</h2>
+                        </div>
                        <ul id="socket_ul" class="demo-list-control mdl-list">
                            <li class="mdl-list__item">
+                    <span class="mdl-list__item-primary-content">
+                      <span class="lang" langKey="ChildLock">启用童锁</span>
+                    </span>
+                                <span class="mdl-list__item-secondary-action">
+                      <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"
+                             for="list-switch-child-lock">
+                        <input type="checkbox" id="list-switch-child-lock" class="mdl-switch__input"
+                               checked/>
+                      </label>
+                    </span>
+                            </li>
+                            <li class="mdl-list__item">
                    <span class="mdl-list__item-primary-content">
                      <span class="lang" langKey="Led">电源指示灯</span>
                    </span>
@@ -262,21 +281,42 @@
                        </ul>

                    </div>
+
+            <div class="page page1 mdl-cell mdl-cell--5-col demo-card-square mdl-card mdl-shadow--2dp"
+                 style="overflow: unset;">
+                <div class="mdl-card__title mdl-card--expand">
+                    <h2 class="mdl-card__title-text">功率图</h2>
+                </div>
+
+                <div id="ct-chart-par"
+                     class="page page1 mdl-card__supporting-text mdl-shadow--2dp mdl-cell mdl-cell--6-col"
+                     style="height:315px;overflow-x:scroll;overflow-y:hidden;">
+                    <table class="pw">
+                        <tr>
+                            <td>当前功率: <span id="p" class="success">0</span> W</td>
+                            <td>今日电量: <span id="w_t" class="error">0</span> kW·h</td>
+                            <td>昨日电量: <span id="w_y" class="error">0</span> kW·h</td>
+                            <td>总电量: <span id="w" class="error">0</span> kW·h</td>
+                        </tr>
+                    </table>
+                    <div id="ct-chart" class="ct-chart ct-perfect-fourth"
+                         style="height:280px;margin-top:40px;"></div>
                </div>
            </div>

-            <div id="ct-chart-par"
-                 class="page page1 mdl-card__supporting-text mdl-shadow--2dp mdl-cell mdl-cell--6-col"
-                 style="height:315px;overflow-x:scroll;overflow-y:hidden;">
-                <table class="pw">
-                    <tr>
-                        <td>P: <span id="p" class="success">0</span> W</td>
-                        <td>W: <span id="w" class="error">0</span> kW·h</td>
-                    </tr>
-                </table>
-                <div id="ct-chart" class="ct-chart ct-perfect-fourth"
-                     style="height:280px;margin-top:20px;"></div>
-            </div>
+            <div class="page page1 mdl-cell mdl-cell--5-col demo-card-square mdl-card mdl-shadow--2dp"
+                 style="overflow: unset;">
+                        <div class="mdl-card__title mdl-card--expand">
+                            <h2 class="mdl-card__title-text">按键自定义</h2>
+                        </div>
+                        <table id="short_click_events_tb" class="mdl-data-table mdl-js-data-table">
+                            <tr>
+                                <th>按键类型</th>
+                                <th>执行操作</th>
+                            </tr>
+                        </table>
+
+                </div>

            <div class="page page2 mdl-cell mdl-cell--5-col demo-card-square mdl-card mdl-shadow--2dp"
                 style="overflow: unset;">
@@ -518,8 +558,8 @@
                        <td id="uptime">10:13:43</td>
                    </tr>
                </table>
-                <div class="mdl-card__actions mdl-card--border">
-                    <span>提示：长按电源按钮5s可开启热点重新配网，10s恢复出厂设置</span>
+                <div class="mdl-card__actions mdl-card--border" style="display: flex; align-items: center; flex-wrap: wrap;">
+                    <span style="font-size:0.8em;">提示：长按电源按钮5s，指示灯闪烁3次可开启热点重新配网，10s指示灯保持闪烁恢复出厂设置</span>
                    <div class="mdl-layout-spacer"></div>
                    <i class="material-icons">
                        <svg>
@@ -694,7 +734,8 @@
      //主页
      Socket: {en: "Socket", cn: "插座"},
      Led:{en: "PowerLed", cn: "电源指示灯"},
-      SocketAll:{en: "Total switch", cn: "总开关"}
+      SocketAll:{en: "Total Switch", cn: "总开关"},
+      ChildLock:{en: "Child Lock", cn: "童锁"}
    }
    function ChangeLanguage(lang) {
      if (lang == "jp") {
@@ -775,45 +816,6 @@
    var mqtt_pwd;
    var mqtt_freq;

-    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+2].MaterialSwitch.on();
-          } else {
-            switch_lables[i+2].MaterialSwitch.off();
-          }
-        }
-
-      if(status.mode == 1) {
-        $("#custom_station").click();
-        info_station_name = status.station_ssid;
-        info_wifi_password = status.station_pwd;
-      } else {
-        $("#custom_ap").click();
-        $("#custom_ssid")[0].parentElement.MaterialTextfield.change(status.ap_ssid);
-        info_wifi_password = status.ap_pwd;
-      }
-
-      mqtt_addr = status.mqtt_addr;
-      mqtt_port = status.mqtt_port;
-      mqtt_usr = status.mqtt_usr;
-      mqtt_pwd = status.mqtt_pwd;
-      mqtt_freq = status.reportFreq;
-      $("#info_version").html(status.version);
-      $("#info_ip").html(status.ip);
-      $("#info_mask").html(status.mask);
-      $("#info_gateway").html(status.gateway);
-      $("#uptime").html(status.up_time);
-    });
    $("#st-date").html((new Date()).Format("yyyy-MM-dd"));

    //Menu-start
@@ -853,18 +855,106 @@
    var socket_ul = document.getElementById("socket_ul");
    var checkboxs = socket_ul.getElementsByClassName("mdl-switch__input");
    var switch_lables = socket_ul.getElementsByClassName("mdl-switch");
+
+
+    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');
+      $(".mdl-layout-title").text(status.deviceName);
+      document.title=status.deviceName;
+      for (var i = 0; i < status_arr.length; i++) {
+          var langSpan = switchTexts[i+3].querySelector('.lang');
+          var indexSpan = switchTexts[i+3].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+3].MaterialSwitch.on();
+          } else {
+            switch_lables[i+3].MaterialSwitch.off();
+          }
+        }
+
+      if(status.mode == 1) {
+        $("#custom_station").click();
+        info_station_name = status.station_ssid;
+        info_wifi_password = status.station_pwd;
+      } else {
+        $("#custom_ap").click();
+        $("#custom_ssid")[0].parentElement.MaterialTextfield.change(status.ap_ssid);
+        info_wifi_password = status.ap_pwd;
+      }
+
+      mqtt_addr = status.mqtt_addr;
+      mqtt_port = status.mqtt_port;
+      mqtt_usr = status.mqtt_usr;
+      mqtt_pwd = status.mqtt_pwd;
+      mqtt_freq = status.reportFreq;
+      $("#info_version").html(status.version);
+      $("#info_ip").html(status.ip);
+      $("#info_mask").html(status.mask);
+      $("#info_gateway").html(status.gateway);
+      $("#uptime").html(status.up_time);
+
+
+      var actions=status.shortClicks.split(",");
+    //按键操作功能定义
+    var BTN_OPERATIONS=["切换总开关"];
+    for (var i = 0; i < names_arr.length; i++) {
+      BTN_OPERATIONS.push(`切换${names_arr[i]}`);
+    }
+    BTN_OPERATIONS.push("切换电源指示灯启用");
+var tb_html = `
+  <tr>
+    <th>按键类型</th>
+    <th>执行操作</th>
+  </tr>
+`;
+
+
+for (var i = 0; i < actions.length; i++) {
+  var rowId = `select-${i}`;
+  var index = parseInt(actions[i]);
+  var valueText = (isNaN(index) || index < 0 || index >= BTN_OPERATIONS.length) ? '未设置' : BTN_OPERATIONS[index];
+
+  tb_html += `
+    <tr>
+      <td>${i > 0 ? '连续' : ''}短按${i + 1}次</td>
+      <td>
+        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label getmdl-select getmdl-select__fix-height">
+          <input class="mdl-textfield__input" type="text" id="${rowId}-input" readonly value="${valueText}">
+          <input type="hidden" id="${rowId}-value" value="${index}">
+          <ul class="mdl-menu mdl-menu--bottom-left mdl-js-menu" for="${rowId}-input">
+            <li class="mdl-menu__item" data-val="-1" onclick="selectOperation('${rowId}', -1,'${BTN_OPERATIONS[0]}')">未设置</li>
+            ${BTN_OPERATIONS.map((op, idx) =>
+              `<li class="mdl-menu__item" data-val="${idx}" onclick="selectOperation('${rowId}', ${idx},'${BTN_OPERATIONS[idx]}')">${op}</li>`
+            ).join('')}
+          </ul>
+        </div>
+      </td>
+    </tr>
+  `;
+}
+document.getElementById("short_click_events_tb").innerHTML = tb_html;
+componentHandler.upgradeDom();
+
+
+    });
+
    $(".mdl-switch__input").on("click", function() {
-    if("list-switch-all" == this.id){
+    if("list-switch-all" == this.id||"list-switch-child-lock"== this.id){
    return;
    }
      var sockets_st = "";
-      for (var i = 2; i < checkboxs.length; i++) {
+      for (var i = 3; 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");
+      }, checkboxs[1].checked ? "1" : "0");

    });

@@ -900,9 +990,35 @@
      }, index+' '+newName.trim());}
  });

+   $(".edit-device-name").on("click", function () {
+    var title = $(".mdl-layout-title");
+    // 原名称
+    var oldName = title.text().trim();
+
+    // 弹窗编辑
+    var newName = prompt("请输入新的设备名称", oldName);
+    if (newName && newName.trim() !== "") {
+    if(newName.trim().includes(" ")){
+    ShowToast("名称不能包含空格");
+    return;
+    }
+    if(newName.trim().length>16){
+     ShowToast("名称不能超过16个字");
+    return;
+    }
+      title.text(newName.trim());
+
+      HttpPost("/deviceName", function (re) {
+      }, newName.trim());}
+  });
+
    document.getElementById("list-switch-all").addEventListener("click", function() {
     HttpPost("/socketAll", function (re) {
-      }, checkboxs[1].checked ? "1" : "0");});
+      }, checkboxs[2].checked ? "1" : "0");});
+
+          document.getElementById("list-switch-child-lock").addEventListener("click", function() {
+     HttpPost("/childLock", function (re) {
+      }, checkboxs[0].checked ? "1" : "0");});

    //Socket-end

@@ -1028,6 +1144,9 @@
    var chart_wth = 0;
    var p = document.getElementById("p");
    var w = document.getElementById("w");
+    var w_t = document.getElementById("w_t");
+    var w_y = document.getElementById("w_y");
+
    function GetPowerRecord() {
      HttpPost("/power", function (re) {
        re = re.replace(/'/g, '"');
@@ -1053,33 +1172,45 @@
        $("#uptime").html(power.up_time);

        var w_v = (17.1 * power.p_count) / 1000 / 36000;
-        w.innerHTML = w_v.toFixed(2);
-    if (power.led_enabled == 1) {
+        w.innerHTML = w_v.toFixed(3);
+        var w_v_t = (17.1 * (power.p_count - power.p_count_1_day_ago)) / 1000 / 36000;
+        w_v_t = w_v_t < 0 ? 0 : w_v_t;
+        w_t.innerHTML = w_v_t.toFixed(3);
+        var w_v_y = (17.1 * (power.p_count_1_day_ago - power.p_count_2_days_ago)) / 1000 / 36000;
+        w_v_y = w_v_y < 0 ? 0 : w_v_y;
+        w_y.innerHTML = w_v_y.toFixed(3);
+        if (power.child_lock_enabled == 1) {
            switch_lables[0].MaterialSwitch.on();
          } else {
            switch_lables[0].MaterialSwitch.off();
          }
-              if (power.total_switch_on == 1) {
+    if (power.led_enabled == 1) {
            switch_lables[1].MaterialSwitch.on();
          } else {
            switch_lables[1].MaterialSwitch.off();
+          }
+              if (power.total_switch_on == 1) {
+            switch_lables[2].MaterialSwitch.on();
+          } else {
+            switch_lables[2].MaterialSwitch.off();
          }
        var status_arr = power.sockets.split(",");
        var names_arr = power.socketNames.split(",");
-        var switchTexts = document.querySelectorAll('.mdl-list__item-primary-content');    
+        var switchTexts = document.querySelectorAll('.mdl-list__item-primary-content');
+        $(".mdl-layout-title").text(power.deviceName);
+        document.title=power.deviceName;
        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');
+          var langSpan = switchTexts[i+3].querySelector('.lang');
+          var indexSpan = switchTexts[i+3].querySelector('.socket-index');
          if (langSpan) langSpan.textContent = names_arr[i];   // 修改插座名称
          if (indexSpan) indexSpan.textContent = ""; // 修改序号，可自定义起始数字
          if (status_arr[i] == "1") {
-            switch_lables[i+2].MaterialSwitch.on();
+            switch_lables[i+3].MaterialSwitch.on();
          } else {
-            switch_lables[i+2].MaterialSwitch.off();
+            switch_lables[i+3].MaterialSwitch.off();
          }
        }
-
        window.setTimeout(GetPowerRecord, 3000);
      }, power_idx.toString());
    }
@@ -1156,6 +1287,20 @@
        GetTimedTask();
      }, cmd);
    }
+function selectOperation(rowId, index, operationText) {
+var witch = parseInt(rowId.split('-')[1]);
+if (index === -1) {
+    document.getElementById(`${rowId}-input`).value = '未设置';
+    document.getElementById(`${rowId}-value`).value = -1;
+  } else {
+  document.getElementById(`${rowId}-input`).value = operationText;
+  document.getElementById(`${rowId}-value`).value = index;
+  }
+HttpPost("/shortClickEvent", function (re) {
+        ShowToast("已设置按钮事件");
+      }, `${witch} ${index}`);
+}
+
    function DelTimedTask(timestamp) {
      HttpDel("/task/"+timestamp, function (re) {
        ShowToast("Delete timed task OK!");
@@ -1167,6 +1312,9 @@
    //OTA-start
    function OtaStart() {
      var ota_url = document.getElementById("ota_url").value;
+      var protocol = window.location.protocol;
+      var baseUrl = protocol+"//"+window.location.host;
+
      HttpPost("/ota", function (re) {
        OtaStatus();
      }, ota_url);
@@ -1176,6 +1324,9 @@
      this.MaterialProgress.setProgress(0);
    });
    function OtaStatus() {
+      var protocol = window.location.protocol;
+      var baseUrl = protocol+"//"+window.location.host;
+
      HttpGet("/ota", function (re) {
        var percent = parseInt(re);
        //console.log(re + " " + parseInt(re));
--- a/TC1/http_server/web_data.c
+++ b/TC1/http_server/web_data.c
--- a/TC1/main.c
+++ b/TC1/main.c
@@ -18,6 +18,7 @@ char rtc_init = 0; //sntp校时成功标志位
 uint32_t total_time = 0;
 char str_mac[16] = {0};
 int last_check_day = 0;
+int childLockEnabled = 0;

 system_config_t *sys_config;
 user_config_t *user_config;
@@ -33,6 +34,7 @@ void appRestoreDefault_callback(void *const user_config_data, uint32_t size) {

    user_config_t *userConfigDefault = user_config_data;
    userConfigDefault->user[0] = 0;
+    userConfigDefault->user[1] = SWITCH_TOTAL_SOCKET;
    userConfigDefault->mqtt_ip[0] = 0;
    userConfigDefault->mqtt_port = 0;
    userConfigDefault->mqtt_user[0] = 0;
@@ -44,11 +46,14 @@ void appRestoreDefault_callback(void *const user_config_data, uint32_t size) {
    userConfigDefault->p_count_1_day_ago = 0;
    userConfigDefault->power_led_enabled = 1;
    userConfigDefault->version = USER_CONFIG_VERSION;
+    for (int i = 2; i < 11; ++i){
+        userConfigDefault->user[i] = -1;
+    }

    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);
+        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;
@@ -58,15 +63,17 @@ void appRestoreDefault_callback(void *const user_config_data, uint32_t size) {

 void recordDailyPCount() {
    // 获取当前时间
-  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);
+    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);
+        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! ");
            // 记录数据
@@ -83,8 +90,8 @@ void recordDailyPCount() {
        } 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);
+    } 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);
    }
    // 更新上次检查时间
    last_check_day = current_time->tm_mday;
@@ -134,7 +141,7 @@ int application_start(void) {
    MicoGpioInitialize((mico_gpio_t) Button, INPUT_PULL_UP);
    if (!MicoGpioInputGet(Button)) {   //开机时按钮状态
        tc1_log("press ap_init");
-        ApInit(false);
+        ApInit(true);
        open_ap = true;
    }

@@ -145,6 +152,7 @@ int application_start(void) {
    }
    MicoSysLed(0);

+    childLockEnabled = (int) user_config->user[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);
@@ -154,7 +162,7 @@ int application_start(void) {
        sprintf(sys_config->micoSystemConfig.name, ZTC1_NAME, str_mac + 8);
    }

-    tc1_log("user:%s", user_config->user);tc1_log("device name:%s",
+    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(
--- a/TC1/main.h
+++ b/TC1/main.h
@@ -19,9 +19,9 @@
 #define VERSION "v2.1.6"

 #define TYPE 1
-#define TYPE_NAME "zTC1"
+#define TYPE_NAME "TC1"

-#define ZTC1_NAME "zTC1-%s"
+#define ZTC1_NAME "TC1-%s"

 #define USER_CONFIG_VERSION 9
 #define SETTING_MQTT_STRING_LENGTH_MAX 32 //必须4字节对齐。
@@ -35,6 +35,7 @@

 #define Relay_ON  1
 #define Relay_OFF 0
+#define Relay_TOGGLE -1

 #define Relay_0   MICO_GPIO_6
 #define Relay_1   MICO_GPIO_8
@@ -75,6 +76,7 @@ extern char str_mac[16];
 extern system_config_t* sys_config;
 extern user_config_t* user_config;
 extern mico_gpio_t Relay[Relay_NUM];
+extern int childLockEnabled;


 #endif
--- a/TC1/mqtt_server/user_mqtt_client.c
+++ b/TC1/mqtt_server/user_mqtt_client.c
@@ -76,6 +76,7 @@ void UserMqttTimerFunc(void *arg) {
            case 0:
                UserMqttHassAutoLed();
                UserMqttHassAutoTotalSocket();
+                UserMqttHassAutoChildLock();
                break;
            case 1:
            case 2:
@@ -175,6 +176,7 @@ static OSStatus MqttMsgPublish(Client *c, const char *topic, char qos, char reta
 }

 void registerMqttEvents(void) {
+    timer_status = 0;
    mico_start_timer(&timer_handle);
 }

@@ -263,6 +265,8 @@ void MqttClientThread(mico_thread_arg_t arg) {
    }

    UserMqttSendLedState();
+    UserMqttSendTotalSocketState();
+    UserMqttSendChildLockState();

    mico_init_timer(&timer_handle, 150, UserMqttTimerFunc, &arg);
    registerMqttEvents();
@@ -410,6 +414,14 @@ void ProcessHaCmd(char *cmd) {
            UserMqttSendSocketState(i);
        }
        UserMqttSendTotalSocketState();
+    }else if (strcmp(cmd, "set childLock") == ' ') {
+        int on;
+        sscanf(cmd, "set childLock %s %d", mac, &on);
+        if (strcmp(mac, str_mac)) return;mqtt_log("set childLock on[%d]", on);
+        user_config->user[0] = on;
+        childLockEnabled = on;
+        UserMqttSendChildLockState();
+        mico_system_context_update(sys_config);
    }
 }

@@ -498,6 +510,21 @@ OSStatus UserMqttSendLedState(void) {
    return oss_status;
 }

+OSStatus UserMqttSendChildLockState(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/childLock/state", str_mac);
+        sprintf(send_buf, "set childLock %s %d", str_mac, childLockEnabled);
+        oss_status = UserMqttSendTopic(topic_buf, send_buf, 1);
+    }
+    if (send_buf) free(send_buf);
+    if (topic_buf) free(topic_buf);
+
+    return oss_status;
+}
+
 //hass mqtt鑷姩鍙戠幇鏁版嵁寮<E5B581>鍏冲彂閫<E5BD82>
 void UserMqttHassAuto(char socket_id) {
    socket_id--;
@@ -509,19 +536,20 @@ void UserMqttHassAuto(char socket_id) {
        sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/config", str_mac, socket_id);
        sprintf(send_buf,
                "{\"name\":\"%s\","
-                "\"uniq_id\":\"%s_s%d\","
+                "\"uniq_id\":\"tc1_%s_s%d\","
+                "\"object_id\":\"tc1_%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\","
+                "\"name\":\"%s\","
                "\"model\":\"TC1\","
                "\"manufacturer\":\"PHICOMM\"}}",
-                user_config->socket_names[(int)socket_id], str_mac, socket_id, str_mac, socket_id,
+                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, socket_id, str_mac, str_mac);
+                socket_id, str_mac, socket_id, str_mac,sys_config->micoSystemConfig.name);
        UserMqttSendTopic(topic_buf, send_buf, 1);
    }
    if (send_buf)
@@ -539,17 +567,47 @@ void UserMqttHassAutoLed(void) {
        sprintf(topic_buf, "homeassistant/switch/%s/led/config", str_mac);
        sprintf(send_buf,
                "{\"name\":\"LED指示灯\","
-                "\"uniq_id\":\"%s_led\","
+                "\"uniq_id\":\"tc1_%s_led\","
+                "\"object_id\":\"tc1_%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\","
+                "\"name\":\"%s\","
                "\"model\":\"TC1\","
                "\"manufacturer\":\"PHICOMM\"}}",
-                str_mac, str_mac, str_mac, str_mac, str_mac, str_mac);
+                str_mac,str_mac,str_mac, str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
+        UserMqttSendTopic(topic_buf, send_buf, 1);
+    }
+    if (send_buf)
+        free(send_buf);
+    if (topic_buf)
+        free(topic_buf);
+}
+
+void UserMqttHassAutoChildLock(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/childLock/config", str_mac);
+        sprintf(send_buf,
+                "{\"name\":\"童锁\","
+                "\"uniq_id\":\"tc1_%s_child_lock\","
+                "\"object_id\":\"tc1_%s_child_lock\","
+                "\"stat_t\":\"homeassistant/switch/%s/childLock/state\","
+                "\"cmd_t\":\"device/ztc1/set\","
+                "\"pl_on\":\"set childLock %s 1\","
+                "\"pl_off\":\"set childLock %s 0\","
+                "\"device\":{"
+                "\"identifiers\":[\"tc1_%s\"],"
+                "\"name\":\"%s\","
+                "\"model\":\"TC1\","
+                "\"manufacturer\":\"PHICOMM\"}}",
+                str_mac,str_mac,str_mac, str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
        UserMqttSendTopic(topic_buf, send_buf, 1);
    }
    if (send_buf)
@@ -567,17 +625,18 @@ void UserMqttHassAutoTotalSocket(void) {
        sprintf(topic_buf, "homeassistant/switch/%s/total_socket/config", str_mac);
        sprintf(send_buf,
                "{\"name\":\"总开关\","
-                "\"uniq_id\":\"%s_total_socket\","
+                "\"uniq_id\":\"tc1_%s_total_socket\","
+                "\"object_id\":\"tc1_%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\","
+                "\"name\":\"%s\","
                "\"model\":\"TC1\","
                "\"manufacturer\":\"PHICOMM\"}}",
-                str_mac, str_mac, str_mac, str_mac, str_mac, str_mac);
+                str_mac, str_mac, str_mac, str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
        UserMqttSendTopic(topic_buf, send_buf, 1);
    }
    if (send_buf)
@@ -596,60 +655,64 @@ void UserMqttHassAutoPower(void) {
        sprintf(topic_buf, "homeassistant/sensor/%s/power/config", str_mac);
        sprintf(send_buf,
                "{\"name\":\"功率\","
-                "\"uniq_id\":\"%s_p\","
+                "\"uniq_id\":\"tc1_%s_p\","
+                "\"object_id\":\"tc1_%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\","
+                "\"name\":\"%s\","
                "\"model\":\"TC1\","
                "\"manufacturer\":\"PHICOMM\"}}",
-                str_mac, str_mac, str_mac, str_mac);
+                str_mac,str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
        UserMqttSendTopic(topic_buf, send_buf, 1);
        sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumption/config", str_mac);
        sprintf(send_buf,
                "{\"name\":\"总耗电量\","
-                "\"uniq_id\":\"%s_pc\","
+                "\"uniq_id\":\"tc1_%s_pc\","
+                "\"object_id\":\"tc1_%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\","
+                "\"name\":\"%s\","
                "\"model\":\"TC1\","
                "\"manufacturer\":\"PHICOMM\"}}",
-                str_mac, str_mac, str_mac, str_mac);
+                str_mac, str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
        UserMqttSendTopic(topic_buf, send_buf, 1);

        sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionToday/config", str_mac);
        sprintf(send_buf,
                "{\"name\":\"今日耗电量\","
-                "\"uniq_id\":\"%s_pc_today\","
+                "\"uniq_id\":\"tc1_%s_pc_today\","
+                "\"object_id\":\"tc1_%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\","
+                "\"name\":\"%s\","
                "\"model\":\"TC1\","
                "\"manufacturer\":\"PHICOMM\"}}",
-                str_mac, str_mac, str_mac, str_mac);
+                str_mac,str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
        UserMqttSendTopic(topic_buf, send_buf, 1);

        sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionYesterday/config", str_mac);
        sprintf(send_buf,
                "{\"name\":\"昨日耗电量\","
-                "\"uniq_id\":\"%s_pc_yesterday\","
+                "\"uniq_id\":\"tc1_%s_pc_yesterday\","
+                "\"object_id\":\"tc1_%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\","
+                "\"name\":\"%s\","
                "\"model\":\"TC1\","
                "\"manufacturer\":\"PHICOMM\"}}",
-                str_mac, str_mac, str_mac, str_mac);
+                str_mac,str_mac, str_mac, str_mac,sys_config->micoSystemConfig.name);
        UserMqttSendTopic(topic_buf, send_buf, 1);
    }
    if (send_buf) free(send_buf);
--- a/TC1/mqtt_server/user_mqtt_client.h
+++ b/TC1/mqtt_server/user_mqtt_client.h
@@ -31,6 +31,8 @@ extern OSStatus UserMqttSendSocketState(char socket_id);

 extern OSStatus UserMqttSendLedState(void);

+extern OSStatus UserMqttSendChildLockState(void);
+
 extern OSStatus UserMqttSendTotalSocketState(void);

 extern void UserMqttHassAuto(char socket_id);
@@ -41,6 +43,8 @@ extern void UserMqttHassAutoPower(void);

 extern void UserMqttHassAutoLed(void);

+extern void UserMqttHassAutoChildLock(void);
+
 extern void UserMqttHassAutoTotalSocket(void);

 extern void registerMqttEvents(void);
--- a/TC1/user_gpio.c
+++ b/TC1/user_gpio.c
@@ -2,13 +2,14 @@

 #include "main.h"
 #include "user_gpio.h"
+#include "user_wifi.h"
 #include "mqtt_server/user_mqtt_client.h"

-mico_gpio_t relay[Relay_NUM] = { Relay_0, Relay_1, Relay_2, Relay_3, Relay_4, Relay_5 };
-char socket_status[32] = { 0 };
+mico_gpio_t relay[Relay_NUM] = {Relay_0, Relay_1, Relay_2, Relay_3, Relay_4, Relay_5};
+char socket_status[32] = {0};
+char short_click_config[32] = {0};

-void UserLedSet(char x)
-{
+void UserLedSet(char x) {
    if (x == -1)
        MicoGpioOutputTrigger(Led);
    else if (x)
@@ -17,43 +18,52 @@ void UserLedSet(char x)
        MicoGpioOutputLow(Led);
 }

-bool RelayOut(void)
-{
+bool RelayOut(void) {
    int i;
-    for (i = 0; i < SOCKET_NUM; i++)
-    {
-        if (user_config->socket_status[i] != 0)
-        {
+    for (i = 0; i < SOCKET_NUM; i++) {
+        if (user_config->socket_status[i] != 0) {
            return true;
        }
    }
    return false;
 }

-char* GetSocketStatus()
-{
+char *GetSocketStatus() {
    sprintf(socket_status, "%d,%d,%d,%d,%d,%d",
-        user_config->socket_status[0],
-        user_config->socket_status[1],
-        user_config->socket_status[2],
-        user_config->socket_status[3],
-        user_config->socket_status[4],
-        user_config->socket_status[5]);
+            user_config->socket_status[0],
+            user_config->socket_status[1],
+            user_config->socket_status[2],
+            user_config->socket_status[3],
+            user_config->socket_status[4],
+            user_config->socket_status[5]);
    return socket_status;
 }

-void SetSocketStatus(char* socket_status)
-{
+char *GetShortClickConfig() {
+    sprintf(short_click_config, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
+            user_config->user[1],
+            user_config->user[2],
+            user_config->user[3],
+            user_config->user[4],
+            user_config->user[5],
+            user_config->user[6],
+            user_config->user[7],
+            user_config->user[8],
+            user_config->user[9],
+            user_config->user[10]);
+    return short_click_config;
+}
+
+void SetSocketStatus(char *socket_status) {
    sscanf(socket_status, "%d,%d,%d,%d,%d,%d,",
-        (int*)&user_config->socket_status[0],
-        (int*)&user_config->socket_status[1],
-        (int*)&user_config->socket_status[2],
-        (int*)&user_config->socket_status[3],
-        (int*)&user_config->socket_status[4],
-        (int*)&user_config->socket_status[5]);
+           (int *) &user_config->socket_status[0],
+           (int *) &user_config->socket_status[1],
+           (int *) &user_config->socket_status[2],
+           (int *) &user_config->socket_status[3],
+           (int *) &user_config->socket_status[4],
+           (int *) &user_config->socket_status[5]);
    int i = 0;
-    for (i = 0; i < SOCKET_NUM; i++)
-    {
+    for (i = 0; i < SOCKET_NUM; i++) {
        UserRelaySet(i, user_config->socket_status[i]);
        UserMqttSendSocketState(i);
    }
@@ -64,29 +74,27 @@ void SetSocketStatus(char* socket_status)
 /*UserRelaySet
 * 设置继电器开关
 *  i:编号 0-5
- * on:开关 0:关 1:开
+ * on:开关 0:关 1:开 -1:切换
 */
-void UserRelaySet(unsigned char i, unsigned char on)
-{
+void UserRelaySet(unsigned char i, char on) {
    if (i < 0 || i >= SOCKET_NUM) return;

-    if (on == Relay_ON)
-    {
+    if (on == Relay_ON) {
        MicoGpioOutputHigh(relay[i]);
-    }
-    else
-    {
+    } else if (on == Relay_OFF) {
        MicoGpioOutputLow(relay[i]);
+    } else if (on == Relay_TOGGLE) {
+    if(user_config->socket_status[i]==Relay_OFF){
+       MicoGpioOutputHigh(relay[i]);
+    }else{
+       MicoGpioOutputLow(relay[i]);
    }
+   }
+    user_config->socket_status[i] = on >= 0 ? on : (user_config->socket_status[i] == 0 ? 1 : 0);

-    user_config->socket_status[i] = on;
-
-    if (RelayOut()&&user_config->power_led_enabled)
-    {
+    if (RelayOut() && user_config->power_led_enabled) {
        UserLedSet(1);
-    }
-    else
-    {
+    } else {
        UserLedSet(0);
    }
 }
@@ -96,113 +104,150 @@ void UserRelaySet(unsigned char i, unsigned char on)
 * y: 0:全部关 1:全部开
 *
 */
-void UserRelaySetAll(char y)
-{
+void UserRelaySetAll(char y) {
    int i;
    for (i = 0; i < SOCKET_NUM; i++)
        UserRelaySet(i, y);
 }

-static void KeyLong5sPress(void)
-{
+static void KeyLong5sPress(void) {
    key_log("WARNGIN: wifi ap started!");
-    sys_config->micoSystemConfig.ssid[0] = 0;
-    mico_system_context_update(mico_system_context_get());
+    micoWlanSuspendStation();
+    ApInit(true);
 }

-static void KeyLong10sPress(void)
-{
+static void KeyLong10sPress(void) {
    key_log("WARNGIN: user params restored!");
    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)
-{
-    char i;

-    if (RelayOut())
-    {
-        UserRelaySetAll(0);
+static void KeyShortPress(int clickCnt) {
+    key_log("WARNGIN:Power key quick clicked %d time%s",clickCnt,clickCnt>1?"s":"");
+    if (clickCnt > 10||clickCnt <= 0)
+        return;
+    switch (user_config->user[clickCnt]) {
+        case SWITCH_TOTAL_SOCKET:
+        key_log("WARNGIN:SWITCH_TOTAL_SOCKET");
+            if (RelayOut()) {
+                UserRelaySetAll(0);
+            } else {
+                UserRelaySetAll(1);
+            }
+            mico_system_context_update(sys_config);
+            for (int i = 0; i < SOCKET_NUM; i++) {
+                UserMqttSendSocketState(i);
+            }
+            UserMqttSendTotalSocketState();
+            break;
+        case SWITCH_SOCKET_1:
+        case SWITCH_SOCKET_2:
+        case SWITCH_SOCKET_3:
+        case SWITCH_SOCKET_4:
+        case SWITCH_SOCKET_5:
+        case SWITCH_SOCKET_6:
+        key_log("WARNGIN:SWITCH_SOCKET%d %s",user_config->user[clickCnt] - 1,user_config->socket_names[user_config->user[clickCnt] - 1]);
+            UserRelaySet(user_config->user[clickCnt] - 1, Relay_TOGGLE);
+            UserMqttSendSocketState(user_config->user[clickCnt] - 1);
+            UserMqttSendTotalSocketState();
+            mico_system_context_update(sys_config);
+            break;
+        case SWITCH_LED_ENABLE:
+        key_log("WARNGIN:SWITCH_LED_ENABLE");
+            MQTT_LED_ENABLED = MQTT_LED_ENABLED == 0 ? 1 : 0;
+            if (RelayOut() && MQTT_LED_ENABLED) {
+                UserLedSet(1);
+            } else {
+                UserLedSet(0);
+            }
+            UserMqttSendLedState();
+            mico_system_context_update(sys_config);
+            break;
+        default:
+            break;
    }
-    else
-    {
-        UserRelaySetAll(1);
-    }
-
-    for (i = 0; i < SOCKET_NUM; i++)
-    {
-        UserMqttSendSocketState(i);
-    }
-    UserMqttSendTotalSocketState();
 }
+
 mico_timer_t user_key_timer;
+// 全局静态变量声明
+static uint8_t click_count = 0;
+static mico_timer_t click_end_timer;
 uint16_t key_time = 0;
 #define BUTTON_LONG_PRESS_TIME    10     //100ms*10=1s

-static void KeyTimeoutHandler(void* arg)
-{
+static void ClickEndTimeoutHandler(void *arg) {
+    if(click_count<=0){
+      click_count = 0;
+      return;
+    }
+    KeyShortPress(click_count);
+    click_count = 0;
+}
+
+static void KeyTimeoutHandler(void *arg) {
+    if (childLockEnabled)
+        return;
+
    static char key_trigger, key_continue;
-    //按键扫描程序
+    static uint8_t key_time = 0;
+
    char tmp = ~(0xfe | MicoGpioInputGet(Button));
    key_trigger = tmp & (tmp ^ key_continue);
    key_continue = tmp;
-    if (key_trigger != 0) key_time = 0; //新按键按下时,重新开始按键计时
-    if (key_continue != 0)
-    {
-        //any button pressed
-        key_time++;
-        if (key_time > BUTTON_LONG_PRESS_TIME)
-        {
-            key_log("button long pressed:%d",key_time);

-            if (key_time == 50)
-            {
+    if (key_trigger != 0)
+        key_time = 0;
+
+    if (key_continue != 0) {
+        key_time++;
+        if (key_time > BUTTON_LONG_PRESS_TIME) {
+            if (key_time == 50) {
                KeyLong5sPress();
-            }
-            else if (key_time == 100)
-            {
+            } else if (key_time > 50 && key_time < 57) {
+                switch (key_time) {
+                    case 51: UserLedSet(1); break;
+                    case 52: UserLedSet(0); break;
+                    case 53: UserLedSet(1); break;
+                    case 54: UserLedSet(0); break;
+                    case 55: UserLedSet(1); break;
+                    case 56: UserLedSet(0); break;
+                }
+            } else if (key_time == 57) {
+                UserLedSet(RelayOut() && user_config->power_led_enabled);
+            } else if (key_time == 100) {
                KeyLong10sPress();
-            }
-            else if (key_time == 102)
-            {
+            } else if (key_time == 102) {
                UserLedSet(1);
-            }
-            else if (key_time == 103)
-            {
+            } else if (key_time == 103) {
                UserLedSet(0);
                key_time = 101;
            }
        }
-    }
-    else
-    {
-        //button released
-        if (key_time < BUTTON_LONG_PRESS_TIME)
-        {   //100ms*10=1s 大于1s为长按
-            key_time = 0;
-            key_log("button short pressed:%d",key_time);
-            KeyShortPress();
-        }
-        else if (key_time > 100)
-        {
+    } else {
+        if (key_time < BUTTON_LONG_PRESS_TIME) {
+            click_count++;
+
+            // 重启 click_end_timer（300ms）
+            mico_rtos_stop_timer(&click_end_timer);
+            mico_rtos_start_timer(&click_end_timer);
+        } else if (key_time > 100) {
            MicoSystemReboot();
        }
+
        mico_rtos_stop_timer(&user_key_timer);
    }
 }

-static void KeyFallingIrqHandler(void* arg)
-{
+static void KeyFallingIrqHandler(void *arg) {
    mico_rtos_start_timer(&user_key_timer);
 }

-void KeyInit(void)
-{
+void KeyInit(void) {
    MicoGpioInitialize(Button, INPUT_PULL_UP);
    mico_rtos_init_timer(&user_key_timer, 100, KeyTimeoutHandler, NULL);
-
+    mico_rtos_init_timer(&click_end_timer, 400, ClickEndTimeoutHandler, NULL);
    MicoGpioEnableIRQ(Button, IRQ_TRIGGER_FALLING_EDGE, KeyFallingIrqHandler, NULL);

 }
--- a/TC1/user_gpio.h
+++ b/TC1/user_gpio.h
@@ -4,14 +4,24 @@
 #include "mico.h"
 #include "micokit_ext.h"

+#define SWITCH_TOTAL_SOCKET 0
+#define SWITCH_SOCKET_1 1
+#define SWITCH_SOCKET_2 2
+#define SWITCH_SOCKET_3 3
+#define SWITCH_SOCKET_4 4
+#define SWITCH_SOCKET_5 5
+#define SWITCH_SOCKET_6 6
+#define SWITCH_LED_ENABLE 7
+
 extern char socket_status[32];

 void UserLedSet(char x);
 void KeyInit(void);
-void UserRelaySet(unsigned char x,unsigned char y);
+void UserRelaySet(unsigned char x, char y);
 void UserRelaySetAll(char y);
 bool RelayOut(void);
 char* GetSocketStatus();
+char* GetShortClickConfig();
 void SetSocketStatus(char* socket_status);

 #endif
--- a/build.sh
+++ b/build.sh
@@ -1,11 +1,27 @@
-cd ./TC1/http_server
-
-python ./test.py > web_data.c
-
-cd ../..
-
-mico make clean
-
-mico make TC1@MK3031@moc total
-
-cp ./build/TC1\@MK3031\@moc/binary/TC1\@MK3031\@moc.ota.bin  ./build/TC1\@MK3031\@moc/binary/ota.bin
+version_file=".version"
+if [ ! -f $version_file ]; then echo "v1.0.0" > $version_file; fi
+
+# 读当前版本并自增
+ver=$(cat $version_file)
+major=$(echo $ver | cut -d. -f1 | sed 's/v//')
+minor=$(echo $ver | cut -d. -f2)
+patch=$(echo $ver | cut -d. -f3)
+patch=$((patch + 1))
+new_ver="v${major}.${minor}.${patch}"
+echo $new_ver > $version_file
+
+
+cd ./TC1/http_server
+
+python ./test.py > web_data.c
+
+cd ../..
+
+mico make TC1@MK3031@moc total
+
+cp ./build/TC1\@MK3031\@moc/binary/TC1\@MK3031\@moc.ota.bin ./build/TC1\@MK3031\@moc/binary/ota.bin
+
+cp ./build/TC1\@MK3031\@moc/binary/TC1\@MK3031\@moc.ota.bin ./build/TC1\@MK3031\@moc/binary/ota$(date +%Y%m%d%H%M%S).bin
+
+cp ./build/TC1\@MK3031\@moc/binary/TC1\@MK3031\@moc.all.bin ./build/TC1\@MK3031\@moc/binary/all$(date +%Y%m%d%H%M%S).bin
+
--- a/doc/IMG_0862.png
+++ b/doc/IMG_0862.png
--- a/doc/IMG_0863.png
+++ b/doc/IMG_0863.png
--- a/mico-os/.gitignore
+++ b/mico-os/.gitignore
@@ -0,0 +1,4 @@
+MiCoder/compiler
+Projects
+MiCoder
+tools_root
Author	SHA1	Message	Date
Your Name	84cf4bfc06	修复自定义按键功能的问题，修复后台UI的问题	2025-03-20 22:41:37 +08:00
oopuuu	542e5daf8a	Update user_gpio.c	2025-03-20 21:27:09 +08:00
oopuuu	ceb208813a	Update build.sh	2025-03-20 19:42:58 +08:00
nhkefus	fe4d037390	修复后台部分模块标题不显示的问题	2025-03-20 18:11:30 +08:00
nhkefus	8e083fe175	修改多击按钮的逻辑判断	2025-03-20 16:04:38 +08:00
nhkefus	9ac9e5e2f1	修复网页按钮配置功能UI错误	2025-03-20 15:14:20 +08:00
nhkefus	36d8330ee3	修复网页按钮配置功能UI错误	2025-03-20 14:56:08 +08:00
nhkefus	a51c7a8eb2	修复网页按钮配置功能UI错误	2025-03-20 14:44:47 +08:00
nhkefus	6ef875879f	修复网页按钮配置功能UI错误	2025-03-20 14:30:58 +08:00
nhkefus	2b2a77b5f5	修复网页按钮配置功能UI错误	2025-03-20 14:19:34 +08:00
nhkefus	787e57439e	修复网页按钮配置功能UI错误	2025-03-20 14:08:05 +08:00
nhkefus	fd157172e3	修复网页按钮配置功能UI错误	2025-03-20 14:07:07 +08:00
nhkefus	989fd0a1ed	修复网页按钮配置功能UI错误	2025-03-20 14:03:50 +08:00
oopuuu	a76afc6ccb	Merge pull request #1 from wsuow/master 新增Https的测试	2025-03-20 13:41:06 +08:00
nhkefus	23fcd56109	修复网页按钮配置功能逻辑错误	2025-03-20 13:36:39 +08:00
wsuow	a6bb74f906	Merge branch 'oopuuu:master' into master	2025-03-20 12:53:32 +08:00
nhkefus	fd5d190096	在后台增加 1到10击功能设置	2025-03-20 12:52:49 +08:00
wsuow	997eda3ef2	Merge branch 'oopuuu:master' into master	2025-03-20 12:50:51 +08:00
nhkefus	e4e0ca969e	在后台增加 1到10击功能设置	2025-03-20 12:49:42 +08:00
wsuow	4ea9df172b	Merge branch 'oopuuu:master' into master	2025-03-20 12:46:51 +08:00
nhkefus	d0a71fe216	在后台增加 1到10击功能设置	2025-03-20 12:46:19 +08:00
wsuow	c8dd3d513d	Merge branch 'oopuuu:master' into master	2025-03-20 12:34:01 +08:00
nhkefus	dd5b282c85	在后台增加 1到10击功能设置	2025-03-20 12:31:27 +08:00
nhkefus	8acef18406	在后台增加 1到10击功能设置	2025-03-20 12:24:46 +08:00
吴永福	13df06e546	撤销https关键字	2025-03-20 10:39:46 +08:00
wsuow	9df4b8358b	Merge branch 'oopuuu:master' into master	2025-03-20 10:37:17 +08:00
吴永福	bdfed87f1e	Merge branch 'master' of https://github.com/wsuow/zTC1	2025-03-20 10:22:12 +08:00
吴永福	7ea87ae4c9	增加https关键字	2025-03-20 10:21:32 +08:00
oopuuu	a87d894c4d	Update user_mqtt_client.c	2025-03-19 23:42:42 +08:00
wsuow	d7e695e37e	Merge branch 'oopuuu:master' into master	2025-03-19 22:48:28 +08:00
oopuuu	40bdb50a8d	Update README.md	2025-03-19 22:27:30 +08:00
Your Name	caffddfb43	后台支持设备重命名	2025-03-19 22:22:17 +08:00
oopuuu	11d3d50265	Update README.md	2025-03-19 18:29:08 +08:00
nhkefus	66d2863fa4	修改固件功能说明	2025-03-19 18:27:08 +08:00
吴永福	56395f62bc	修改生成ota年月日时分秒.bin和all年月日时分秒.bin	2025-03-19 17:20:45 +08:00
wsuow	0d5ba4a7d3	Merge branch 'oopuuu:master' into master	2025-03-19 16:49:34 +08:00
nhkefus	d925c7d805	修复长按5s开启配网模式的逻辑问题	2025-03-19 16:45:09 +08:00
wsuow	b40bb1a022	Merge branch 'oopuuu:master' into master	2025-03-19 15:36:52 +08:00
nhkefus	981c33e3ad	修复后台电量显示数据错误	2025-03-19 15:16:10 +08:00
wsuow	fc631ac9f5	Merge branch 'oopuuu:master' into master	2025-03-19 14:58:12 +08:00
nhkefus	840b0eb374	修复后台电量显示数据错误	2025-03-19 14:51:20 +08:00
wsuow	f2f63625cc	Merge branch 'oopuuu:master' into master	2025-03-19 14:36:17 +08:00
nhkefus	78dbc6209b	增加了童锁功能	2025-03-19 14:34:14 +08:00
wsuow	2896243e24	Merge branch 'oopuuu:master' into master	2025-03-19 14:30:44 +08:00
nhkefus	9d80970e9e	增加了童锁功能	2025-03-19 14:29:09 +08:00
wsuow	7bac9096f5	Merge branch 'oopuuu:master' into master	2025-03-19 14:21:22 +08:00
nhkefus	5f81f2ca71	增加了童锁功能	2025-03-19 14:19:09 +08:00
nhkefus	57dbe17175	在后台增加显示昨日今日耗电量	2025-03-19 12:54:01 +08:00
wsuow	a8d5319d52	Merge branch 'oopuuu:master' into master	2025-03-19 12:35:29 +08:00
nhkefus	f41a20f8d0	在后台增加显示昨日今日耗电量	2025-03-19 12:34:53 +08:00
oopuuu	52da5983b5	Update README.md	2025-03-19 12:19:48 +08:00
oopuuu	758abf123b	Add files via upload	2025-03-19 12:16:36 +08:00
wsuow	e3de06437b	Merge branch 'oopuuu:master' into master	2025-03-19 10:41:53 +08:00
nhkefus	7f0e5d15c8	修复已知问题	2025-03-19 10:41:02 +08:00
wsuow	7656ae998c	Merge branch 'oopuuu:master' into master	2025-03-19 10:12:14 +08:00
nhkefus	3aec445e57	修复已知问题	2025-03-19 10:08:10 +08:00
wsuow	7048333ebc	Merge branch 'oopuuu:master' into master	2025-03-19 09:59:08 +08:00
nhkefus	bfae22ddd6	修复已知问题	2025-03-19 09:55:47 +08:00
wsuow	520a245ef3	Merge branch 'oopuuu:master' into master	2025-03-19 08:37:27 +08:00
oopuuu	1f92b30ea0	Update user_mqtt_client.c 指定hass中的实体名称，防止新功能导致它变化	2025-03-19 00:51:44 +08:00
wsuow	d7c83fa125	Merge branch 'oopuuu:master' into master	2025-03-18 13:35:48 +08:00
wsuow	f17ca68404	Merge branch 'oopuuu:master' into master	2025-03-18 13:13:41 +08:00
wsuow	713dd1a907	Merge branch 'oopuuu:master' into master	2025-03-17 14:12:17 +08:00
wsuow	8537240bbd	Merge branch 'oopuuu:master' into master	2025-03-17 13:57:40 +08:00
wsuow	5a1b82b728	Merge branch 'oopuuu:master' into master	2025-03-17 13:47:51 +08:00
wsuow	9caeec8611	Merge branch 'oopuuu:master' into master	2025-03-17 13:22:10 +08:00
wsuow	8a28029940	Merge branch 'oopuuu:master' into master	2025-03-17 13:14:48 +08:00
wsuow	3964703152	Merge branch 'oopuuu:master' into master	2025-03-17 13:10:41 +08:00
wsuow	4b000d109c	Merge branch 'oopuuu:master' into master	2025-03-17 13:07:18 +08:00
wsuow	90ba74b401	Merge branch 'oopuuu:master' into master	2025-03-17 11:16:27 +08:00
wsuow	208a7b3ef9	Merge branch 'oopuuu:master' into master	2025-03-14 12:53:22 +08:00
wsuow	ba943fe6ae	Merge branch 'oopuuu:master' into master	2025-03-14 12:48:35 +08:00
wsuow	3fca5b51aa	Merge branch 'oopuuu:master' into master	2025-03-14 11:21:48 +08:00
wsuow	daa3415717	Merge branch 'oopuuu:master' into master	2025-03-14 10:47:21 +08:00
wsuow	e7d380bf4c	Merge branch 'oopuuu:master' into master	2025-03-13 10:55:31 +08:00
wsuow	eb7241e235	Merge branch 'oopuuu:master' into master	2025-03-13 10:31:51 +08:00
wsuow	3350aa5446	Merge branch 'oopuuu:master' into master	2025-03-12 08:40:13 +08:00
吴永福	c94e8fcd12	修复mico-os SDK库错误	2025-03-11 17:21:17 +08:00
吴永福	4ed9dbd435	更改README.md	2025-03-11 16:31:55 +08:00