comparison: main/task_mqtt.c
main/task_mqtt.c
- changeset 10
- eee990609da7
- parent 9
- 1659bd3c7a2b
- child 12
- bb72d448e282
equal
deleted
inserted
replaced
| 9:1659bd3c7a2b | 10:eee990609da7 |
|---|---|
| 78 } | 78 } |
| 79 | 79 |
| 80 | 80 |
| 81 | 81 |
| 82 /** | 82 /** |
| 83 * @brief Generate the mqtt payload header. | |
| 84 * @return Allocated character string with the header. | |
| 85 */ | |
| 86 char *payload_header(void) | |
| 87 { | |
| 88 char *tmp; | |
| 89 | |
| 90 tmp = xstrcpy((char *)"{\"metric\":"); | |
| 91 return tmp; | |
| 92 } | |
| 93 | |
| 94 | |
| 95 | |
| 96 /** | |
| 97 * @brief Generate the mqtt topic base part. | 83 * @brief Generate the mqtt topic base part. |
| 98 * @return The topic string allocated in memory. | 84 * @return The topic string allocated in memory. |
| 99 */ | 85 */ |
| 100 char *topic_base(void) | 86 char *topic_base(void) |
| 101 { | 87 { |
| 147 { | 133 { |
| 148 char *topic = NULL, *payload = NULL, buf[64]; | 134 char *topic = NULL, *payload = NULL, buf[64]; |
| 149 const esp_app_desc_t *app_desc = esp_app_get_description(); | 135 const esp_app_desc_t *app_desc = esp_app_get_description(); |
| 150 | 136 |
| 151 // {"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}} | 137 // {"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}} |
| 152 // | 138 // {"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}} |
| 153 payload = payload_header(); | 139 payload = xstrcpy((char *)"{\"system\":{\"battery\":"); |
| 154 payload = xstrcat(payload, (char *)"{\"system\":{\"battery\":"); | |
| 155 sprintf(buf, "%.0f", batteryState); | 140 sprintf(buf, "%.0f", batteryState); |
| 156 payload = xstrcat(payload, buf); | 141 payload = xstrcat(payload, buf); |
| 157 payload = xstrcat(payload, (char *)",\"alarm\":"); | 142 payload = xstrcat(payload, (char *)",\"alarm\":"); |
| 158 sprintf(buf, "%ld", Alarm); | 143 sprintf(buf, "%ld", Alarm); |
| 159 payload = xstrcat(payload, buf); | 144 payload = xstrcat(payload, buf); |
