# HG changeset patch # User Michiel Broek # Date 1680420800 -7200 # Node ID eee990609da7fa712911b28496b98663cb76163a # Parent 1659bd3c7a2b93048a8b3dd94753133fa018c083 Fixed start of json status message. diff -r 1659bd3c7a2b -r eee990609da7 main/task_mqtt.c --- a/main/task_mqtt.c Sat Apr 01 21:06:59 2023 +0200 +++ b/main/task_mqtt.c Sun Apr 02 09:33:20 2023 +0200 @@ -80,20 +80,6 @@ /** - * @brief Generate the mqtt payload header. - * @return Allocated character string with the header. - */ -char *payload_header(void) -{ - char *tmp; - - tmp = xstrcpy((char *)"{\"metric\":"); - return tmp; -} - - - -/** * @brief Generate the mqtt topic base part. * @return The topic string allocated in memory. */ @@ -149,9 +135,8 @@ const esp_app_desc_t *app_desc = esp_app_get_description(); // {"system":{"battery":70,"alarm":0,"version":"0.2.6","rssi":-56,"wifi":88,"light":{"lux":12.34,"gain":2}},"solar":{"voltage":13.98,"current":234.1,"power":3.272718},"battery":{"voltage":13.21,"current":4.942289,"power":0.065288},"real":{"current":229.1577},"TH":{"temperature":20.2,"humidity":48.3},"output":{"relay1":0,"relay2":0,"dimmer3":0,"dimmer4":0}} - // - payload = payload_header(); - payload = xstrcat(payload, (char *)"{\"system\":{\"battery\":"); + // {"system":{"battery":40,"alarm":0,"version":"0.3.1","rssi":-77,"wifi":46,"light":{"lux":0.1,"gain":3,"agl":0}},"solar":{"voltage":0.31,"current":0,"power":0},"battery":{"voltage":12.27,"current":53.5,"power":0.657},"real":{"current":-53.5},"TH":{"temperature":8.88,"humidity":0},"output":{"relay1":0,"relay2":0,"dimmer3":90,"dimmer4":80}} + payload = xstrcpy((char *)"{\"system\":{\"battery\":"); sprintf(buf, "%.0f", batteryState); payload = xstrcat(payload, buf); payload = xstrcat(payload, (char *)",\"alarm\":");