GitHub/zTC1
1
0
Fork 0
mirror of https://github.com/oopuuu/zTC1.git synced 2025-12-11 20:48:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'oopuuu:master' into master

Browse Source
This commit is contained in:
wsuow
2025-03-18 13:35:48 +08:00
committed by GitHub
parent f17ca68404 44ed1d2604
commit d7c83fa125
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
TC1/http_server/web/index.html
View File

@@ -519,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>

2
TC1/mqtt_server/user_mqtt_client.c
View File

@@ -519,7 +519,7 @@ void UserMqttHassAuto(char socket_id) {
"\"name\":\"TC1_%s\","
"\"model\":\"TC1\","
"\"manufacturer\":\"PHICOMM\"}}",
user_config->socket_names[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, str_mac);
UserMqttSendTopic(topic_buf, send_buf, 1);

12
TC1/user_gpio.c
View File

@@ -103,11 +103,11 @@ 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)
@@ -156,9 +156,9 @@ static void KeyTimeoutHandler(void* arg)
{
key_log("button long pressed:%d",key_time);
if (key_time == 30)
if (key_time == 50)
{
KeyLongPress();
KeyLong5sPress();
}
else if (key_time == 100)
{