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

fix:优化定时任务值逻辑

Browse Source 
fix:优化获取idx数据处理返回内容
fix:按键返回数据逻辑
del:删除多余的调试信息
This commit is contained in:
Zip
2019-03-15 16:31:41 +08:00
parent 9ac697f837
commit e4c6d14185
6 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
TC1/user_gpio.c
View File

@@ -98,21 +98,20 @@ static void key_short_press( void )
user_relay_set_all( 1 );
}
if ( user_config->idx >= 0 )
uint8_t * buf = NULL; //[64] = { 0 };
buf = malloc( 64 );
if ( buf != NULL )
{
uint8_t * buf = NULL; //[64] = { 0 };
buf = malloc( 64 );
if ( buf != NULL )
{
if ( user_config->idx >= 0 )
sprintf( buf, "{\"idx\" : %d,\"mac\" : \"%s\",\"nvalue\" : %d}", user_config->idx, strMac, relay_out( ) );
os_log("send %s", buf);
if ( !user_mqtt_isconnect( ) ) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
user_udp_send( buf );
else
user_mqtt_send( buf );
free( buf );
}
else
sprintf( buf, "{\"mac\" : \"%s\",\"nvalue\" : %d}", strMac, relay_out( ) );
os_log("send %s", buf);
if ( !user_mqtt_isconnect( ) ) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
user_udp_send( buf );
else
user_mqtt_send( buf );
free( buf );
}
}
@@ -156,7 +155,7 @@ static void key_timeout_handler( void* arg )
else if ( key_time == 103 )
{
user_led_set( 0 );
key_time=101;
key_time = 101;
}
}
@@ -168,7 +167,7 @@ static void key_timeout_handler( void* arg )
key_time = 0;
os_log("button short pressed:%d",key_time);
key_short_press( );
} else if(key_time > 100)
} else if ( key_time > 100 )
{
MicoSystemReboot( );
}