meshtastic · marelab · Feb 22, 2024 · Feb 22, 2024 · Feb 22, 2024 · Feb 22, 2024
diff --git a/.editorconfig b/.editorconfig
diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,5 @@ venv/
 release/
 .vscode/extensions.json
 /compile_commands.json
+src/mesh/raspihttp/certificate.pem
+src/mesh/raspihttp/private_key.pem
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -2,8 +2,9 @@
     // See http://go.microsoft.com/fwlink/?LinkId=827846
     // for the documentation about the extensions.json format
     "recommendations": [
-        "ms-vscode.cpptools",
-        "platformio.platformio-ide",
-        "trunk.io"
+        "platformio.platformio-ide"
     ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,75 @@
 {
   "editor.formatOnSave": true,
   "editor.defaultFormatter": "trunk.io",
-  "trunk.enableWindows": true
+  "trunk.enableWindows": true,
+  "files.associations": {
+    "string": "cpp",
+    "cctype": "cpp",
+    "clocale": "cpp",
+    "cmath": "cpp",
+    "csignal": "cpp",
+    "cstdarg": "cpp",
+    "cstddef": "cpp",
+    "cstdio": "cpp",
+    "cstdlib": "cpp",
+    "cstring": "cpp",
+    "ctime": "cpp",
+    "cwchar": "cpp",
+    "cwctype": "cpp",
+    "array": "cpp",
+    "atomic": "cpp",
+    "strstream": "cpp",
+    "bit": "cpp",
+    "*.tcc": "cpp",
+    "bitset": "cpp",
+    "chrono": "cpp",
+    "compare": "cpp",
+    "complex": "cpp",
+    "concepts": "cpp",
+    "condition_variable": "cpp",
+    "cstdint": "cpp",
+    "deque": "cpp",
+    "list": "cpp",
+    "map": "cpp",
+    "set": "cpp",
+    "unordered_map": "cpp",
+    "unordered_set": "cpp",
+    "vector": "cpp",
+    "exception": "cpp",
+    "algorithm": "cpp",
+    "functional": "cpp",
+    "iterator": "cpp",
+    "memory": "cpp",
+    "memory_resource": "cpp",
+    "numeric": "cpp",
+    "optional": "cpp",
+    "random": "cpp",
+    "ratio": "cpp",
+    "string_view": "cpp",
+    "system_error": "cpp",
+    "tuple": "cpp",
+    "type_traits": "cpp",
+    "utility": "cpp",
+    "fstream": "cpp",
+    "initializer_list": "cpp",
+    "iomanip": "cpp",
+    "iosfwd": "cpp",
+    "iostream": "cpp",
+    "istream": "cpp",
+    "limits": "cpp",
+    "mutex": "cpp",
+    "new": "cpp",
+    "numbers": "cpp",
+    "ostream": "cpp",
+    "semaphore": "cpp",
+    "sstream": "cpp",
+    "stdexcept": "cpp",
+    "stop_token": "cpp",
+    "streambuf": "cpp",
+    "thread": "cpp",
+    "cinttypes": "cpp",
+    "typeindex": "cpp",
+    "typeinfo": "cpp",
+    "variant": "cpp"
+  }
 }
diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install build deps
 USER root
 RUN apt-get update && \
-	apt-get -y install wget python3 g++ zip python3-venv git vim ca-certificates libgpiod-dev libyaml-cpp-dev libbluetooth-dev
+	apt-get -y install wget python3 g++ zip python3-venv git vim ca-certificates libgpiod-dev libyaml-cpp-dev libbluetooth-dev libgpiod2 openssl libssl-dev libulfius-dev liborcania-dev bash
 
 # create a non-priveleged user & group
 RUN groupadd -g 1000 mesh && useradd -ml -u 1000 -g 1000 mesh
@@ -38,4 +38,4 @@ USER mesh
 WORKDIR /home/mesh
 CMD sh -cx "./meshtasticd_linux_x86_64 --hwid '${HWID:-$RANDOM}'"
 
-HEALTHCHECK NONE
+HEALTHCHECK NONE
diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini
@@ -4,7 +4,7 @@ extends = arduino_base
 platform = platformio/[email protected] # 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

diff --git a/arch/esp32/esp32s2.ini b/arch/esp32/esp32s2.ini
@@ -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
 
@@ -12,5 +12,4 @@ build_flags =
 
 lib_ignore = 
   ${esp32_base.lib_ignore} 
-  NimBLE-Arduino
-
+  NimBLE-Arduino
diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini
@@ -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}

diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
@@ -12,6 +12,7 @@ build_src_filter =
   -<platform/rp2040>
   -<mesh/wifi/>
   -<mesh/http/>
+  +<mesh/raspihttp/>
   -<mesh/eth/>
   -<modules/esp32>
   -<modules/Telemetry/EnvironmentTelemetry.cpp>
@@ -23,12 +24,14 @@ lib_deps =
   ${env.lib_deps}
   ${networking_base.lib_deps}
   rweather/Crypto@^0.4.0
-  lovyan03/LovyanGFX@^1.1.12
+  https://github.com/lovyan03/LovyanGFX.git#develop
+  ;lovyan03/LovyanGFX@^1.1.12
 
 build_flags =
   ${arduino_base.build_flags}
   -fPIC
   -Isrc/platform/portduino
+  -I/usr/include
   -DRADIOLIB_EEPROM_UNSUPPORTED
   -DPORTDUINO_LINUX_HARDWARE
   -lbluetooth

diff --git a/arch/rp2040/rp2040.ini b/arch/rp2040/rp2040.ini
@@ -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

diff --git a/arch/stm32/stm32wl5e.ini b/arch/stm32/stm32wl5e.ini
@@ -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

diff --git a/bin/config-dist.yaml b/bin/config-dist.yaml
@@ -117,3 +117,7 @@ Input:
 
 Logging:
   LogLevel: info # debug, info, warn, error
+
+Webserver:
+  Port: 9001 # Port for Webserver & Webservices
+  RootPath: /home/user/web # Root Dir of WebServer
diff --git a/bin/prepare-native.sh b/bin/prepare-native.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+sudo apt -y install openssl libssl-dev libsdl2-dev libulfius-dev liborcania-dev
diff --git a/platformio.ini b/platformio.ini
@@ -129,4 +129,4 @@ lib_deps =
   adafruit/Adafruit PM25 AQI Sensor@^1.0.6
   adafruit/Adafruit MPU6050@^2.2.4
   adafruit/Adafruit LIS3DH@^1.2.4
-  https://github.com/lewisxhe/BMA423_Library@^0.0.1
+  https://github.com/lewisxhe/BMA423_Library@^0.0.1
diff --git a/src/main.cpp b/src/main.cpp
@@ -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>
@@ -857,6 +858,7 @@ void setup()
 #endif
 
 #ifdef ARCH_PORTDUINO
+    piwebServerThread = new PiWebServerThread();
     initApiServer(TCPPort);
 #endif
 

diff --git a/src/mesh/http/ContentHandler.cpp b/src/mesh/http/ContentHandler.cpp
@@ -854,4 +854,4 @@ void handleScanNetworks(HTTPRequest *req, HTTPResponse *res)
     JSONValue *value = new JSONValue(jsonObjOuter);
     res->print(value->Stringify().c_str());
     delete value;
-}
+}
diff --git a/src/mesh/http/ContentHelper.cpp b/src/mesh/http/ContentHelper.cpp
@@ -11,4 +11,4 @@ void replaceAll(std::string &str, const std::string &from, const std::string &to
         str.replace(start_pos, from.length(), to);
         start_pos += to.length(); // In case 'to' contains 'from', like replacing 'x' with 'yx'
     }
-}
+}
diff --git a/src/mesh/http/WebServer.h b/src/mesh/http/WebServer.h
@@ -19,4 +19,4 @@ class WebServerThread : private concurrency::OSThread
     virtual int32_t runOnce() override;
 };
 
-extern WebServerThread *webServerThread;
+extern WebServerThread *webServerThread;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/usr/bin/env bash
		sudo apt -y install openssl libssl-dev libsdl2-dev libulfius-dev liborcania-dev
Copy link Member caveman99 Feb 23, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. This needs to be included in the CI builder scripts on github, or the builds will fail. Copy link Contributor Author marelab Feb 24, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Yes sorry didn't looked into the build pipline of Github. Then I first have to prepare a change for the build pipeline I guess. I think for native linux build the .github/actions/setup-base/action.yml would be the best place? Copy link Member caveman99 Feb 25, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. That's something we can do afterwards. i commented more like a todo item :-) the runners are always picked up from master, you can't fix that here Copy link Collaborator jp-bennett Feb 25, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Adding these packages to the Pi builder now.
-Original file line number
+Diff line change
@@ Expand Up @@
             str.replace(start_pos, from.length(), to);
             start_pos += to.length(); // In case 'to' contains 'from', like replacing 'x' with 'yx'
         }
-    }
+    }