userbogd/webguiapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rest api function type on read executed, delayed wifi scan, debug mode

Browse Source 
in rest api
This commit is contained in:
Bogdan Pilyugin 2023-08-13 18:35:09 +02:00
parent d244bb3487
commit 3df345a09d
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/SystemApplication.h
View File

@ -28,6 +28,8 @@
#include "jRead.h" #include "jRead.h"
#include "jWrite.h" #include "jWrite.h"
#define REAST_API_DEBUG_MODE 1
#define EXPECTED_MAX_DATA_RESPONSE_SIZE (4096) #define EXPECTED_MAX_DATA_RESPONSE_SIZE (4096)
#define VAR_MAX_NAME_LENGTH 32 #define VAR_MAX_NAME_LENGTH 32
#define VAR_MAX_VALUE_LENGTH 128 #define VAR_MAX_VALUE_LENGTH 128

2
src/RestApiHandler.c
View File

@ -340,7 +340,7 @@ esp_err_t GetConfVar(char *name, char *val, rest_var_types *tp)
esp_ip4addr_ntoa((const esp_ip4_addr_t*) V->ref, val, 16); esp_ip4addr_ntoa((const esp_ip4_addr_t*) V->ref, val, 16);
break; break;
case VAR_FUNCT: case VAR_FUNCT:
((void (*)(char*, int)) (V->ref))(val, 0); ((void (*)(char*, int)) (V->ref))(val, 1);
break; break;
case VAR_ERROR: case VAR_ERROR:
break; break;

8
src/SysComm.c
View File

@ -155,9 +155,9 @@ static sys_error_code SysPayloadTypeVarsHandler(data_message_t *MSG)
strcat(expr, "'"); strcat(expr, "'");
jRead_string(MSG->inputDataBuffer, expr, VarValue, VAR_MAX_VALUE_LENGTH, &i); jRead_string(MSG->inputDataBuffer, expr, VarValue, VAR_MAX_VALUE_LENGTH, &i);
#if REAST_API_DEBUG_MODE
ESP_LOGI(TAG, "Got write variable %s:%s", VarName, VarValue); ESP_LOGI(TAG, "Got write variable %s:%s", VarName, VarValue);
#endif
esp_err_t res = ESP_ERR_INVALID_ARG; esp_err_t res = ESP_ERR_INVALID_ARG;
rest_var_types tp = VAR_ERROR; rest_var_types tp = VAR_ERROR;
if (MSG->parsedData.msgType == DATA_MESSAGE_TYPE_COMMAND) if (MSG->parsedData.msgType == DATA_MESSAGE_TYPE_COMMAND)
@ -201,7 +201,9 @@ static sys_error_code SysPayloadTypeVarsHandler(data_message_t *MSG)
unsigned char sha_print[32 * 2 + 1]; unsigned char sha_print[32 * 2 + 1];
BytesToStr(MSG->parsedData.sha256, sha_print, 32); BytesToStr(MSG->parsedData.sha256, sha_print, 32);
sha_print[32 * 2] = 0x00; sha_print[32 * 2] = 0x00;
#if REAST_API_DEBUG_MODE
ESP_LOGI(TAG, "SHA256 of DATA object is %s", sha_print); ESP_LOGI(TAG, "SHA256 of DATA object is %s", sha_print);
#endif
jwObj_string("signature", (char*) sha_print); jwObj_string("signature", (char*) sha_print);
} }
else else
@ -257,7 +259,9 @@ static sys_error_code SysDataParser(data_message_t *MSG)
unsigned char sha_print[32 * 2 + 1]; unsigned char sha_print[32 * 2 + 1];
BytesToStr(MSG->parsedData.sha256, sha_print, 32); BytesToStr(MSG->parsedData.sha256, sha_print, 32);
sha_print[32 * 2] = 0x00; sha_print[32 * 2] = 0x00;
#if REAST_API_DEBUG_MODE
ESP_LOGI(TAG, "SHA256 of DATA object is %s", sha_print); ESP_LOGI(TAG, "SHA256 of DATA object is %s", sha_print);
#endif
free(hashbuf); free(hashbuf);
} }
else else

1
src/WiFiTransport.c
View File

@ -597,6 +597,7 @@ static void wifi_scan(void *arg)
{ {
uint16_t number = DEFAULT_SCAN_LIST_SIZE; uint16_t number = DEFAULT_SCAN_LIST_SIZE;
uint16_t ap_count = 0; uint16_t ap_count = 0;
vTaskDelay(pdMS_TO_TICKS(2000)); //delay for command result get before network break
memset(ap_info, 0, sizeof(ap_info)); memset(ap_info, 0, sizeof(ap_info));
while (esp_wifi_scan_start(NULL, true) == ESP_ERR_WIFI_STATE) while (esp_wifi_scan_start(NULL, true) == ESP_ERR_WIFI_STATE)
{ {