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

修复总开关逻辑问题

Browse Source
This commit is contained in:
nhkefus
2025-03-17 13:21:52 +08:00
parent 56f8a2efaa
commit 65d6c77a1e
2 changed files with 224 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

470
TC1/mqtt_server/user_mqtt_client.c
View File

@@ -27,8 +27,7 @@
#include "user_power.h" #include "user_power.h"
#include "user_mqtt_client.h" #include "user_mqtt_client.h"
typedef struct typedef struct {
{
char topic[MAX_MQTT_TOPIC_SIZE]; char topic[MAX_MQTT_TOPIC_SIZE];
char qos; char qos;
char retained; char retained;
@@ -38,11 +37,16 @@ typedef struct
} mqtt_recv_msg_t, *p_mqtt_recv_msg_t, mqtt_send_msg_t, *p_mqtt_send_msg_t; } mqtt_recv_msg_t, *p_mqtt_recv_msg_t, mqtt_send_msg_t, *p_mqtt_send_msg_t;
static void MqttClientThread(mico_thread_arg_t arg); static void MqttClientThread(mico_thread_arg_t arg);
static void MessageArrived(MessageData* md);
static OSStatus MqttMsgPublish(Client *c, const char* topic, char qos, char retained, const unsigned char* msg, uint32_t msg_len); static void MessageArrived(MessageData *md);
static OSStatus
MqttMsgPublish(Client *c, const char *topic, char qos, char retained, const unsigned char *msg,
uint32_t msg_len);
OSStatus UserRecvHandler(void *arg); OSStatus UserRecvHandler(void *arg);
void ProcessHaCmd(char* cmd);
void ProcessHaCmd(char *cmd);
bool isconnect = false; bool isconnect = false;
mico_queue_t mqtt_msg_send_queue = NULL; mico_queue_t mqtt_msg_send_queue = NULL;
@@ -58,97 +62,92 @@ char topic_set[MAX_MQTT_TOPIC_SIZE];
mico_timer_t timer_handle; mico_timer_t timer_handle;
static char timer_status = 0; static char timer_status = 0;
void UserMqttTimerFunc(void *arg)
{ void UserMqttTimerFunc(void *arg) {
LinkStatusTypeDef LinkStatus; LinkStatusTypeDef LinkStatus;
micoWlanGetLinkStatus(&LinkStatus); micoWlanGetLinkStatus(&LinkStatus);
if (LinkStatus.is_connected != 1) if (LinkStatus.is_connected != 1) {
{
mico_stop_timer(&timer_handle); mico_stop_timer(&timer_handle);
return; return;
} }
if (mico_rtos_is_queue_empty(&mqtt_msg_send_queue)) if (mico_rtos_is_queue_empty(&mqtt_msg_send_queue)) {
{
switch (timer_status) switch (timer_status) {
{ case 0:
case 0: UserMqttHassAutoLed();
UserMqttHassAutoLed(); UserMqttHassAutoTotalSocket();
UserMqttHassAutoTotalSocket(); break;
break; case 1:
case 1: case 2:
case 2: case 3:
case 3: case 4:
case 4: case 5:
case 5: case 6:
case 6: UserMqttHassAuto(timer_status);
UserMqttHassAuto(timer_status); break;
break; case 7:
case 7: UserMqttHassAutoPower();
UserMqttHassAutoPower(); break;
break; default:
default: mico_stop_timer(&timer_handle);
mico_stop_timer(&timer_handle); break;
break;
} }
timer_status++; timer_status++;
} }
} }
/* Application entrance */ /* Application entrance */
OSStatus UserMqttInit(void) OSStatus UserMqttInit(void) {
{
OSStatus err = kNoErr; OSStatus err = kNoErr;
sprintf(topic_set, MQTT_CLIENT_SUB_TOPIC1); sprintf(topic_set, MQTT_CLIENT_SUB_TOPIC1);
sprintf(topic_state, MQTT_CLIENT_PUB_TOPIC, str_mac); sprintf(topic_state, MQTT_CLIENT_PUB_TOPIC, str_mac);
//TODO size:0x800 //TODO size:0x800
int mqtt_thread_stack_size = 0x2000; int mqtt_thread_stack_size = 0x2000;
uint32_t mqtt_lib_version = MQTTClientLibVersion(); uint32_t mqtt_lib_version = MQTTClientLibVersion();mqtt_log(
mqtt_log("MQTT client version: [%ld.%ld.%ld]", "MQTT client version: [%ld.%ld.%ld]",
0xFF & (mqtt_lib_version >> 16), 0xFF & (mqtt_lib_version >> 8), 0xFF & mqtt_lib_version); 0xFF & (mqtt_lib_version >> 16), 0xFF & (mqtt_lib_version >> 8),
0xFF & mqtt_lib_version);
/* create mqtt msg send queue */ /* create mqtt msg send queue */
err = mico_rtos_init_queue(&mqtt_msg_send_queue, "mqtt_msg_send_queue", sizeof(p_mqtt_send_msg_t), err = mico_rtos_init_queue(&mqtt_msg_send_queue, "mqtt_msg_send_queue",
MAX_MQTT_SEND_QUEUE_SIZE); sizeof(p_mqtt_send_msg_t),
MAX_MQTT_SEND_QUEUE_SIZE);
require_noerr_action(err, exit, mqtt_log("ERROR: create mqtt msg send queue err=%d.", err)); require_noerr_action(err, exit, mqtt_log("ERROR: create mqtt msg send queue err=%d.", err));
/* start mqtt client */ /* start mqtt client */
err = mico_rtos_create_thread(NULL, MICO_APPLICATION_PRIORITY, "mqtt_client", err = mico_rtos_create_thread(NULL, MICO_APPLICATION_PRIORITY, "mqtt_client",
(mico_thread_function_t) MqttClientThread, (mico_thread_function_t) MqttClientThread,
mqtt_thread_stack_size, 0); mqtt_thread_stack_size, 0);
require_noerr_string(err, exit, "ERROR: Unable to start the mqtt client thread."); require_noerr_string(err, exit, "ERROR: Unable to start the mqtt client thread.");
/* Create a worker thread for user handling MQTT data event */ /* Create a worker thread for user handling MQTT data event */
err = mico_rtos_create_worker_thread(&mqtt_client_worker_thread, MICO_APPLICATION_PRIORITY, 0x800, 5); err = mico_rtos_create_worker_thread(&mqtt_client_worker_thread, MICO_APPLICATION_PRIORITY,
0x800, 5);
require_noerr_string(err, exit, "ERROR: Unable to start the mqtt client worker thread."); require_noerr_string(err, exit, "ERROR: Unable to start the mqtt client worker thread.");
exit: exit:
if (kNoErr != err) mqtt_log("ERROR2, app thread exit err: %d kNoErr[%d]", err, kNoErr); if (kNoErr != err)mqtt_log("ERROR2, app thread exit err: %d kNoErr[%d]", err, kNoErr);
return err; return err;
} }
static OSStatus UserMqttClientRelease(Client *c, Network *n) static OSStatus UserMqttClientRelease(Client *c, Network *n) {
{
OSStatus err = kNoErr; OSStatus err = kNoErr;
if (c->isconnected) MQTTDisconnect(c); if (c->isconnected) MQTTDisconnect(c);
n->disconnect(n); // close connection n->disconnect(n); // close connection
if (MQTT_SUCCESS != MQTTClientDeinit(c)) if (MQTT_SUCCESS != MQTTClientDeinit(c)) { mqtt_log("MQTTClientDeinit failed!");
{
mqtt_log("MQTTClientDeinit failed!");
err = kDeletedErr; err = kDeletedErr;
} }
return err; return err;
} }
// publish msg to mqtt server // publish msg to mqtt server
static OSStatus MqttMsgPublish(Client *c, const char* topic, char qos, char retained, static OSStatus MqttMsgPublish(Client *c, const char *topic, char qos, char retained,
const unsigned char* msg, const unsigned char *msg,
uint32_t msg_len) uint32_t msg_len) {
{
OSStatus err = kUnknownErr; OSStatus err = kUnknownErr;
int ret = 0; int ret = 0;
MQTTMessage publishData = MQTTMessage_publishData_initializer; MQTTMessage publishData = MQTTMessage_publishData_initializer;
@@ -158,19 +157,16 @@ static OSStatus MqttMsgPublish(Client *c, const char* topic, char qos, char reta
// upload data qos0 // upload data qos0
publishData.qos = (enum QoS) qos; publishData.qos = (enum QoS) qos;
publishData.retained = retained; publishData.retained = retained;
publishData.payload = (void*) msg; publishData.payload = (void *) msg;
publishData.payloadlen = msg_len; publishData.payloadlen = msg_len;
ret = MQTTPublish(c, topic, &publishData); ret = MQTTPublish(c, topic, &publishData);
if (MQTT_SUCCESS == ret) if (MQTT_SUCCESS == ret) {
{
err = kNoErr; err = kNoErr;
} else if (MQTT_SOCKET_ERR == ret) } else if (MQTT_SOCKET_ERR == ret) {
{
err = kConnectionErr; err = kConnectionErr;
} else } else {
{
err = kUnknownErr; err = kUnknownErr;
} }
@@ -178,13 +174,12 @@ static OSStatus MqttMsgPublish(Client *c, const char* topic, char qos, char reta
return err; return err;
} }
void MqttClientThread(mico_thread_arg_t arg) void MqttClientThread(mico_thread_arg_t arg) {
{
OSStatus err = kUnknownErr; OSStatus err = kUnknownErr;
int rc = -1; int rc = -1;
fd_set readfds; fd_set readfds;
struct timeval t = { 0, MQTT_YIELD_TMIE * 1000 }; struct timeval t = {0, MQTT_YIELD_TMIE * 1000};
ssl_opts ssl_settings; ssl_opts ssl_settings;
MQTTPacket_connectData connectData = MQTTPacket_connectData_initializer; MQTTPacket_connectData connectData = MQTTPacket_connectData_initializer;
@@ -200,7 +195,8 @@ void MqttClientThread(mico_thread_arg_t arg)
/* create msg send queue event fd */ /* create msg send queue event fd */
msg_send_event_fd = mico_create_event_fd(mqtt_msg_send_queue); msg_send_event_fd = mico_create_event_fd(mqtt_msg_send_queue);
require_action(msg_send_event_fd >= 0, exit, mqtt_log("ERROR: create msg send queue event fd failed!!!")); require_action(msg_send_event_fd >= 0, exit,
mqtt_log("ERROR: create msg send queue event fd failed!!!"));
MQTT_start: MQTT_start:
@@ -208,16 +204,15 @@ void MqttClientThread(mico_thread_arg_t arg)
/* 1. create network connection */ /* 1. create network connection */
ssl_settings.ssl_enable = false; ssl_settings.ssl_enable = false;
LinkStatusTypeDef LinkStatus; LinkStatusTypeDef LinkStatus;
while (1) while (1) {
{
isconnect = false; isconnect = false;
mico_rtos_thread_sleep(3); mico_rtos_thread_sleep(3);
if (MQTT_SERVER[0] < 0x20 || MQTT_SERVER[0] > 0x7f || MQTT_SERVER_PORT < 1) continue; //鏈厤缃甿qtt鏈嶅姟鍣ㄦ椂涓嶈繛鎺<E7B99B> if (MQTT_SERVER[0] < 0x20 || MQTT_SERVER[0] > 0x7f || MQTT_SERVER_PORT < 1)
continue; //鏈厤缃甿qtt鏈嶅姟鍣ㄦ椂涓嶈繛鎺<E7B99B>
micoWlanGetLinkStatus(&LinkStatus); micoWlanGetLinkStatus(&LinkStatus);
if (LinkStatus.is_connected != 1) if (LinkStatus.is_connected != 1) { mqtt_log(
{ "ERROR:WIFI not connect, waiting 3s for connecting and then connecting MQTT ");
mqtt_log("ERROR:WIFI not connect, waiting 3s for connecting and then connecting MQTT ");
mico_rtos_thread_sleep(3); mico_rtos_thread_sleep(3);
continue; continue;
} }
@@ -226,8 +221,7 @@ void MqttClientThread(mico_thread_arg_t arg)
if (rc == MQTT_SUCCESS) break; if (rc == MQTT_SUCCESS) break;
//mqtt_log("ERROR: MQTT network connect err=%d, reconnect after 3s...", rc); //mqtt_log("ERROR: MQTT network connect err=%d, reconnect after 3s...", rc);
} }mqtt_log("MQTT network connect success!");
mqtt_log("MQTT network connect success!");
/* 2. init mqtt client */ /* 2. init mqtt client */
//c.heartbeat_retry_max = 2; //c.heartbeat_retry_max = 2;
@@ -254,14 +248,13 @@ void MqttClientThread(mico_thread_arg_t arg)
/* 4. mqtt client subscribe */ /* 4. mqtt client subscribe */
rc = MQTTSubscribe(&c, topic_set, QOS0, MessageArrived); rc = MQTTSubscribe(&c, topic_set, QOS0, MessageArrived);
require_noerr_string(rc, MQTT_reconnect, "ERROR: MQTT client subscribe err."); require_noerr_string(rc, MQTT_reconnect, "ERROR: MQTT client subscribe err.");mqtt_log(
mqtt_log("MQTT client subscribe success! recv_topic=[%s].", topic_set); "MQTT client subscribe success! recv_topic=[%s].", topic_set);
/*4.1 杩炴帴鎴愬姛鍚庡厛鏇存柊鍙戦<E98D99>佷竴娆℃暟鎹<E69A9F>*/ /*4.1 杩炴帴鎴愬姛鍚庡厛鏇存柊鍙戦<E98D99>佷竴娆℃暟鎹<E69A9F>*/
isconnect = true; isconnect = true;
int i = 0; int i = 0;
for (; i < SOCKET_NUM; i++) for (; i < SOCKET_NUM; i++) {
{
UserMqttSendSocketState(i); UserMqttSendSocketState(i);
} }
@@ -270,8 +263,7 @@ void MqttClientThread(mico_thread_arg_t arg)
mico_init_timer(&timer_handle, 150, UserMqttTimerFunc, &arg); mico_init_timer(&timer_handle, 150, UserMqttTimerFunc, &arg);
mico_start_timer(&timer_handle); mico_start_timer(&timer_handle);
/* 5. client loop for recv msg && keepalive */ /* 5. client loop for recv msg && keepalive */
while (1) while (1) {
{
isconnect = true; isconnect = true;
no_mqtt_msg_exchange = true; no_mqtt_msg_exchange = true;
FD_ZERO(&readfds); FD_ZERO(&readfds);
@@ -280,26 +272,23 @@ void MqttClientThread(mico_thread_arg_t arg)
select(msg_send_event_fd + 1, &readfds, NULL, NULL, &t); select(msg_send_event_fd + 1, &readfds, NULL, NULL, &t);
/* recv msg from server */ /* recv msg from server */
if (FD_ISSET(c.ipstack->my_socket, &readfds)) if (FD_ISSET(c.ipstack->my_socket, &readfds)) {
{
rc = MQTTYield(&c, (int) MQTT_YIELD_TMIE); rc = MQTTYield(&c, (int) MQTT_YIELD_TMIE);
require_noerr(rc, MQTT_reconnect); require_noerr(rc, MQTT_reconnect);
no_mqtt_msg_exchange = false; no_mqtt_msg_exchange = false;
} }
/* recv msg from user worker thread to be sent to server */ /* recv msg from user worker thread to be sent to server */
if (FD_ISSET(msg_send_event_fd, &readfds)) if (FD_ISSET(msg_send_event_fd, &readfds)) {
{ while (mico_rtos_is_queue_empty(&mqtt_msg_send_queue) == false) {
while (mico_rtos_is_queue_empty(&mqtt_msg_send_queue) == false)
{
// get msg from send queue // get msg from send queue
mico_rtos_pop_from_queue(&mqtt_msg_send_queue, &p_send_msg, 0); mico_rtos_pop_from_queue(&mqtt_msg_send_queue, &p_send_msg, 0);
require_string(p_send_msg, exit, "Wrong data point"); require_string(p_send_msg, exit, "Wrong data point");
// send message to server // send message to server
err = MqttMsgPublish(&c, p_send_msg->topic, p_send_msg->qos, p_send_msg->retained, err = MqttMsgPublish(&c, p_send_msg->topic, p_send_msg->qos, p_send_msg->retained,
(const unsigned char*)p_send_msg->data, (const unsigned char *) p_send_msg->data,
p_send_msg->datalen); p_send_msg->datalen);
require_noerr_string(err, MQTT_reconnect, "ERROR: MQTT publish data err"); require_noerr_string(err, MQTT_reconnect, "ERROR: MQTT publish data err");
@@ -311,8 +300,7 @@ void MqttClientThread(mico_thread_arg_t arg)
} }
/* if no msg exchange, we need to check ping msg to keep alive. */ /* if no msg exchange, we need to check ping msg to keep alive. */
if (no_mqtt_msg_exchange) if (no_mqtt_msg_exchange) {
{
rc = keepalive(&c); rc = keepalive(&c);
require_noerr_string(rc, MQTT_reconnect, "ERROR: keepalive err"); require_noerr_string(rc, MQTT_reconnect, "ERROR: keepalive err");
} }
@@ -320,9 +308,9 @@ void MqttClientThread(mico_thread_arg_t arg)
MQTT_reconnect: MQTT_reconnect:
mqtt_log("Disconnect MQTT client, and reconnect after 5s, reason: mqtt_rc = %d, err = %d", rc, err); mqtt_log("Disconnect MQTT client, and reconnect after 5s, reason: mqtt_rc = %d, err = %d", rc, err);
timer_status=100; timer_status = 100;
UserMqttClientRelease(&c, &n); UserMqttClientRelease(&c, &n);
isconnect = false; isconnect = false;
@@ -333,18 +321,16 @@ void MqttClientThread(mico_thread_arg_t arg)
goto MQTT_start; goto MQTT_start;
exit: exit:
isconnect = false; isconnect = false;mqtt_log("EXIT: MQTT client exit with err = %d.", err);
mqtt_log("EXIT: MQTT client exit with err = %d.", err);
UserMqttClientRelease(&c, &n); UserMqttClientRelease(&c, &n);
mico_rtos_delete_thread(NULL); mico_rtos_delete_thread(NULL);
} }
// callback, msg received from mqtt server // callback, msg received from mqtt server
static void MessageArrived(MessageData* md) static void MessageArrived(MessageData *md) {
{
OSStatus err = kUnknownErr; OSStatus err = kUnknownErr;
p_mqtt_recv_msg_t p_recv_msg = NULL; p_mqtt_recv_msg_t p_recv_msg = NULL;
MQTTMessage* message = md->message; MQTTMessage *message = md->message;
p_recv_msg = (p_mqtt_recv_msg_t) calloc(1, sizeof(mqtt_recv_msg_t)); p_recv_msg = (p_mqtt_recv_msg_t) calloc(1, sizeof(mqtt_recv_msg_t));
require_action(p_recv_msg, exit, err = kNoMemoryErr); require_action(p_recv_msg, exit, err = kNoMemoryErr);
@@ -356,26 +342,25 @@ static void MessageArrived(MessageData* md)
memcpy(p_recv_msg->data, message->payload, message->payloadlen); memcpy(p_recv_msg->data, message->payload, message->payloadlen);
mqtt_log("MessageArrived topic[%s] data[%s]", p_recv_msg->topic, p_recv_msg->data); mqtt_log("MessageArrived topic[%s] data[%s]", p_recv_msg->topic, p_recv_msg->data);
err = mico_rtos_send_asynchronous_event(&mqtt_client_worker_thread, UserRecvHandler, p_recv_msg); err = mico_rtos_send_asynchronous_event(&mqtt_client_worker_thread, UserRecvHandler,
p_recv_msg);
require_noerr(err, exit); require_noerr(err, exit);
exit: exit:
if (err != kNoErr) if (err != kNoErr) { mqtt_log("ERROR: Recv data err = %d", err);
{
mqtt_log("ERROR: Recv data err = %d", err);
if (p_recv_msg) free(p_recv_msg); if (p_recv_msg) free(p_recv_msg);
} }
return; return;
} }
/* Application process MQTT received data */ /* Application process MQTT received data */
OSStatus UserRecvHandler(void *arg) OSStatus UserRecvHandler(void *arg) {
{
OSStatus err = kUnknownErr; OSStatus err = kUnknownErr;
p_mqtt_recv_msg_t p_recv_msg = arg; p_mqtt_recv_msg_t p_recv_msg = arg;
require(p_recv_msg, exit); require(p_recv_msg, exit);
mqtt_log("user get data success! from_topic=[%s], msg=[%ld].", p_recv_msg->topic, p_recv_msg->datalen); mqtt_log("user get data success! from_topic=[%s], msg=[%ld].", p_recv_msg->topic,
p_recv_msg->datalen);
//UserFunctionCmdReceived(0, p_recv_msg->data); //UserFunctionCmdReceived(0, p_recv_msg->data);
ProcessHaCmd(p_recv_msg->data); ProcessHaCmd(p_recv_msg->data);
@@ -386,43 +371,37 @@ OSStatus UserRecvHandler(void *arg)
return err; return err;
} }
void ProcessHaCmd(char* cmd) void ProcessHaCmd(char *cmd) {
{
mqtt_log("ProcessHaCmd[%s]", cmd); mqtt_log("ProcessHaCmd[%s]", cmd);
char mac[20] = { 0 }; char mac[20] = {0};
if (strcmp(cmd, "set socket") == ' ') if (strcmp(cmd, "set socket") == ' ') {
{
int i, on; int i, on;
sscanf(cmd, "set socket %s %d %d", mac, &i, &on); sscanf(cmd, "set socket %s %d %d", mac, &i, &on);
if (strcmp(mac, str_mac)) return; if (strcmp(mac, str_mac)) return;mqtt_log("set socket[%d] on[%d]", i, on);
mqtt_log("set socket[%d] on[%d]", i, on);
UserRelaySet(i, on); UserRelaySet(i, on);
UserMqttSendSocketState(i); UserMqttSendSocketState(i);
UserMqttSendTotalSocketState(); UserMqttSendTotalSocketState();
mico_system_context_update(sys_config); mico_system_context_update(sys_config);
}else if(strcmp(cmd, "set led") == ' '){ } else if (strcmp(cmd, "set led") == ' ') {
int on; int on;
sscanf(cmd, "set led %s %d", mac, &on); sscanf(cmd, "set led %s %d", mac, &on);
if (strcmp(mac, str_mac)) return; if (strcmp(mac, str_mac)) return;mqtt_log("set led on[%d]", on);
mqtt_log("set led on[%d]", on); user_config->power_led_enabled = on;
user_config->power_led_enabled = on; if (RelayOut() && user_config->power_led_enabled) {
if (RelayOut() && user_config->power_led_enabled) { UserLedSet(1);
UserLedSet(1); } else {
} else { UserLedSet(0);
UserLedSet(0); }
} UserMqttSendLedState();
UserMqttSendLedState(); mico_system_context_update(sys_config);
mico_system_context_update(sys_config); } else if (strcmp(cmd, "set total_socket") == ' ') {
}else if(strcmp(cmd, "set total_socket") == ' '){
int on; int on;
sscanf(cmd, "set total_socket %s %d", mac, &on); sscanf(cmd, "set total_socket %s %d", mac, &on);
if (strcmp(mac, str_mac)) return; if (strcmp(mac, str_mac)) return;mqtt_log("set total_socket on[%d]", on);
mqtt_log("set total_socket on[%d]", on);
UserRelaySetAll(on); UserRelaySetAll(on);
int i =0; int i = 0;
for (i = 0; i < SOCKET_NUM; i++) for (i = 0; i < SOCKET_NUM; i++) {
{
UserRelaySet(i, user_config->socket_status[i]); UserRelaySet(i, user_config->socket_status[i]);
UserMqttSendSocketState(i); UserMqttSendSocketState(i);
} }
@@ -430,16 +409,14 @@ void ProcessHaCmd(char* cmd)
} }
} }
OSStatus UserMqttSendTopic(char *topic, char *arg, char retained) OSStatus UserMqttSendTopic(char *topic, char *arg, char retained) {
{
OSStatus err = kUnknownErr; OSStatus err = kUnknownErr;
p_mqtt_send_msg_t p_send_msg = NULL; p_mqtt_send_msg_t p_send_msg = NULL;
// mqtt_log("======App prepare to send ![%d]======", MicoGetMemoryInfo()->free_memory); // mqtt_log("======App prepare to send ![%d]======", MicoGetMemoryInfo()->free_memory);
/* Send queue is full, pop the oldest */ /* Send queue is full, pop the oldest */
if (mico_rtos_is_queue_full(&mqtt_msg_send_queue) == true) if (mico_rtos_is_queue_full(&mqtt_msg_send_queue) == true) {
{
mico_rtos_pop_from_queue(&mqtt_msg_send_queue, &p_send_msg, 0); mico_rtos_pop_from_queue(&mqtt_msg_send_queue, &p_send_msg, 0);
free(p_send_msg); free(p_send_msg);
p_send_msg = NULL; p_send_msg = NULL;
@@ -466,21 +443,19 @@ OSStatus UserMqttSendTopic(char *topic, char *arg, char retained)
} }
/* Application collect data and seng them to MQTT send queue */ /* Application collect data and seng them to MQTT send queue */
OSStatus UserMqttSend(char *arg) OSStatus UserMqttSend(char *arg) {
{
return UserMqttSendTopic(topic_state, arg, 0); return UserMqttSendTopic(topic_state, arg, 0);
} }
//鏇存柊ha寮<61>鍏崇姸鎬<E5A7B8> //鏇存柊ha寮<61>鍏崇姸鎬<E5A7B8>
OSStatus UserMqttSendSocketState(char socket_id) OSStatus UserMqttSendSocketState(char socket_id) {
{
char *send_buf = malloc(64); char *send_buf = malloc(64);
char *topic_buf = malloc(64); char *topic_buf = malloc(64);
OSStatus oss_status = kUnknownErr; OSStatus oss_status = kUnknownErr;
if (send_buf != NULL && topic_buf != NULL) if (send_buf != NULL && topic_buf != NULL) {
{ sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/state", str_mac, (int) socket_id);
sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/state", str_mac, (int)socket_id); sprintf(send_buf, "set socket %s %d %d", str_mac, socket_id,
sprintf(send_buf, "set socket %s %d %d", str_mac, socket_id, (int)user_config->socket_status[(int)socket_id]); (int) user_config->socket_status[(int) socket_id]);
oss_status = UserMqttSendTopic(topic_buf, send_buf, 1); oss_status = UserMqttSendTopic(topic_buf, send_buf, 1);
} }
if (send_buf) free(send_buf); if (send_buf) free(send_buf);
@@ -489,15 +464,13 @@ OSStatus UserMqttSendSocketState(char socket_id)
return oss_status; return oss_status;
} }
OSStatus UserMqttSendTotalSocketState(void) OSStatus UserMqttSendTotalSocketState(void) {
{
char *send_buf = malloc(64); char *send_buf = malloc(64);
char *topic_buf = malloc(64); char *topic_buf = malloc(64);
OSStatus oss_status = kUnknownErr; OSStatus oss_status = kUnknownErr;
if (send_buf != NULL && topic_buf != NULL) if (send_buf != NULL && topic_buf != NULL) {
{
sprintf(topic_buf, "homeassistant/switch/%s/total_socket/state", str_mac); sprintf(topic_buf, "homeassistant/switch/%s/total_socket/state", str_mac);
sprintf(send_buf, "set total_socket %s %d", str_mac, RelayOut()?1:0); sprintf(send_buf, "set total_socket %s %d", str_mac, RelayOut() ? 1 : 0);
oss_status = UserMqttSendTopic(topic_buf, send_buf, 1); oss_status = UserMqttSendTopic(topic_buf, send_buf, 1);
} }
if (send_buf) free(send_buf); if (send_buf) free(send_buf);
@@ -506,15 +479,13 @@ OSStatus UserMqttSendTotalSocketState(void)
return oss_status; return oss_status;
} }
OSStatus UserMqttSendLedState(void) OSStatus UserMqttSendLedState(void) {
{
char *send_buf = malloc(64); char *send_buf = malloc(64);
char *topic_buf = malloc(64); char *topic_buf = malloc(64);
OSStatus oss_status = kUnknownErr; OSStatus oss_status = kUnknownErr;
if (send_buf != NULL && topic_buf != NULL) if (send_buf != NULL && topic_buf != NULL) {
{
sprintf(topic_buf, "homeassistant/switch/%s/led/state", str_mac); sprintf(topic_buf, "homeassistant/switch/%s/led/state", str_mac);
sprintf(send_buf, "set led %s %d", str_mac, (int)user_config->power_led_enabled); sprintf(send_buf, "set led %s %d", str_mac, (int) user_config->power_led_enabled);
oss_status = UserMqttSendTopic(topic_buf, send_buf, 1); oss_status = UserMqttSendTopic(topic_buf, send_buf, 1);
} }
if (send_buf) free(send_buf); if (send_buf) free(send_buf);
@@ -524,29 +495,28 @@ OSStatus UserMqttSendLedState(void)
} }
//hass mqtt鑷姩鍙戠幇鏁版嵁寮<E5B581>鍏冲彂閫<E5BD82> //hass mqtt鑷姩鍙戠幇鏁版嵁寮<E5B581>鍏冲彂閫<E5BD82>
void UserMqttHassAuto(char socket_id) void UserMqttHassAuto(char socket_id) {
{
socket_id--; socket_id--;
char *send_buf = NULL; char *send_buf = NULL;
char *topic_buf = NULL; char *topic_buf = NULL;
send_buf = (char *) malloc(1024); send_buf = (char *) malloc(1024);
topic_buf = (char *) malloc(64); topic_buf = (char *) malloc(64);
if (send_buf != NULL && topic_buf != NULL) if (send_buf != NULL && topic_buf != NULL) {
{
sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/config", str_mac, socket_id); sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/config", str_mac, socket_id);
sprintf(send_buf, sprintf(send_buf,
"{\"name\":\"TC1_%s_Socket_%d\"," "{\"name\":\"TC1_%s_Socket_%d\","
"\"uniq_id\":\"%s_s%d\"," "\"uniq_id\":\"%s_s%d\","
"\"stat_t\":\"homeassistant/switch/%s/socket_%d/state\"," "\"stat_t\":\"homeassistant/switch/%s/socket_%d/state\","
"\"cmd_t\":\"device/ztc1/set\"," "\"cmd_t\":\"device/ztc1/set\","
"\"pl_on\":\"set socket %s %d 1\"," "\"pl_on\":\"set socket %s %d 1\","
"\"pl_off\":\"set socket %s %d 0\"," "\"pl_off\":\"set socket %s %d 0\","
"\"device\":{" "\"device\":{"
"\"identifiers\":[\"tc1_%s\"]," "\"identifiers\":[\"tc1_%s\"],"
"\"name\":\"TC1_%s\"," "\"name\":\"TC1_%s\","
"\"model\":\"TC1\"," "\"model\":\"TC1\","
"\"manufacturer\":\"PHICOMM\"}}", "\"manufacturer\":\"PHICOMM\"}}",
str_mac+8, socket_id+1, str_mac, socket_id, str_mac, socket_id, str_mac, socket_id, str_mac, socket_id, str_mac, str_mac); str_mac + 8, socket_id + 1, str_mac, socket_id, str_mac, socket_id, str_mac,
socket_id, str_mac, socket_id, str_mac, str_mac);
UserMqttSendTopic(topic_buf, send_buf, 1); UserMqttSendTopic(topic_buf, send_buf, 1);
} }
if (send_buf) if (send_buf)
@@ -555,28 +525,26 @@ void UserMqttHassAuto(char socket_id)
free(topic_buf); free(topic_buf);
} }
void UserMqttHassAutoLed(void) void UserMqttHassAutoLed(void) {
{
char *send_buf = NULL; char *send_buf = NULL;
char *topic_buf = NULL; char *topic_buf = NULL;
send_buf = (char *) malloc(1024); send_buf = (char *) malloc(1024);
topic_buf = (char *) malloc(64); topic_buf = (char *) malloc(64);
if (send_buf != NULL && topic_buf != NULL) if (send_buf != NULL && topic_buf != NULL) {
{ sprintf(topic_buf, "homeassistant/switch/%s/led/config", str_mac);
sprintf(topic_buf, "homeassistant/switch/%s/led/config", str_mac); sprintf(send_buf,
sprintf(send_buf, "{\"name\":\"TC1_%s_Led\","
"{\"name\":\"TC1_%s_Led\"," "\"uniq_id\":\"%s_led\","
"\"uniq_id\":\"%s_led\"," "\"stat_t\":\"homeassistant/switch/%s/led/state\","
"\"stat_t\":\"homeassistant/switch/%s/led/state\"," "\"cmd_t\":\"device/ztc1/set\","
"\"cmd_t\":\"device/ztc1/set\"," "\"pl_on\":\"set led %s 1\","
"\"pl_on\":\"set led %s 1\"," "\"pl_off\":\"set led %s 0\","
"\"pl_off\":\"set led %s 0\"," "\"device\":{"
"\"device\":{" "\"identifiers\":[\"tc1_%s\"],"
"\"identifiers\":[\"tc1_%s\"]," "\"name\":\"TC1_%s\","
"\"name\":\"TC1_%s\"," "\"model\":\"TC1\","
"\"model\":\"TC1\"," "\"manufacturer\":\"PHICOMM\"}}",
"\"manufacturer\":\"PHICOMM\"}}", str_mac + 8, str_mac, str_mac, str_mac, str_mac, str_mac, str_mac);
str_mac+8, str_mac, str_mac, str_mac,str_mac, str_mac, str_mac);
UserMqttSendTopic(topic_buf, send_buf, 1); UserMqttSendTopic(topic_buf, send_buf, 1);
} }
if (send_buf) if (send_buf)
@@ -584,14 +552,13 @@ void UserMqttHassAutoLed(void)
if (topic_buf) if (topic_buf)
free(topic_buf); free(topic_buf);
} }
void UserMqttHassAutoTotalSocket(void)
{ void UserMqttHassAutoTotalSocket(void) {
char *send_buf = NULL; char *send_buf = NULL;
char *topic_buf = NULL; char *topic_buf = NULL;
send_buf = (char *) malloc(1024); send_buf = (char *) malloc(1024);
topic_buf = (char *) malloc(64); topic_buf = (char *) malloc(64);
if (send_buf != NULL && topic_buf != NULL) if (send_buf != NULL && topic_buf != NULL) {
{
sprintf(topic_buf, "homeassistant/switch/%s/total_socket/config", str_mac); sprintf(topic_buf, "homeassistant/switch/%s/total_socket/config", str_mac);
sprintf(send_buf, sprintf(send_buf,
"{\"name\":\"TC1_%s_TotalSocket\"," "{\"name\":\"TC1_%s_TotalSocket\","
@@ -605,7 +572,7 @@ void UserMqttHassAutoTotalSocket(void)
"\"name\":\"TC1_%s\"," "\"name\":\"TC1_%s\","
"\"model\":\"TC1\"," "\"model\":\"TC1\","
"\"manufacturer\":\"PHICOMM\"}}", "\"manufacturer\":\"PHICOMM\"}}",
str_mac+8, str_mac, str_mac, str_mac,str_mac, str_mac, str_mac); str_mac + 8, str_mac, str_mac, str_mac, str_mac, str_mac, str_mac);
UserMqttSendTopic(topic_buf, send_buf, 1); UserMqttSendTopic(topic_buf, send_buf, 1);
} }
if (send_buf) if (send_buf)
@@ -615,83 +582,81 @@ void UserMqttHassAutoTotalSocket(void)
} }
//hass mqtt鑷姩鍙戠幇鏁版嵁鍔熺巼鍙戦<E98D99><E688A6> //hass mqtt鑷姩鍙戠幇鏁版嵁鍔熺巼鍙戦<E98D99><E688A6>
void UserMqttHassAutoPower(void) void UserMqttHassAutoPower(void) {
{
char *send_buf = NULL; char *send_buf = NULL;
char *topic_buf = NULL; char *topic_buf = NULL;
send_buf = malloc(1024); send_buf = malloc(1024);
topic_buf = malloc(128); topic_buf = malloc(128);
if (send_buf != NULL && topic_buf != NULL) if (send_buf != NULL && topic_buf != NULL) {
{
sprintf(topic_buf, "homeassistant/sensor/%s/power/config", str_mac); sprintf(topic_buf, "homeassistant/sensor/%s/power/config", str_mac);
sprintf(send_buf, sprintf(send_buf,
"{\"name\":\"TC1_%s_Power\"," "{\"name\":\"TC1_%s_Power\","
"\"uniq_id\":\"%s_p\"," "\"uniq_id\":\"%s_p\","
"\"state_topic\":\"homeassistant/sensor/%s/power/state\"," "\"state_topic\":\"homeassistant/sensor/%s/power/state\","
"\"unit_of_measurement\":\"W\"," "\"unit_of_measurement\":\"W\","
"\"icon\":\"mdi:gauge\"," "\"icon\":\"mdi:gauge\","
"\"value_template\":\"{{ value_json.power }}\",""\"device\":{" "\"value_template\":\"{{ value_json.power }}\",""\"device\":{"
"\"identifiers\":[\"tc1_%s\"]," "\"identifiers\":[\"tc1_%s\"],"
"\"name\":\"TC1_%s\"," "\"name\":\"TC1_%s\","
"\"model\":\"TC1\"," "\"model\":\"TC1\","
"\"manufacturer\":\"PHICOMM\"}}", "\"manufacturer\":\"PHICOMM\"}}",
str_mac+8, str_mac, str_mac, str_mac, str_mac); str_mac + 8, str_mac, str_mac, str_mac, str_mac);
UserMqttSendTopic(topic_buf, send_buf, 1); UserMqttSendTopic(topic_buf, send_buf, 1);
sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumption/config", str_mac); sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumption/config", str_mac);
sprintf(send_buf, sprintf(send_buf,
"{\"name\":\"TC1_%s_PowerConsumption\"," "{\"name\":\"TC1_%s_PowerConsumption\","
"\"uniq_id\":\"%s_pc\"," "\"uniq_id\":\"%s_pc\","
"\"state_topic\":\"homeassistant/sensor/%s/powerConsumption/state\"," "\"state_topic\":\"homeassistant/sensor/%s/powerConsumption/state\","
"\"unit_of_measurement\":\"kWh\"," "\"unit_of_measurement\":\"kWh\","
"\"icon\":\"mdi:fence-electric\"," "\"icon\":\"mdi:fence-electric\","
"\"value_template\":\"{{ value_json.powerConsumption }}\",""\"device\":{" "\"value_template\":\"{{ value_json.powerConsumption }}\",""\"device\":{"
"\"identifiers\":[\"tc1_%s\"]," "\"identifiers\":[\"tc1_%s\"],"
"\"name\":\"TC1_%s\"," "\"name\":\"TC1_%s\","
"\"model\":\"TC1\"," "\"model\":\"TC1\","
"\"manufacturer\":\"PHICOMM\"}}", "\"manufacturer\":\"PHICOMM\"}}",
str_mac+8, str_mac, str_mac, str_mac, str_mac); str_mac + 8, str_mac, str_mac, str_mac, str_mac);
UserMqttSendTopic(topic_buf, send_buf, 1); UserMqttSendTopic(topic_buf, send_buf, 1);
sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionToday/config", str_mac); sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionToday/config", str_mac);
sprintf(send_buf, sprintf(send_buf,
"{\"name\":\"TC1_%s_powerConsumptionToday\"," "{\"name\":\"TC1_%s_powerConsumptionToday\","
"\"uniq_id\":\"%s_pc_today\"," "\"uniq_id\":\"%s_pc_today\","
"\"state_topic\":\"homeassistant/sensor/%s/powerConsumptionToday/state\"," "\"state_topic\":\"homeassistant/sensor/%s/powerConsumptionToday/state\","
"\"unit_of_measurement\":\"kWh\"," "\"unit_of_measurement\":\"kWh\","
"\"icon\":\"mdi:fence-electric\"," "\"icon\":\"mdi:fence-electric\","
"\"value_template\":\"{{ value_json.powerConsumptionToday }}\",""\"device\":{" "\"value_template\":\"{{ value_json.powerConsumptionToday }}\",""\"device\":{"
"\"identifiers\":[\"tc1_%s\"]," "\"identifiers\":[\"tc1_%s\"],"
"\"name\":\"TC1_%s\"," "\"name\":\"TC1_%s\","
"\"model\":\"TC1\"," "\"model\":\"TC1\","
"\"manufacturer\":\"PHICOMM\"}}", "\"manufacturer\":\"PHICOMM\"}}",
str_mac+8, str_mac, str_mac, str_mac, str_mac); str_mac + 8, str_mac, str_mac, str_mac, str_mac);
UserMqttSendTopic(topic_buf, send_buf, 1); UserMqttSendTopic(topic_buf, send_buf, 1);
sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionYesterday/config", str_mac); sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionYesterday/config", str_mac);
sprintf(send_buf, sprintf(send_buf,
"{\"name\":\"TC1_%s_powerConsumptionYesterday\"," "{\"name\":\"TC1_%s_powerConsumptionYesterday\","
"\"uniq_id\":\"%s_pc_yesterday\"," "\"uniq_id\":\"%s_pc_yesterday\","
"\"state_topic\":\"homeassistant/sensor/%s/powerConsumptionYesterday/state\"," "\"state_topic\":\"homeassistant/sensor/%s/powerConsumptionYesterday/state\","
"\"unit_of_measurement\":\"kWh\"," "\"unit_of_measurement\":\"kWh\","
"\"icon\":\"mdi:fence-electric\"," "\"icon\":\"mdi:fence-electric\","
"\"value_template\":\"{{ value_json.powerConsumptionYesterday }}\",""\"device\":{" "\"value_template\":\"{{ value_json.powerConsumptionYesterday }}\",""\"device\":{"
"\"identifiers\":[\"tc1_%s\"]," "\"identifiers\":[\"tc1_%s\"],"
"\"name\":\"TC1_%s\"," "\"name\":\"TC1_%s\","
"\"model\":\"TC1\"," "\"model\":\"TC1\","
"\"manufacturer\":\"PHICOMM\"}}", "\"manufacturer\":\"PHICOMM\"}}",
str_mac+8, str_mac, str_mac, str_mac, str_mac); str_mac + 8, str_mac, str_mac, str_mac, str_mac);
UserMqttSendTopic(topic_buf, send_buf, 1); UserMqttSendTopic(topic_buf, send_buf, 1);
} }
if (send_buf) free(send_buf); if (send_buf) free(send_buf);
if (topic_buf) free(topic_buf); if (topic_buf) free(topic_buf);
} }
char topic_buf[128] = { 0 }; char topic_buf[128] = {0};
char send_buf[128] = { 0 }; char send_buf[128] = {0};
void UserMqttHassPower(void)
{ void UserMqttHassPower(void) {
sprintf(topic_buf, "homeassistant/sensor/%s/power/state", str_mac); sprintf(topic_buf, "homeassistant/sensor/%s/power/state", str_mac);
sprintf(send_buf, "{\"power\":\"%.3f\"}", real_time_power/10); sprintf(send_buf, "{\"power\":\"%.3f\"}", real_time_power / 10);
UserMqttSendTopic(topic_buf, send_buf, 0); UserMqttSendTopic(topic_buf, send_buf, 0);
sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumption/state", str_mac); sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumption/state", str_mac);
@@ -700,15 +665,24 @@ void UserMqttHassPower(void)
// tc1_log("p_count %ld, p_count_1_day_ago %ld ,p_count_2_days_ago %ld, result %ld",p_count,user_config->p_count_1_day_ago,user_config->p_count_2_days_ago,((p_count-user_config->p_count_1_day_ago)<0?0:(p_count-user_config->p_count_1_day_ago))); // tc1_log("p_count %ld, p_count_1_day_ago %ld ,p_count_2_days_ago %ld, result %ld",p_count,user_config->p_count_1_day_ago,user_config->p_count_2_days_ago,((p_count-user_config->p_count_1_day_ago)<0?0:(p_count-user_config->p_count_1_day_ago)));
sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionToday/state", str_mac); sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionToday/state", str_mac);
sprintf(send_buf, "{\"powerConsumptionToday\":\"%.3f\"}", (17.1 * ((p_count-user_config->p_count_1_day_ago)<0?0:(p_count-user_config->p_count_1_day_ago))) / 1000 / 36000); sprintf(send_buf, "{\"powerConsumptionToday\":\"%.3f\"}", (17.1 * ((p_count -
user_config->p_count_1_day_ago) <
0 ? 0 : (p_count -
user_config->p_count_1_day_ago))) /
1000 / 36000);
UserMqttSendTopic(topic_buf, send_buf, 0); UserMqttSendTopic(topic_buf, send_buf, 0);
sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionYesterday/state", str_mac); sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionYesterday/state", str_mac);
sprintf(send_buf, "{\"powerConsumptionYesterday\":\"%.3f\"}", (17.1 * ((user_config->p_count_1_day_ago-user_config->p_count_2_days_ago)<0?0:(user_config->p_count_1_day_ago-user_config->p_count_2_days_ago))) / 1000 / 36000); sprintf(send_buf, "{\"powerConsumptionYesterday\":\"%.3f\"}", (17.1 *
((user_config->p_count_1_day_ago -
user_config->p_count_2_days_ago) <
0 ? 0 : (
user_config->p_count_1_day_ago -
user_config->p_count_2_days_ago))) /
1000 / 36000);
UserMqttSendTopic(topic_buf, send_buf, 0); UserMqttSendTopic(topic_buf, send_buf, 0);
} }
bool UserMqttIsConnect() bool UserMqttIsConnect() {
{
return isconnect; return isconnect;
} }

2
TC1/mqtt_server/user_mqtt_client.h
View File

@@ -41,4 +41,6 @@ extern void UserMqttHassAutoPower(void);
extern void UserMqttHassAutoLed(void); extern void UserMqttHassAutoLed(void);
extern void UserMqttHassAutoTotalSocket(void);
#endif #endif