Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Native Webserver #3343

Merged
merged 36 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
c0bd58d
Added WebServer/WebServices for Native Linux Meshtastic and web gui
marelab Feb 22, 2024
b9972b8
Fix bug in login functionality
marelab Feb 22, 2024
8e9af81
Added customized config of portdunio.ini with LovyannGFX from marelab…
marelab Feb 22, 2024
f6a978f
Compile Problem resolved with developer version of LovyanGFX.git
marelab Feb 22, 2024
7da107f
Compile against dev version
marelab Feb 22, 2024
f910e79
Fixes to fit into main branch
marelab Feb 22, 2024
39984e4
Merge branch 'meshtastic:master' into master
marelab Feb 22, 2024
354c1cf
Merge branch 'master' into master
thebentern Feb 23, 2024
a094d97
Update variant.h, main.cpp, .gitignore, WebServer.cpp, esp32s2.ini, W…
marelab Feb 23, 2024
93cd5ec
Added linux pi std /usr/include dir
marelab Feb 23, 2024
19d33b2
Adding /usr/innclude for Linux compile against native libs that are n…
marelab Feb 23, 2024
dbbd35e
Review log level changes & translation
marelab Feb 23, 2024
c52741f
Update Dockerfile
marelab Feb 24, 2024
18cf6cb
Merge branch 'master' into master
thebentern Feb 24, 2024
e637b46
Merge branch 'master' into master
caveman99 Feb 25, 2024
7cbde1a
Merge branch 'master' into master
jp-bennett Feb 25, 2024
0c5f68c
Merge branch 'master' into master
thebentern Feb 25, 2024
27c8241
Fix Typo & VFS ref. Part1
marelab Feb 26, 2024
5b626a7
Fix Typo & VFS ref.
marelab Feb 26, 2024
6361b6d
Merge pull request #2 from marelab:FixTypo-&-VFS-reference
marelab Feb 26, 2024
04312cd
Dev Version for ulfius web lib
marelab Feb 25, 2024
5028013
Update platformio.ini
marelab Feb 26, 2024
3256442
Free VFS path string
marelab Feb 26, 2024
16d3348
Merge branch 'master' into master
thebentern Feb 26, 2024
23d09f8
Merge branch 'master' into master
thebentern Feb 27, 2024
3efcf2f
Merge branch 'master' into master
thebentern Feb 28, 2024
fab61f2
Merge branch 'master' into master
thebentern Feb 29, 2024
839f280
Merge branch 'master' into master
thebentern Mar 3, 2024
3b90e10
Merge branch 'master' into master
thebentern Mar 6, 2024
90e303a
Remove unintended changes
jp-bennett Mar 6, 2024
df1a828
More unintentional changes
jp-bennett Mar 6, 2024
4a1b20a
Make the HTTP server optional on native
jp-bennett Mar 6, 2024
0000ce5
Tune-up for Native web defaults
jp-bennett Mar 6, 2024
09fb736
Don't modify build system yet
jp-bennett Mar 6, 2024
741344e
Merge branch 'master' into native-web
jp-bennett Mar 6, 2024
3970762
Remove more unneeded changes
jp-bennett Mar 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ venv/
release/
.vscode/extensions.json
/compile_commands.json
src/mesh/raspihttp/certificate.pem
src/mesh/raspihttp/private_key.pem
2 changes: 1 addition & 1 deletion arch/esp32/esp32.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ extends = arduino_base
platform = platformio/espressif32@6.3.2 # This is a temporary fix to the S3-based devices bluetooth issues until we can determine what within ESP-IDF changed and can develop a suitable patch.

build_src_filter =
${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040> -<mesh/eth/>
${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040> -<mesh/eth/> -<mesh/raspihttp>

upload_speed = 921600
debug_init_break = tbreak setup
Expand Down
5 changes: 2 additions & 3 deletions arch/esp32/esp32s2.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
extends = esp32_base

build_src_filter =
${esp32_base.build_src_filter} -<nimble/>
${esp32_base.build_src_filter} -<nimble/> -<mesh/raspihttp>

monitor_speed = 115200

Expand All @@ -12,5 +12,4 @@ build_flags =

lib_ignore =
${esp32_base.lib_ignore}
NimBLE-Arduino

NimBLE-Arduino
2 changes: 1 addition & 1 deletion arch/nrf52/nrf52.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ build_flags =
-Isrc/platform/nrf52

build_src_filter =
${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2040> -<mesh/eth/>
${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2040> -<mesh/eth/> -<mesh/raspihttp>

lib_deps=
${arduino_base.lib_deps}
Expand Down
1 change: 1 addition & 0 deletions arch/portduino/portduino.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ build_src_filter =
-<platform/rp2040>
-<mesh/wifi/>
-<mesh/http/>
+<mesh/raspihttp/>
-<mesh/eth/>
-<modules/esp32>
-<modules/Telemetry/EnvironmentTelemetry.cpp>
Expand Down
2 changes: 1 addition & 1 deletion arch/rp2040/rp2040.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build_flags =
-D__PLAT_RP2040__
# -D _POSIX_THREADS
build_src_filter =
${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<modules/esp32> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/> -<mesh/wifi/> -<mesh/http/>
${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<modules/esp32> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/> -<mesh/wifi/> -<mesh/http/> -<mesh/raspihttp>

lib_ignore =
BluetoothOTA
Expand Down
2 changes: 1 addition & 1 deletion arch/stm32/stm32wl5e.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ build_flags =
-DVECT_TAB_OFFSET=0x08000000

build_src_filter =
${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<input> -<buzz> -<modules/Telemetry> -<platform/nrf52> -<platform/portduino> -<platform/rp2040>
${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<input> -<buzz> -<modules/Telemetry> -<platform/nrf52> -<platform/portduino> -<platform/rp2040> -<mesh/raspihttp>

board_upload.offset_address = 0x08000000
upload_protocol = stlink
Expand Down
4 changes: 4 additions & 0 deletions bin/config-dist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,7 @@ Input:

Logging:
LogLevel: info # debug, info, warn, error

Webserver:
# Port: 443 # Port for Webserver & Webservices
# RootPath: /usr/share/doc/meshtasticd/web # Root Dir of WebServer
6 changes: 6 additions & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ NRF52Bluetooth *nrf52Bluetooth;

#ifdef ARCH_PORTDUINO
#include "linux/LinuxHardwareI2C.h"
#include "mesh/raspihttp/PiWebServer.h"
#include "platform/portduino/PortduinoGlue.h"
#include <fstream>
#include <iostream>
Expand Down Expand Up @@ -857,6 +858,11 @@ void setup()
#endif

#ifdef ARCH_PORTDUINO
#if __has_include(<ulfius.h>)
if (settingsMap[webserverport] != -1) {
piwebServerThread = new PiWebServerThread();
}
#endif
initApiServer(TCPPort);
#endif

Expand Down
Loading
Loading