mirror/OpenBK7231T_App
3
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-02-10 17:05:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/openshwprojects/OpenBK7231T_App

Browse Source
This commit is contained in:
openshwprojects
2023-03-18 17:20:01 +01:00
parent 52566ee6fb b3d6d90e61
commit 653e3cd102
1 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/httpserver/json_interface.c
View File

@ -125,7 +125,10 @@ static int http_tasmota_json_power(void* request, jsonCb_t printer) {
lastRelayState = CHANNEL_Get(i);
}
}
if (numRelays == 1) {
if (numRelays == 0) {
printer(request, "\"POWER\":\"ON\"");
}
else if (numRelays == 1) {
if (lastRelayState) {
printer(request, "\"POWER\":\"ON\"");
}
@ -677,17 +680,17 @@ int JSON_ProcessCommandReply(const char* cmd, const char* arg, void* request, js
// Prefix3 1 = Reset MQTT telemetry prefix to firmware default (PUB_PREFIX2) and restart
// <value> = set MQTT telemetry prefix and restart
printer(request, "{");
printer(request, "\"Prefix1\":\"%s/[Channel]/set\"", CFG_GetMQTTClientId());
printer(request, "\"Prefix1\":\"cmnd\"");
printer(request, "}");
}
else if (!wal_strnicmp(cmd, "Prefix2", 7)) {
printer(request, "{");
printer(request, "\"Prefix2\":\"%s/[Channel]/get\"", CFG_GetMQTTClientId());
printer(request, "\"Prefix2\":\"stat\"");
printer(request, "}");
}
else if (!wal_strnicmp(cmd, "Prefix3", 7)) {
printer(request, "{");
printer(request, "\"Prefix3\":\"Null\"");
printer(request, "\"Prefix3\":\"tele\"");
printer(request, "}");
}
else if (!wal_strnicmp(cmd, "StateText1", 10)) {
@ -716,6 +719,31 @@ int JSON_ProcessCommandReply(const char* cmd, const char* arg, void* request, js
printer(request, "\"StateText4\":\"HOLD\"");
printer(request, "}");
}
else if (!wal_strnicmp(cmd, "FullTopic", 9)) {
printer(request, "{");
printer(request, "\"FullTopic\":\"%%prefix%%/%%topic%%/\"");
printer(request, "}");
}
else if (!wal_strnicmp(cmd, "SwitchTopic", 11)) {
printer(request, "{");
printer(request, "\"SwitchTopic\":\"0\"");
printer(request, "}");
}
else if (!wal_strnicmp(cmd, "ButtonTopic", 11)) {
printer(request, "{");
printer(request, "\"ButtonTopic\":\"0\"");
printer(request, "}");
}
else if (!wal_strnicmp(cmd, "MqttRetry", 9)) {
printer(request, "{");
printer(request, "\"MqttRetry\":\"1\"");
printer(request, "}");
}
else if (!wal_strnicmp(cmd, "TelePeriod", 10)) {
printer(request, "{");
printer(request, "\"TelePeriod\":\"300\"");
printer(request, "}");
}
else if (!wal_strnicmp(cmd, "CT", 2)) {
printer(request, "{");
if (*arg == 0) {
@ -894,7 +922,7 @@ int JSON_ProcessCommandReply(const char* cmd, const char* arg, void* request, js
printer(request, "{");
printer(request, "}");
}
return 0;
}