Mercurial > mbsePi-apps / file comparison
comparison: thermferm/mqtt.c
thermferm/mqtt.c
- changeset 608
- a69b5d92fd72
- parent 606
- 798dd0c4fd00
- child 610
- 5563ee815701
equal
deleted
inserted
replaced
| 607:021338fc4e4f | 608:a69b5d92fd72 |
|---|---|
| 930 payload = xstrcat(payload, (char *)TEMPSTATE[unit->air_state]); | 930 payload = xstrcat(payload, (char *)TEMPSTATE[unit->air_state]); |
| 931 payload = xstrcat(payload, (char *)"\",\"temperature\":"); | 931 payload = xstrcat(payload, (char *)"\",\"temperature\":"); |
| 932 sprintf(buf, "%.3f", unit->air_temperature / 1000.0); | 932 sprintf(buf, "%.3f", unit->air_temperature / 1000.0); |
| 933 payload = xstrcat(payload, buf); | 933 payload = xstrcat(payload, buf); |
| 934 payload = xstrcat(payload, (char *)"}"); | 934 payload = xstrcat(payload, (char *)"}"); |
| 935 pub_domoticz_temp(unit->air_idx, unit->air_temperature); | |
| 935 } else { | 936 } else { |
| 936 payload = xstrcat(payload, (char *)",\"air\":null"); | 937 payload = xstrcat(payload, (char *)",\"air\":null"); |
| 937 } | 938 } |
| 938 | 939 |
| 939 /* | 940 /* |
| 946 payload = xstrcat(payload, (char *)TEMPSTATE[unit->beer_state]); | 947 payload = xstrcat(payload, (char *)TEMPSTATE[unit->beer_state]); |
| 947 payload = xstrcat(payload, (char *)"\",\"temperature\":"); | 948 payload = xstrcat(payload, (char *)"\",\"temperature\":"); |
| 948 sprintf(buf, "%.3f", unit->beer_temperature / 1000.0); | 949 sprintf(buf, "%.3f", unit->beer_temperature / 1000.0); |
| 949 payload = xstrcat(payload, buf); | 950 payload = xstrcat(payload, buf); |
| 950 payload = xstrcat(payload, (char *)"}"); | 951 payload = xstrcat(payload, (char *)"}"); |
| 952 pub_domoticz_temp(unit->beer_idx, unit->beer_temperature); | |
| 951 } else { | 953 } else { |
| 952 payload = xstrcat(payload, (char *)",\"beer\":null"); | 954 payload = xstrcat(payload, (char *)",\"beer\":null"); |
| 953 } | 955 } |
| 954 | 956 |
| 955 /* | 957 /* |
| 962 payload = xstrcat(payload, (char *)TEMPSTATE[unit->chiller_state]); | 964 payload = xstrcat(payload, (char *)TEMPSTATE[unit->chiller_state]); |
| 963 payload = xstrcat(payload, (char *)"\",\"temperature\":"); | 965 payload = xstrcat(payload, (char *)"\",\"temperature\":"); |
| 964 sprintf(buf, "%.3f", unit->chiller_temperature / 1000.0); | 966 sprintf(buf, "%.3f", unit->chiller_temperature / 1000.0); |
| 965 payload = xstrcat(payload, buf); | 967 payload = xstrcat(payload, buf); |
| 966 payload = xstrcat(payload, (char *)"}"); | 968 payload = xstrcat(payload, (char *)"}"); |
| 969 pub_domoticz_temp(unit->chiller_idx, unit->chiller_temperature); | |
| 967 } else { | 970 } else { |
| 968 payload = xstrcat(payload, (char *)",\"chiller\":null"); | 971 payload = xstrcat(payload, (char *)",\"chiller\":null"); |
| 969 } | 972 } |
| 970 | 973 |
| 971 /* | 974 /* |
| 979 payload = xstrcat(payload, buf); | 982 payload = xstrcat(payload, buf); |
| 980 payload = xstrcat(payload, (char *)",\"usage\":"); | 983 payload = xstrcat(payload, (char *)",\"usage\":"); |
| 981 sprintf(buf, "%d", unit->heater_usage); | 984 sprintf(buf, "%d", unit->heater_usage); |
| 982 payload = xstrcat(payload, buf); | 985 payload = xstrcat(payload, buf); |
| 983 payload = xstrcat(payload, (char *)"}"); | 986 payload = xstrcat(payload, (char *)"}"); |
| 987 pub_domoticz_output(unit->heater_idx, unit->heater_state); | |
| 984 } else { | 988 } else { |
| 985 payload = xstrcat(payload, (char *)",\"heater\":null"); | 989 payload = xstrcat(payload, (char *)",\"heater\":null"); |
| 986 } | 990 } |
| 987 | 991 |
| 988 /* | 992 /* |
| 996 payload = xstrcat(payload, buf); | 1000 payload = xstrcat(payload, buf); |
| 997 payload = xstrcat(payload, (char *)",\"usage\":"); | 1001 payload = xstrcat(payload, (char *)",\"usage\":"); |
| 998 sprintf(buf, "%d", unit->cooler_usage); | 1002 sprintf(buf, "%d", unit->cooler_usage); |
| 999 payload = xstrcat(payload, buf); | 1003 payload = xstrcat(payload, buf); |
| 1000 payload = xstrcat(payload, (char *)"}"); | 1004 payload = xstrcat(payload, (char *)"}"); |
| 1005 pub_domoticz_output(unit->cooler_idx, unit->cooler_state); | |
| 1001 } else { | 1006 } else { |
| 1002 payload = xstrcat(payload, (char *)",\"cooler\":null"); | 1007 payload = xstrcat(payload, (char *)",\"cooler\":null"); |
| 1003 } | 1008 } |
| 1004 | 1009 |
| 1005 /* | 1010 /* |
| 1013 payload = xstrcat(payload, buf); | 1018 payload = xstrcat(payload, buf); |
| 1014 payload = xstrcat(payload, (char *)",\"usage\":"); | 1019 payload = xstrcat(payload, (char *)",\"usage\":"); |
| 1015 sprintf(buf, "%d", unit->fan_usage); | 1020 sprintf(buf, "%d", unit->fan_usage); |
| 1016 payload = xstrcat(payload, buf); | 1021 payload = xstrcat(payload, buf); |
| 1017 payload = xstrcat(payload, (char *)"}"); | 1022 payload = xstrcat(payload, (char *)"}"); |
| 1023 pub_domoticz_output(unit->fan_idx, unit->fan_state); | |
| 1018 } else { | 1024 } else { |
| 1019 payload = xstrcat(payload, (char *)",\"fan\":null"); | 1025 payload = xstrcat(payload, (char *)",\"fan\":null"); |
| 1020 } | 1026 } |
| 1021 | 1027 |
| 1022 /* | 1028 /* |
| 1030 payload = xstrcat(payload, buf); | 1036 payload = xstrcat(payload, buf); |
| 1031 payload = xstrcat(payload, (char *)",\"usage\":"); | 1037 payload = xstrcat(payload, (char *)",\"usage\":"); |
| 1032 sprintf(buf, "%d", unit->light_usage); | 1038 sprintf(buf, "%d", unit->light_usage); |
| 1033 payload = xstrcat(payload, buf); | 1039 payload = xstrcat(payload, buf); |
| 1034 payload = xstrcat(payload, (char *)"}"); | 1040 payload = xstrcat(payload, (char *)"}"); |
| 1041 pub_domoticz_output(unit->light_idx, unit->light_state); | |
| 1035 } else { | 1042 } else { |
| 1036 payload = xstrcat(payload, (char *)",\"light\":null"); | 1043 payload = xstrcat(payload, (char *)",\"light\":null"); |
| 1037 } | 1044 } |
| 1038 | 1045 |
| 1039 /* | 1046 /* |
| 1044 payload = xstrcat(payload, unit->door_address); | 1051 payload = xstrcat(payload, unit->door_address); |
| 1045 payload = xstrcat(payload, (char *)"\",\"state\":"); | 1052 payload = xstrcat(payload, (char *)"\",\"state\":"); |
| 1046 sprintf(buf, "%d", (unit->door_state) ? 0:1); | 1053 sprintf(buf, "%d", (unit->door_state) ? 0:1); |
| 1047 payload = xstrcat(payload, buf); | 1054 payload = xstrcat(payload, buf); |
| 1048 payload = xstrcat(payload, (char *)"}"); | 1055 payload = xstrcat(payload, (char *)"}"); |
| 1056 pub_domoticz_output(unit->door_idx, unit->door_state); | |
| 1049 } else { | 1057 } else { |
| 1050 payload = xstrcat(payload, (char *)",\"door\":null"); | 1058 payload = xstrcat(payload, (char *)",\"door\":null"); |
| 1051 } | 1059 } |
| 1052 | 1060 |
| 1053 /* | 1061 /* |
| 1058 payload = xstrcat(payload, unit->psu_address); | 1066 payload = xstrcat(payload, unit->psu_address); |
| 1059 payload = xstrcat(payload, (char *)"\",\"state\":"); | 1067 payload = xstrcat(payload, (char *)"\",\"state\":"); |
| 1060 sprintf(buf, "%d", unit->psu_state); | 1068 sprintf(buf, "%d", unit->psu_state); |
| 1061 payload = xstrcat(payload, buf); | 1069 payload = xstrcat(payload, buf); |
| 1062 payload = xstrcat(payload, (char *)"}"); | 1070 payload = xstrcat(payload, (char *)"}"); |
| 1071 pub_domoticz_output(unit->psu_idx, unit->psu_state); | |
| 1063 } else { | 1072 } else { |
| 1064 payload = xstrcat(payload, (char *)",\"psu\":null"); | 1073 payload = xstrcat(payload, (char *)",\"psu\":null"); |
| 1065 } | 1074 } |
| 1066 | 1075 |
| 1067 /* | 1076 /* |
