Klagarge/MSE-SoftwEng
1
0
Fork 0
Code Issues Pull Requests Releases Activity

feat(pico-sensor): added callback in mqtt client to process incomming messages in application

Browse Source
This commit is contained in:
SylvanArnold
2025-05-20 09:52:21 +02:00
committed by Klagarge
parent 257788e1d7
commit 5595d47e3f
3 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
pico-sensor/src/mqtt_client.c
View File

@@ -39,20 +39,6 @@
#define TOPIC_NAME_CHARGER_CHARGING_POWER "home/charger/power"
#endif
typedef enum topic_ID_e {
Topic_ID_None,
#if MQTT_CLIENT_IS_EV_CHARGER
Topic_ID_Solar_Power, /* power from PV panels */
Topic_ID_Site_Power, /* power to the house/site */
Topic_ID_Grid_Power, /* power from/to grid */
Topic_ID_Battery_Power, /* power from/to battery */
Topic_ID_Battery_Percentage,/* battery level percentage */
Topic_ID_Charging_Power, /* actual charging power */
#elif MQTT_CLIENT_IS_SENSOR
Topic_ID_Sensor_Update,
#endif
} topic_ID_e;
/* default entries for the MQTT broker connection */
#define MQTT_DEFAULT_BROKER "homeassistant"
#define MQTT_DEFAULT_CLIENT "client"
@@ -91,6 +77,13 @@ static const struct mqtt_connect_client_info_t mqtt_client_info = {
#endif
};
// Static variable to hold the callback pointer
static MqttClient_MessageCallback_t app_message_callback = NULL;
void MqttClient_RegisterMessageCallback(MqttClient_MessageCallback_t cb) {
app_message_callback = cb;
}
static void mqtt_publish_request_cb(void *arg, err_t err) {
#if 0 && MQTT_EXTRA_LOGS
const struct mqtt_connect_client_info_t *client_info = (const struct mqtt_connect_client_info_t*)arg;
@@ -275,8 +268,8 @@ static void mqtt_incoming_data_cb(void *arg, const u8_t *data, u16_t len, u8_t f
McuLog_trace("bat%%: %s%%", buf);
}
#elif MQTT_CLIENT_IS_SENSOR
if (mqtt.in_pub_ID == Topic_ID_Sensor_Update) {
McuLog_trace("Sensor update");
if (app_message_callback != NULL) {
app_message_callback(mqtt.in_pub_ID, data, len);
#endif
} else {
McuLog_trace("mqtt_incoming_data_cb: Ignoring payload...");
@@ -381,7 +374,15 @@ static void mqtt_connection_cb(mqtt_client_t *client, void *arg, mqtt_connection
McuLog_error("failed subscribing, err %d", err);
}
#elif MQTT_CLIENT_IS_SENSOR
/* no subscriptions */
err = mqtt_sub_unsub(client,
"<user>/<room>/<device>/command/new_measure",
1, /* quality of service */
mqtt_request_cb, // Callback to call when subscribe/unsubscribe response is received
LWIP_CONST_CAST(void*, client_info),
1); // 1 for subscribe, 0 for unsubscribe
if (err!=ERR_OK) {
McuLog_error("failed subscribing, err %d", err);
}
#endif
} else if (status==MQTT_CONNECT_DISCONNECTED) {
McuLog_trace("MQTT connect disconnect");