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

update sub modules, fix build, fix some warnings

Browse Source
This commit is contained in:
openshwprojects
2023-01-23 14:15:52 +01:00
parent 294c99cd81
commit e2efe3710d
6 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/OpenW600

Submodule sdk/OpenW600 updated: 6d8d2e4dab...7e7a22d554

2
sdk/OpenW800

Submodule sdk/OpenW800 updated: cb8826eac0...a668aef9c3

2
sdk/OpenXR809

Submodule sdk/OpenXR809 updated: 8aa48c055f...cac4a21396

4
src/httpserver/http_fns.c
View File

@ -1960,13 +1960,13 @@ int http_fn_cm(http_request_t* request) {
if (long_str_alloced) {
http_getArg(request->url, "cmnd", long_str_alloced, commandLen);
CMD_ExecuteCommand(long_str_alloced, COMMAND_FLAG_SOURCE_HTTP);
JSON_ProcessCommandReply(long_str_alloced, request, hprintf255, COMMAND_FLAG_SOURCE_HTTP);
JSON_ProcessCommandReply(long_str_alloced, request, (jsonCb_t)hprintf255, COMMAND_FLAG_SOURCE_HTTP);
free(long_str_alloced);
}
}
else {
CMD_ExecuteCommand(tmpA, COMMAND_FLAG_SOURCE_HTTP);
JSON_ProcessCommandReply(tmpA, request, hprintf255, COMMAND_FLAG_SOURCE_HTTP);
JSON_ProcessCommandReply(tmpA, request, (jsonCb_t)hprintf255, COMMAND_FLAG_SOURCE_HTTP);
}
}

2
src/httpserver/json_interface.c
View File

@ -558,7 +558,7 @@ int JSON_ProcessCommandReply(const char *cmd, void *request, jsonCb_t printer, i
if (!wal_strnicmp(cmd, "POWER", 5)) {
printer(request, "{");
http_tasmota_json_power(request, printer, flags);
http_tasmota_json_power(request, printer);
printer(request, "}");
if (flags == COMMAND_FLAG_SOURCE_MQTT) {
MQTT_PublishPrinterContentsToStat((struct obk_mqtt_publishReplyPrinter_s *)request, "RESULT");

23
src/mqtt/new_mqtt.c
View File

@ -515,9 +515,7 @@ char* MQTT_RemoveClientFromTopic(char* topic) {
int channelGet(obk_mqtt_request_t* request) {
//int len = request->receivedLen;
int channel = 0;
int iValue = 0;
char* p;
const char *argument;
// we only support here publishes with emtpy value, otherwise we would get into
// a loop where we receive a get, and then send get reply with val, and receive our own get
@ -566,11 +564,11 @@ int channelGet(obk_mqtt_request_t* request) {
return 0;
}
MQTT_ChannelPublish(channel, 0);
MQTT_ChannelPublish(channel, 0);
// return 1 to stop processing callbacks here.
// return 0 to allow later callbacks to process this topic.
return 1;
// return 1 to stop processing callbacks here.
// return 0 to allow later callbacks to process this topic.
return 1;
}
// this accepts obkXXXXXX/<chan>/set to receive data to set channels
int channelSet(obk_mqtt_request_t* request) {
@ -645,7 +643,7 @@ typedef struct obk_mqtt_publishReplyPrinter_s {
int curLen;
} obk_mqtt_publishReplyPrinter_t;
void MQTT_PublishPrinterContentsToStat(struct obk_mqtt_publishReplyPrinter_s *printer, const char *statName) {
void MQTT_PublishPrinterContentsToStat(obk_mqtt_publishReplyPrinter_t *printer, const char *statName) {
const char *toUse;
if (printer->allocated)
toUse = printer->allocated;
@ -665,7 +663,11 @@ int mqtt_printf255(obk_mqtt_publishReplyPrinter_t* request, const char* fmt, ...
myLen = strlen(tmp);
if (request->curLen + (myLen+2) >= MQTT_STACK_BUFFER_SIZE) {
if (request->curLen + (myLen + 2) >= MQTT_STACK_BUFFER_SIZE) {
if (request->curLen + (myLen + 2) >= MQTT_TOTAL_BUFFER_SIZE) {
// TODO: realloc
return 0;
}
// init alloced if needed
if (request->allocated == 0) {
request->allocated = malloc(MQTT_TOTAL_BUFFER_SIZE);
@ -677,11 +679,12 @@ int mqtt_printf255(obk_mqtt_publishReplyPrinter_t* request, const char* fmt, ...
strcat(request->stackBuffer, tmp);
}
request->curLen += myLen;
return 0;
}
int tasCmnd(obk_mqtt_request_t* request) {
const char *p, *args;
obk_mqtt_publishReplyPrinter_t replyBuilder;
memset(&replyBuilder, 0, sizeof(obk_mqtt_publishReplyPrinter_t));
p = request->topic;
// TODO: better
@ -697,7 +700,7 @@ int tasCmnd(obk_mqtt_request_t* request) {
// there is a NULL terminating character after payload of MQTT
// So we can feed it directly as command
CMD_ExecuteCommandArgs(p, args, COMMAND_FLAG_SOURCE_MQTT);
JSON_ProcessCommandReply(p, &replyBuilder, mqtt_printf255, COMMAND_FLAG_SOURCE_MQTT);
JSON_ProcessCommandReply(p, &replyBuilder, (jsonCb_t)mqtt_printf255, COMMAND_FLAG_SOURCE_MQTT);
if (replyBuilder.allocated != 0) {
free(replyBuilder.allocated);
}