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

fix:domoticz反馈数据导致的重复动作的问题

Browse Source 
fix:优化全开全关是逻辑
add:增加mqtt连接状态判断函数
This commit is contained in:
Zip
2019-03-14 16:55:36 +08:00
parent 6bbbd7aba3
commit ea4ff98a48
7 changed files with 93 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
TC1/user_mqtt_client.c
View File

@@ -108,7 +108,7 @@ OSStatus user_recv_handler( void *arg );
/******************************************************
* Variables Definitions
******************************************************/
bool isconnect=false;
mico_queue_t mqtt_msg_send_queue = NULL;
Client c; // mqtt client object
@@ -233,6 +233,8 @@ void mqtt_client_thread( mico_thread_arg_t arg )
require_action( msg_send_event_fd >= 0, exit, mqtt_log("ERROR: create msg send queue event fd failed!!!") );
MQTT_start:
isconnect=false;
/* 1. create network connection */
#ifdef MQTT_CLIENT_SSL_ENABLE
ssl_settings.ssl_enable = true;
@@ -246,6 +248,7 @@ void mqtt_client_thread( mico_thread_arg_t arg )
LinkStatusTypeDef LinkStatus;
while ( 1 )
{
isconnect=false;
mico_rtos_thread_sleep( 3 );
if(MQTT_SERVER[0]<0x20 ||MQTT_SERVER[0]>0x7f ||MQTT_SERVER_PORT<1) continue; //δ<><CEB4><EFBFBD><EFBFBD>mqtt<74><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -294,6 +297,7 @@ void mqtt_client_thread( mico_thread_arg_t arg )
/* 5. client loop for recv msg && keepalive */
while ( 1 )
{
isconnect=true;
no_mqtt_msg_exchange = true;
FD_ZERO( &readfds );
FD_SET( c.ipstack->my_socket, &readfds );
@@ -342,7 +346,7 @@ void mqtt_client_thread( mico_thread_arg_t arg )
MQTT_reconnect:
mqtt_log("Disconnect MQTT client, and reconnect after 5s, reason: mqtt_rc = %d, err = %d", rc, err );
mqtt_client_release( &c, &n );
isconnect=false;
user_led_set( -1 );
mico_rtos_thread_msleep(100);
user_led_set( -1 );
@@ -350,6 +354,7 @@ void mqtt_client_thread( mico_thread_arg_t arg )
goto MQTT_start;
exit:
isconnect=false;
mqtt_log("EXIT: MQTT client exit with err = %d.", err);
mqtt_client_release( &c, &n );
mico_rtos_delete_thread( NULL );
@@ -438,3 +443,8 @@ OSStatus user_mqtt_send( char *arg )
return err;
}
bool user_mqtt_isconnect()
{
return isconnect;
}