This commit is contained in:
zogodo
2019-09-25 17:10:21 +08:00
parent 21a07a4d97
commit 3f2605cd78
8 changed files with 91 additions and 95 deletions

View File

@@ -56,9 +56,9 @@ void set_socket_status(char* socket_status)
}
/*user_relay_set
* <EFBFBD><EFBFBD><EFBFBD>ü̵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
* i:<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0-5
* on:<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0:<EFBFBD><EFBFBD> 1:<EFBFBD><EFBFBD>
* 设置继电器开关
* i:编号 0-5
* on:开关 0: 1:
*/
void user_relay_set(unsigned char i, unsigned char on)
{
@@ -86,8 +86,8 @@ void user_relay_set(unsigned char i, unsigned char on)
}
/*
* <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>м̵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
* y: 0:ȫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1:ȫ<><C8AB><EFBFBD><EFBFBD>
* 设置所有继电器开关
* y: 0:全部关 1:全部开
*
*/
void user_relay_set_all(char y)
@@ -144,12 +144,12 @@ uint16_t key_time = 0;
static void key_timeout_handler(void* arg)
{
static char key_trigger, key_continue;
//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//按键扫描程序
char tmp = ~(0xfe | MicoGpioInputGet(Button));
key_trigger = tmp & (tmp ^ key_continue);
key_continue = tmp;
// os_log("button scan:%02x %02x",key_trigger,key_continue);
if (key_trigger != 0) key_time = 0; //<EFBFBD>°<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ,<2C><><EFBFBD>¿<EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ
if (key_trigger != 0) key_time = 0; //新按键按下时,重新开始按键计时
if (key_continue != 0)
{
//any button pressed
@@ -181,7 +181,7 @@ static void key_timeout_handler(void* arg)
{
//button released
if (key_time < BUTTON_LONG_PRESS_TIME)
{ //100ms*10=1s <EFBFBD><EFBFBD><EFBFBD><EFBFBD>1sΪ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
{ //100ms*10=1s 大于1s为长按
key_time = 0;
os_log("button short pressed:%d",key_time);
key_short_press();