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

在后台增加 1到10击 功能设置

Browse Source
This commit is contained in:
nhkefus
2025-03-20 12:24:46 +08:00
parent a87d894c4d
commit 8acef18406
7 changed files with 270 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
TC1/http_server/app_httpd.c
View File

@@ -149,6 +149,7 @@ static int HttpGetAssets(httpd_request_t *req) {
static int HttpGetTc1Status(httpd_request_t *req) { static int HttpGetTc1Status(httpd_request_t *req) {
char *sockets = GetSocketStatus(); char *sockets = GetSocketStatus();
char *short_click_config = GetShortClickConfig();
char *tc1_status = malloc(1024); char *tc1_status = malloc(1024);
char *socket_names = malloc(512); char *socket_names = malloc(512);
sprintf(socket_names, "%s,%s,%s,%s,%s,%s", 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, user_config->ap_name, user_config->ap_key, MQTT_SERVER, MQTT_SERVER_PORT,
MQTT_SERVER_USR, MQTT_SERVER_PWD, MQTT_SERVER_USR, MQTT_SERVER_PWD,
VERSION, ip_status.ip, ip_status.mask, ip_status.gateway, user_config->mqtt_report_freq, VERSION, ip_status.ip, ip_status.mask, ip_status.gateway, user_config->mqtt_report_freq,
user_config->power_led_enabled, 0L,socket_names,childLockEnabled,sys_config->micoSystemConfig.name); user_config->power_led_enabled, 0L, socket_names, childLockEnabled,
sys_config->micoSystemConfig.name, short_click_config);
OSStatus err = kNoErr; OSStatus err = kNoErr;
send_http(tc1_status, strlen(tc1_status), exit, &err); send_http(tc1_status, strlen(tc1_status), exit, &err);
@@ -202,8 +204,8 @@ static int HttpSetSocketName(httpd_request_t *req) {
require_noerr(err, exit); require_noerr(err, exit);
int index; int index;
char name[64]; char name[64];
sscanf(buf, "%d %s",&index,name); sscanf(buf, "%d %s", &index, name);
strcpy(user_config->socket_names[index],name); strcpy(user_config->socket_names[index], name);
mico_system_context_update(sys_config); mico_system_context_update(sys_config);
registerMqttEvents(); registerMqttEvents();
send_http("OK", 2, exit, &err); send_http("OK", 2, exit, &err);
@@ -213,6 +215,27 @@ static int HttpSetSocketName(httpd_request_t *req) {
return err; 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) { static int HttpSetDeviceName(httpd_request_t *req) {
OSStatus err = kNoErr; OSStatus err = kNoErr;
@@ -222,8 +245,8 @@ static int HttpSetDeviceName(httpd_request_t *req) {
err = httpd_get_data(req, buf, buf_size); err = httpd_get_data(req, buf, buf_size);
require_noerr(err, exit); require_noerr(err, exit);
char name[64]; char name[64];
sscanf(buf, "%s",name); sscanf(buf, "%s", name);
strcpy(sys_config->micoSystemConfig.name,name); strcpy(sys_config->micoSystemConfig.name, name);
mico_system_context_update(sys_config); mico_system_context_update(sys_config);
registerMqttEvents(); registerMqttEvents();
send_http("OK", 2, exit, &err); send_http("OK", 2, exit, &err);
@@ -242,7 +265,7 @@ static int HttpSetChildLock(httpd_request_t *req) {
err = httpd_get_data(req, buf, buf_size); err = httpd_get_data(req, buf, buf_size);
require_noerr(err, exit); require_noerr(err, exit);
int enableLock; int enableLock;
sscanf(buf, "%d",&enableLock); sscanf(buf, "%d", &enableLock);
user_config->user[0] = enableLock; user_config->user[0] = enableLock;
childLockEnabled = enableLock; childLockEnabled = enableLock;
mico_system_context_update(sys_config); mico_system_context_update(sys_config);
@@ -275,6 +298,7 @@ static int HttpGetPowerInfo(httpd_request_t *req) {
char *powers = GetPowerRecord(idx); char *powers = GetPowerRecord(idx);
char *sockets = GetSocketStatus(); char *sockets = GetSocketStatus();
char *short_click_config = GetShortClickConfig();
char *socket_names = malloc(512); char *socket_names = malloc(512);
sprintf(socket_names, "%s,%s,%s,%s,%s,%s", sprintf(socket_names, "%s,%s,%s,%s,%s,%s",
user_config->socket_names[0], user_config->socket_names[0],
@@ -284,7 +308,9 @@ static int HttpGetPowerInfo(httpd_request_t *req) {
user_config->socket_names[4], user_config->socket_names[4],
user_config->socket_names[5]); user_config->socket_names[5]);
sprintf(power_info_json, POWER_INFO_JSON, sockets, power_record.idx, PW_NUM, p_count, powers, 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,user_config->p_count_1_day_ago,user_config->p_count_2_days_ago,childLockEnabled,sys_config->micoSystemConfig.name); 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); send_http(power_info_json, strlen(power_info_json), exit, &err);
if (socket_names) free(socket_names); if (socket_names) free(socket_names);
exit: exit:
@@ -408,7 +434,7 @@ static int HttpGetMqttReportFreq(httpd_request_t *req) {
send_http(freq, strlen(freq), exit, &err); send_http(freq, strlen(freq), exit, &err);
exit: exit:
if(freq) free(freq); if (freq) free(freq);
return err; return err;
} }
@@ -459,7 +485,7 @@ static int HttpAddTask(httpd_request_t *req) {
char *mess = (re == 4 && AddTask(task)) ? "OK" : "NO"; char *mess = (re == 4 && AddTask(task)) ? "OK" : "NO";
send_http(mess, strlen(mess), exit, &err); send_http(mess, strlen(mess), exit, &err);
if(mess) free(mess); if (mess) free(mess);
exit: exit:
return err; return err;
} }
@@ -479,7 +505,7 @@ static int HttpDelTask(httpd_request_t *req) {
send_http(mess, strlen(mess), exit, &err); send_http(mess, strlen(mess), exit, &err);
exit: exit:
if(time_str) free(time_str); if (time_str) free(time_str);
return err; return err;
} }
@@ -492,7 +518,7 @@ static int LedStatus(httpd_request_t *req) {
send_http(led, strlen(led), exit, &err); send_http(led, strlen(led), exit, &err);
exit: exit:
if(led) free(led); if (led) free(led);
return err; return err;
} }
@@ -521,7 +547,7 @@ static int LedSetEnabled(httpd_request_t *req) {
return err; return err;
} }
static int TotalSocketSetEnabled(httpd_request_t *req){ static int TotalSocketSetEnabled(httpd_request_t *req) {
OSStatus err = kNoErr; OSStatus err = kNoErr;
int buf_size = 97; int buf_size = 97;
@@ -585,10 +611,11 @@ const struct httpd_wsgi_call g_app_handlers[] = {
{"/task", HTTPD_HDR_DEFORT, APP_HTTP_FLAGS_NO_EXACT_MATCH, HttpGetTasks, HttpAddTask, NULL, HttpDelTask}, {"/task", HTTPD_HDR_DEFORT, APP_HTTP_FLAGS_NO_EXACT_MATCH, HttpGetTasks, HttpAddTask, NULL, HttpDelTask},
{"/ota", HTTPD_HDR_DEFORT, 0, Otastatus, OtaStart, NULL, NULL}, {"/ota", HTTPD_HDR_DEFORT, 0, Otastatus, OtaStart, NULL, NULL},
{"/led", HTTPD_HDR_DEFORT, 0, LedStatus, LedSetEnabled, NULL, NULL}, {"/led", HTTPD_HDR_DEFORT, 0, LedStatus, LedSetEnabled, NULL, NULL},
{"/socketAll", HTTPD_HDR_DEFORT, 0, NULL, TotalSocketSetEnabled, NULL, NULL}, {"/socketAll", HTTPD_HDR_DEFORT, 0, NULL, TotalSocketSetEnabled, NULL, NULL},
{"/socketNames", HTTPD_HDR_DEFORT, 0, NULL, HttpSetSocketName, NULL, NULL}, {"/socketNames", HTTPD_HDR_DEFORT, 0, NULL, HttpSetSocketName, NULL, NULL},
{"/childLock", HTTPD_HDR_DEFORT, 0, NULL, HttpSetChildLock, NULL, NULL}, {"/childLock", HTTPD_HDR_DEFORT, 0, NULL, HttpSetChildLock, NULL, NULL},
{"/deviceName", HTTPD_HDR_DEFORT, 0, NULL, HttpSetDeviceName, NULL, NULL}, {"/deviceName", HTTPD_HDR_DEFORT, 0, NULL, HttpSetDeviceName, NULL, NULL},
{"/shortClickEvent", HTTPD_HDR_DEFORT, 0, NULL, HttpSetShortClickEvent, NULL, NULL},
}; };
static int g_app_handlers_no = sizeof(g_app_handlers) / sizeof(struct httpd_wsgi_call); static int g_app_handlers_no = sizeof(g_app_handlers) / sizeof(struct httpd_wsgi_call);

5
TC1/http_server/app_httpd.h
View File

@@ -67,10 +67,11 @@
'up_time':%ld,\ 'up_time':%ld,\
'socketNames':'%s',\ 'socketNames':'%s',\
'child_lock_enabled':%d,\ 'child_lock_enabled':%d,\
'deviceName':'%s'\ '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','p_count_1_day_ago':%d,'p_count_2_days_ago':%d,'child_lock_enabled':%d,'deviceName':'%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); int AppHttpdStart(void);

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

@@ -119,7 +119,9 @@
<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="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"> <div class="mdl-card__supporting-text">
<h3>插座控制</h3> <div class="mdl-card__title mdl-card--expand">
<h2 class="mdl-card__title-text">插座控制</h2>
</div>
<!-- <!--
<span class="mdl-list__item-secondary-action"> <span class="mdl-list__item-secondary-action">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="list-switch-0"> <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="list-switch-0">
@@ -283,10 +285,33 @@
</div> </div>
</div> </div>
</div> </div>
<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">
<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>
<tr>
<td>连续短按1次</td>
<td><a>总开关</a></td>
</tr>
</table>
</div>
</div></div>
<div id="ct-chart-par" <div id="ct-chart-par"
class="page page1 mdl-card__supporting-text mdl-shadow--2dp mdl-cell mdl-cell--6-col" 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;"> style="height:315px;overflow-x:scroll;overflow-y:hidden;">
<div class="mdl-card__title mdl-card--expand">
<h2 class="mdl-card__title-text">功率图表</h2>
</div>
<table class="pw"> <table class="pw">
<tr> <tr>
<td>当前功率: <span id="p" class="success">0</span> W</td> <td>当前功率: <span id="p" class="success">0</span> W</td>
@@ -296,7 +321,7 @@
</tr> </tr>
</table> </table>
<div id="ct-chart" class="ct-chart ct-perfect-fourth" <div id="ct-chart" class="ct-chart ct-perfect-fourth"
style="height:280px;margin-top:20px;"></div> style="height:280px;margin-top:40px;"></div>
</div> </div>
<div class="page page2 mdl-cell mdl-cell--5-col demo-card-square mdl-card mdl-shadow--2dp" <div class="page page2 mdl-cell mdl-cell--5-col demo-card-square mdl-card mdl-shadow--2dp"
@@ -539,8 +564,8 @@
<td id="uptime">10:13:43</td> <td id="uptime">10:13:43</td>
</tr> </tr>
</table> </table>
<div class="mdl-card__actions mdl-card--border"> <div class="mdl-card__actions mdl-card--border" style="display: flex; align-items: center; flex-wrap: wrap;">
<span>提示：长按电源按钮5s，指示灯闪烁3次可开启热点重新配网，10s指示灯保持闪烁恢复出厂设置</span> <span style="font-size:0.8em;">提示：长按电源按钮5s，指示灯闪烁3次可开启热点重新配网，10s指示灯保持闪烁恢复出厂设置</span>
<div class="mdl-layout-spacer"></div> <div class="mdl-layout-spacer"></div>
<i class="material-icons"> <i class="material-icons">
<svg> <svg>
@@ -837,6 +862,46 @@
$("#info_mask").html(status.mask); $("#info_mask").html(status.mask);
$("#info_gateway").html(status.gateway); $("#info_gateway").html(status.gateway);
$("#uptime").html(status.up_time); $("#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}`;
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="${BTN_OPERATIONS[actions[i]]}">
<input type="hidden" id="${rowId}-value" value="${actions[i]}">
<ul class="mdl-menu mdl-menu--bottom-left mdl-js-menu" for="${rowId}-input">
${BTN_OPERATIONS.map((op, idx) =>
`<li class="mdl-menu__item" data-val="${idx}" onclick="selectOperation('${rowId}', ${idx}, BTN_OPERATIONS)"> ${op} </li>`
).join('')}
</ul>
</div>
</td>
</tr>
`;
}
document.getElementById("short_click_events_tb").innerHTML = tb_html;
// 刷新 MDL 元素
componentHandler.upgradeDom();
}); });
$("#st-date").html((new Date()).Format("yyyy-MM-dd")); $("#st-date").html((new Date()).Format("yyyy-MM-dd"));
@@ -1145,6 +1210,42 @@
switch_lables[i+3].MaterialSwitch.off(); switch_lables[i+3].MaterialSwitch.off();
} }
} }
var actions=power.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}`;
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="${BTN_OPERATIONS[actions[i]]}">
<input type="hidden" id="${rowId}-value" value="${actions[i]}">
<ul class="mdl-menu mdl-menu--bottom-left mdl-js-menu" for="${rowId}-input">
${BTN_OPERATIONS.map((op, idx) =>
`<li class="mdl-menu__item" data-val="${idx}" onclick="selectOperation('${rowId}', ${idx}, BTN_OPERATIONS)"> ${op} </li>`
).join('')}
</ul>
</div>
</td>
</tr>
`;
}
document.getElementById("short_click_events_tb").innerHTML = tb_html;
// 刷新 MDL 元素
componentHandler.upgradeDom();
window.setTimeout(GetPowerRecord, 3000); window.setTimeout(GetPowerRecord, 3000);
}, power_idx.toString()); }, power_idx.toString());
@@ -1222,6 +1323,16 @@
GetTimedTask(); GetTimedTask();
}, cmd); }, cmd);
} }
function selectOperation(rowId, index, operations) {
var witch = parseInt(rowId.split('-')[1]);
const selectedText = operations[index];
document.getElementById(`${rowId}-input`).value = selectedText;
document.getElementById(`${rowId}-value`).value = index;
HttpDel("/shortClickEvent", function (re) {
ShowToast("已设置按钮事件");
}, `${witch} index`);
}
function DelTimedTask(timestamp) { function DelTimedTask(timestamp) {
HttpDel("/task/"+timestamp, function (re) { HttpDel("/task/"+timestamp, function (re) {
ShowToast("Delete timed task OK!"); ShowToast("Delete timed task OK!");

4
TC1/main.c
View File

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

1
TC1/main.h
View File

@@ -35,6 +35,7 @@
#define Relay_ON 1 #define Relay_ON 1
#define Relay_OFF 0 #define Relay_OFF 0
#define Relay_TOGGLE -1
#define Relay_0 MICO_GPIO_6 #define Relay_0 MICO_GPIO_6
#define Relay_1 MICO_GPIO_8 #define Relay_1 MICO_GPIO_8

120
TC1/user_gpio.c
View File

@@ -7,6 +7,7 @@
mico_gpio_t relay[Relay_NUM] = {Relay_0, Relay_1, Relay_2, Relay_3, Relay_4, Relay_5}; mico_gpio_t relay[Relay_NUM] = {Relay_0, Relay_1, Relay_2, Relay_3, Relay_4, Relay_5};
char socket_status[32] = {0}; char socket_status[32] = {0};
char short_click_config[32] = {0};
void UserLedSet(char x) { void UserLedSet(char x) {
if (x == -1) if (x == -1)
@@ -38,6 +39,21 @@ char *GetSocketStatus() {
return socket_status; return 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) { void SetSocketStatus(char *socket_status) {
sscanf(socket_status, "%d,%d,%d,%d,%d,%d,", sscanf(socket_status, "%d,%d,%d,%d,%d,%d,",
(int *) &user_config->socket_status[0], (int *) &user_config->socket_status[0],
@@ -58,18 +74,20 @@ void SetSocketStatus(char *socket_status) {
/*UserRelaySet /*UserRelaySet
* 设置继电器开关 * 设置继电器开关
* i:编号 0-5 * 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 (i < 0 || i >= SOCKET_NUM) return;
if (on == Relay_ON) { if (on == Relay_ON) {
MicoGpioOutputHigh(relay[i]); MicoGpioOutputHigh(relay[i]);
} else { } else if (on == Relay_OFF) {
MicoGpioOutputLow(relay[i]); MicoGpioOutputLow(relay[i]);
} else if (on == Relay_TOGGLE) {
MicoGpioOutputTrigger(relay[i]);
} }
user_config->socket_status[i] = on; user_config->socket_status[i] = on >= 0 ? on : (user_config->socket_status[i] == 0 ? 1 : 0);
if (RelayOut() && user_config->power_led_enabled) { if (RelayOut() && user_config->power_led_enabled) {
UserLedSet(1); UserLedSet(1);
@@ -103,39 +121,78 @@ static void KeyLong10sPress(void) {
// mico_system_context_update(mico_system_context_get()); // mico_system_context_update(mico_system_context_get());
} }
static void KeyShortPress(void) { static void handleSwitchSingleSwitch(int witch) {
char i;
if (RelayOut()) { UserMqttSendSocketState(witch);
UserRelaySetAll(0);
} else {
UserRelaySetAll(1);
}
for (i = 0; i < SOCKET_NUM; i++) {
UserMqttSendSocketState(i);
}
UserMqttSendTotalSocketState(); UserMqttSendTotalSocketState();
} }
static void KeyShortPress(int clickCnt) {
if (clickCnt > 10)
return;
switch (user_config->user[clickCnt]) {
case SWITCH_TOTAL_SOCKET:
char i;
if (RelayOut()) {
UserRelaySetAll(0);
} else {
UserRelaySetAll(1);
}
for (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:
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:
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;
}
}
mico_timer_t user_key_timer; mico_timer_t user_key_timer;
uint16_t key_time = 0; uint16_t key_time = 0;
#define BUTTON_LONG_PRESS_TIME 10 //100ms*10=1s #define BUTTON_LONG_PRESS_TIME 10 //100ms*10=1s
static void KeyTimeoutHandler(void *arg) { static void KeyTimeoutHandler(void *arg) {
if(childLockEnabled) if (childLockEnabled)
return; return;
static char key_trigger, key_continue; static char key_trigger, key_continue;
//按键扫描程序 static uint8_t click_count = 0;
static bool waiting_click_end = false;
static uint8_t click_timer = 0; // 单位：100ms
// 按键扫描
char tmp = ~(0xfe | MicoGpioInputGet(Button)); char tmp = ~(0xfe | MicoGpioInputGet(Button));
key_trigger = tmp & (tmp ^ key_continue); key_trigger = tmp & (tmp ^ key_continue);
key_continue = tmp; 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_trigger != 0) key_time = 0;
if (key_continue != 0) {
key_time++;
if (key_time > BUTTON_LONG_PRESS_TIME) {
if (key_time == 50) { if (key_time == 50) {
KeyLong5sPress(); KeyLong5sPress();
} else if (key_time > 50 && key_time < 57) { } else if (key_time > 50 && key_time < 57) {
@@ -171,15 +228,26 @@ static void KeyTimeoutHandler(void *arg) {
} }
} }
} else { } else {
//button released // 按键释放
if (key_time < BUTTON_LONG_PRESS_TIME) { //100ms*10=1s 大于1s为长按 if (key_time < BUTTON_LONG_PRESS_TIME) {
key_time = 0;key_log("button short pressed:%d", key_time); click_count++;
KeyShortPress(); waiting_click_end = true;
click_timer = 0;
} else if (key_time > 100) { } else if (key_time > 100) {
MicoSystemReboot(); MicoSystemReboot();
} }
mico_rtos_stop_timer(&user_key_timer); mico_rtos_stop_timer(&user_key_timer);
} }
// 多击判定逻辑（100ms为单位）
if (waiting_click_end) {
click_timer++;
if (click_timer >= 3) { // 300ms内没有新击，判定结束
KeyShortPress(click_count);
click_count = 0;
waiting_click_end = false;
}
}
} }
static void KeyFallingIrqHandler(void *arg) { static void KeyFallingIrqHandler(void *arg) {

10
TC1/user_gpio.h
View File

@@ -4,6 +4,15 @@
#include "mico.h" #include "mico.h"
#include "micokit_ext.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]; extern char socket_status[32];
void UserLedSet(char x); void UserLedSet(char x);
@@ -12,6 +21,7 @@ void UserRelaySet(unsigned char x,unsigned char y);
void UserRelaySetAll(char y); void UserRelaySetAll(char y);
bool RelayOut(void); bool RelayOut(void);
char* GetSocketStatus(); char* GetSocketStatus();
char* GetShortClickConfig();
void SetSocketStatus(char* socket_status); void SetSocketStatus(char* socket_status);
#endif #endif