pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-26 22:33:24 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Crash fix and remove hard-coded path from PiWebServer (#3478)

Browse Source 
* Remove hard-coded path from PiWebServer

* Bump portduino to pick up crash fix

* Remove PiWebServer non-ASCII debug output

* Trunk formatting
This commit is contained in:
Jonathan Bennett 2024-03-23 12:29:05 -05:00 committed by mverch67
parent 87acb4c683
commit f2e68afcf4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/portduino/portduino.ini
View File

@ -1,6 +1,6 @@
; The Portduino based sim environment on top of any host OS, all hardware will be simulated ; The Portduino based sim environment on top of any host OS, all hardware will be simulated
[portduino_base] [portduino_base]
platform = https://github.com/meshtastic/platform-native.git#acf8303a10f05901cae701e6fea6b6c8e25349ff platform = https://github.com/meshtastic/platform-native.git#1b8a32c60ab7495026033858d53c737f7d1cb34a
framework = arduino framework = arduino
build_src_filter = build_src_filter =

12
src/mesh/raspihttp/PiWebServer.cpp
View File

@ -244,7 +244,7 @@ int handleAPIv1ToRadio(const struct _u_request *req, struct _u_response *res, vo
// FIXME* Problem with portdunio loosing mountpoint maybe because of running in a real sep. thread // FIXME* Problem with portdunio loosing mountpoint maybe because of running in a real sep. thread
portduinoVFS->mountpoint("/home/marc/.portduino/default"); portduinoVFS->mountpoint(configWeb.rootPath);
LOG_DEBUG("Received %d bytes from PUT request\n", s); LOG_DEBUG("Received %d bytes from PUT request\n", s);
webAPI.handleToRadio(buffer, s); webAPI.handleToRadio(buffer, s);
@ -279,8 +279,8 @@ int handleAPIv1FromRadio(const struct _u_request *req, struct _u_response *res,
const char *tmpa = (const char *)txBuf; const char *tmpa = (const char *)txBuf;
ulfius_set_string_body_response(res, 200, tmpa); ulfius_set_string_body_response(res, 200, tmpa);
// LOG_DEBUG("\n----webAPI response all:----\n"); // LOG_DEBUG("\n----webAPI response all:----\n");
LOG_DEBUG(tmpa); // LOG_DEBUG(tmpa);
LOG_DEBUG("\n"); // LOG_DEBUG("\n");
} }
// Otherwise, just return one protobuf // Otherwise, just return one protobuf
} else { } else {
@ -288,8 +288,8 @@ int handleAPIv1FromRadio(const struct _u_request *req, struct _u_response *res,
const char *tmpa = (const char *)txBuf; const char *tmpa = (const char *)txBuf;
ulfius_set_binary_body_response(res, 200, tmpa, len); ulfius_set_binary_body_response(res, 200, tmpa, len);
// LOG_DEBUG("\n----webAPI response:\n"); // LOG_DEBUG("\n----webAPI response:\n");
LOG_DEBUG(tmpa); // LOG_DEBUG(tmpa);
LOG_DEBUG("\n"); // LOG_DEBUG("\n");
} }
// LOG_DEBUG("end radio->web\n", len); // LOG_DEBUG("end radio->web\n", len);
@ -508,7 +508,7 @@ PiWebServerThread::PiWebServerThread()
LOG_INFO("Web Server framework started on port: %i \n", webservport); LOG_INFO("Web Server framework started on port: %i \n", webservport);
LOG_INFO("Web Server root %s\n", (char *)webrootpath.c_str()); LOG_INFO("Web Server root %s\n", (char *)webrootpath.c_str());
} else { } else {
LOG_ERROR("Error starting Web Server framework\n"); LOG_ERROR("Error starting Web Server framework, error number: %d\n", retssl);
} }
} }
} }