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

add:功率功能

Browse Source 
add:尝试增加ota进度功能
This commit is contained in:
Zip
2019-03-29 16:26:35 +08:00
parent a5d6eec84b
commit c50db6a0bb
9 changed files with 91 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
TC1/user_mqtt_client.c
View File

@@ -111,6 +111,7 @@ OSStatus user_recv_handler( void *arg );
OSStatus user_mqtt_send_plug_state( char plug_id );
void user_mqtt_hass_auto( char plug_id );
void user_mqtt_hass_auto_power( void );
/******************************************************
* Variables Definitions
@@ -264,7 +265,7 @@ void mqtt_client_thread( mico_thread_arg_t arg )
{
isconnect = false;
mico_rtos_thread_sleep( 3 );
if ( MQTT_SERVER[0] < 0x20 || MQTT_SERVER[0] > 0x7f || MQTT_SERVER_PORT < 1 ) continue; //δ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>mqtt<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if ( MQTT_SERVER[0] < 0x20 || MQTT_SERVER[0] > 0x7f || MQTT_SERVER_PORT < 1 ) continue; //未配置mqtt服务器时不连接
micoWlanGetLinkStatus( &LinkStatus );
if ( LinkStatus.is_connected != 1 )
@@ -307,10 +308,10 @@ void mqtt_client_thread( mico_thread_arg_t arg )
rc = MQTTSubscribe( &c, topic_set, QOS0, messageArrived );
require_noerr_string( rc, MQTT_reconnect, "ERROR: MQTT client subscribe err." );
mqtt_log("MQTT client subscribe success! recv_topic=[%s].", topic_set);
/*4.1 <EFBFBD><EFBFBD><EFBFBD>ӳɹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȸ<EFBFBD><EFBFBD>·<EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
/*4.1 连接成功后先更新发送一次数据*/
isconnect = true;
uint8_t *buf1 = NULL;
buf1 = malloc( 1024 ); //idxΪ1λʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ24
buf1 = malloc( 1024 ); //idx为1位时长度为24
if ( buf1 != NULL )
{
sprintf(
@@ -339,11 +340,12 @@ void mqtt_client_thread( mico_thread_arg_t arg )
no_mqtt_msg_exchange = false;
}
if ( hass_mqtt_flag>0 )
if ( hass_mqtt_flag > 0 )
{
hass_mqtt_flag --;
user_mqtt_hass_auto(hass_mqtt_flag);
user_mqtt_send_plug_state(hass_mqtt_flag);
if ( hass_mqtt_flag == PLUG_NUM ) user_mqtt_hass_auto_power( );
hass_mqtt_flag--;
user_mqtt_hass_auto( hass_mqtt_flag );
user_mqtt_send_plug_state( hass_mqtt_flag );
}
/* recv msg from user worker thread to be sent to server */
if ( FD_ISSET( msg_send_event_fd, &readfds ) )
@@ -481,7 +483,7 @@ OSStatus user_mqtt_send( char *arg )
return user_mqtt_send_topic( topic_state, arg, 0 );
}
//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ha<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬
//更新ha开关状态
OSStatus user_mqtt_send_plug_state( char plug_id )
{
@@ -499,7 +501,7 @@ OSStatus user_mqtt_send_plug_state( char plug_id )
if ( topic_buf ) free( topic_buf );
}
//hass mqtt<EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݷ<EFBFBD><EFBFBD><EFBFBD>
//hass mqtt自动发现数据开关发送
void user_mqtt_hass_auto( char plug_id )
{
uint8_t i;
@@ -519,15 +521,60 @@ void user_mqtt_hass_auto( char plug_id )
"\"payload_off\":\"{\\\"mac\\\":\\\"%s\\\",\\\"plug_%d\\\":{\\\"on\\\":0}}\""
"}",
user_config->plug[plug_id].name,
strMac, plug_id,
strMac, plug_id,
strMac, plug_id );
strMac,
plug_id,
strMac,
plug_id,
strMac,
plug_id );
user_mqtt_send_topic( topic_buf, send_buf, 1 );
}
if ( send_buf ) free( send_buf );
if ( topic_buf ) free( topic_buf );
}
//hass mqtt自动发现数据功率发送
void user_mqtt_hass_auto_power( void )
{
uint8_t i;
uint8_t *send_buf = NULL;
uint8_t *topic_buf = NULL;
send_buf = malloc( 512 ); //
topic_buf = malloc( 128 ); //
if ( send_buf != NULL && topic_buf != NULL )
{
sprintf( topic_buf, "homeassistant/sensor/%s/power/config", strMac );
sprintf( send_buf,
"{"
"\"name\":\"功率\","
"\"state_topic\":\"homeassistant/sensor/%s/power/state\","
"\"unit_of_measurement\":\"W\","
"\"icon\":\"mdi:gauge\","
"\"value_template\":\"{{ value_json.power }}\""
"}",
strMac );
user_mqtt_send_topic( topic_buf, send_buf, 1 );
}
if ( send_buf ) free( send_buf );
if ( topic_buf ) free( topic_buf );
}
void user_mqtt_hass_power( void )
{
uint8_t i;
uint8_t *send_buf = NULL;
uint8_t *topic_buf = NULL;
send_buf = malloc( 512 ); //
topic_buf = malloc( 128 ); //
if ( send_buf != NULL && topic_buf != NULL )
{
sprintf( topic_buf, "homeassistant/sensor/%s/power/state", strMac );
sprintf( send_buf, "{\"power\":\"%d.%d\"}", power/10,power%10 );
user_mqtt_send_topic( topic_buf, send_buf, 0 );
}
if ( send_buf ) free( send_buf );
if ( topic_buf ) free( topic_buf );
}
bool user_mqtt_isconnect( )
{