pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 09:42:35 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'meshtastic:master' into logsMapReport

Browse Source
This commit is contained in:
GUVWAF 2024-03-23 19:36:21 +01:00 committed by GitHub
commit a7c005ccdf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 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#a28dd5a9ccd5c48a9bede46037855ff83915d74b platform = https://github.com/meshtastic/platform-native.git#1b8a32c60ab7495026033858d53c737f7d1cb34a
framework = arduino framework = arduino
build_src_filter = build_src_filter =

2
src/mesh/RadioInterface.cpp
View File

@ -564,6 +564,8 @@ size_t RadioInterface::beginSending(meshtastic_MeshPacket *p)
h->to = p->to; h->to = p->to;
h->id = p->id; h->id = p->id;
h->channel = p->channel; h->channel = p->channel;
h->next_hop = 0; // *** For future use ***
h->relay_node = 0; // *** For future use ***
if (p->hop_limit > HOP_MAX) { if (p->hop_limit > HOP_MAX) {
LOG_WARN("hop limit %d is too high, setting to %d\n", p->hop_limit, HOP_RELIABLE); LOG_WARN("hop limit %d is too high, setting to %d\n", p->hop_limit, HOP_RELIABLE);
p->hop_limit = HOP_RELIABLE; p->hop_limit = HOP_RELIABLE;

6
src/mesh/RadioInterface.h
View File

@ -34,6 +34,12 @@ typedef struct {
/** The channel hash - used as a hint for the decoder to limit which channels we consider */ /** The channel hash - used as a hint for the decoder to limit which channels we consider */
uint8_t channel; uint8_t channel;
// ***For future use*** Last byte of the NodeNum of the next-hop for this packet
uint8_t next_hop;
// ***For future use*** Last byte of the NodeNum of the node that will relay/relayed this packet
uint8_t relay_node;
} PacketHeader; } PacketHeader;
/** /**

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);
} }
} }
} }