Mercurial > mbsePi-apps / file comparison
comparison: thermferm/mqtt.c
thermferm/mqtt.c
- changeset 544
- e2889b17f48c
- parent 543
- 34e19966114b
- child 545
- c382a6c58c20
equal
deleted
inserted
replaced
| 543:34e19966114b | 544:e2889b17f48c |
|---|---|
| 531 payload = xstrcat(payload, (char *)"{"); | 531 payload = xstrcat(payload, (char *)"{"); |
| 532 | 532 |
| 533 if (birth) { | 533 if (birth) { |
| 534 payload = xstrcat(payload, (char *)"\"uuid\":\""); | 534 payload = xstrcat(payload, (char *)"\"uuid\":\""); |
| 535 payload = xstrcat(payload, Config.uuid); | 535 payload = xstrcat(payload, Config.uuid); |
| 536 payload = xstrcat(payload, (char *)"\""); | 536 payload = xstrcat(payload, (char *)"\","); |
| 537 // comma = true; | |
| 538 // } | |
| 539 | |
| 540 // if (birth || flag & MQTT_NODE_CONTROL) { | |
| 541 // if (comma) | |
| 542 // payload = xstrcat(payload, (char *)","); | |
| 543 // payload = xstrcat(payload, (char *)"\"nodecontrol\":{\"reboot\":false,\"rebirth\":false,\"nextserver\":false,\"scanrate\":3000}"); | |
| 544 // comma = true; | |
| 545 // } | |
| 546 | |
| 547 // if (birth) { | |
| 548 // if (comma) | |
| 549 payload = xstrcat(payload, (char *)","); | |
| 550 #ifdef HAVE_WIRINGPI_H | 537 #ifdef HAVE_WIRINGPI_H |
| 551 payload = xstrcat(payload, (char *)"\"properties\":{\"hardwaremake\":\"Raspberry\",\"hardwaremodel\":\"Unknown\""); | 538 payload = xstrcat(payload, (char *)"\"properties\":{\"hardwaremake\":\"Raspberry\",\"hardwaremodel\":\"Unknown\""); |
| 552 #else | 539 #else |
| 553 payload = xstrcat(payload, (char *)"\"properties\":{\"hardwaremake\":\"Unknown\",\"hardwaremodel\":\"Unknown\""); | 540 if (uname(&ubuf) == 0) { |
| 541 payload = xstrcat(payload, (char *)"\"properties\":{\"hardwaremake\":\""); | |
| 542 payload = xstrcat(payload, ubuf.machine); | |
| 543 payload = xstrcat(payload, (char *)"\",\"hardwaremodel\":\"Unknown\""); | |
| 544 } else { | |
| 545 payload = xstrcat(payload, (char *)"\"properties\":{\"hardwaremake\":\"Unknown\",\"hardwaremodel\":\"Unknown\""); | |
| 546 } | |
| 554 #endif | 547 #endif |
| 555 if (uname(&ubuf) == 0) { | 548 if (uname(&ubuf) == 0) { |
| 556 payload = xstrcat(payload, (char *)",\"os\":\""); | 549 payload = xstrcat(payload, (char *)",\"os\":\""); |
| 557 payload = xstrcat(payload, ubuf.sysname); | 550 payload = xstrcat(payload, ubuf.sysname); |
| 558 payload = xstrcat(payload, (char *)"\",\"os_version\":\""); | 551 payload = xstrcat(payload, (char *)"\",\"os_version\":\""); |
