From 49a4e73afe953b9b4f4d44eeac8d3657ea71fba0 Mon Sep 17 00:00:00 2001 From: btsimonh Date: Sat, 5 Mar 2022 10:20:13 +0000 Subject: [PATCH] chore: warning squashing. --- src/drv_tuyaMCU.c | 4 ++++ src/httpserver/http_fns.c | 14 +++++++------- src/logging/logging.c | 1 - src/ntp_time.c | 23 ++++++++++++----------- src/user_main.c | 1 + 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/drv_tuyaMCU.c b/src/drv_tuyaMCU.c index a15bbff17..32f6c64fc 100644 --- a/src/drv_tuyaMCU.c +++ b/src/drv_tuyaMCU.c @@ -23,6 +23,10 @@ void TuyaMCU_RunFrame(); +// from http_fns. should move to a utils file. +extern unsigned char hexbyte( const char* hex ); + + const char *TuyaMCU_GetCommandTypeLabel(int t) { if(t == TUYA_CMD_HEARTBEAT) return "Hearbeat"; diff --git a/src/httpserver/http_fns.c b/src/httpserver/http_fns.c index 7461064a1..cd90c1c03 100644 --- a/src/httpserver/http_fns.c +++ b/src/httpserver/http_fns.c @@ -616,14 +616,14 @@ int http_fn_flash_read_tool(http_request_t *request) { } int http_fn_cmd_tool(http_request_t *request) { - int res; - int rem; - int now; - int nowOfs; - int hex; + //int res; + //int rem; + //int now; + //int nowOfs; + //int hex; int i; char tmpA[128]; - char tmpB[64]; + //char tmpB[64]; http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); @@ -671,7 +671,7 @@ int http_fn_uart_tool(http_request_t *request) { if(http_getArg(request->url,"data",tmpA,sizeof(tmpA))) { hprintf128(request,"

Sent %s!

",tmpA); if(0){ - TuyaMCU_Send(tmpA, strlen(tmpA)); + TuyaMCU_Send((byte *)tmpA, strlen(tmpA)); // bk_send_string(0,tmpA); } else { byte b; diff --git a/src/logging/logging.c b/src/logging/logging.c index a83218afa..228aefb04 100644 --- a/src/logging/logging.c +++ b/src/logging/logging.c @@ -391,7 +391,6 @@ static char tcplogbuf[TCPLOGBUFSIZE]; static void log_client_thread( beken_thread_arg_t arg ) { int fd = (int) arg; - int len = 0; while ( 1 ){ int count = getTcp(tcplogbuf, TCPLOGBUFSIZE); if (count){ diff --git a/src/ntp_time.c b/src/ntp_time.c index 9a5aad975..23bdc3e68 100644 --- a/src/ntp_time.c +++ b/src/ntp_time.c @@ -5,20 +5,21 @@ #include "new_common.h" -#ifdef WINDOWS - -#undef UNICODE - -#define WIN32_LEAN_AND_MEAN - -#include -#include -#include -#include -#include +#ifdef WINDOWS + +#undef UNICODE + +#define WIN32_LEAN_AND_MEAN + +#include +#include +#include +#include +#include #else #include "lwip/sockets.h" +#include "logging/logging.h" #endif diff --git a/src/user_main.c b/src/user_main.c index cdc98f448..f820e26bf 100644 --- a/src/user_main.c +++ b/src/user_main.c @@ -56,6 +56,7 @@ #include "flash_config/flash_config.h" #include "flash_config/flash_vars_vars.h" #include "drv_tuyaMCU.h" +#include "ntp_time.h" #undef Malloc