Merge branch 'stephendade:master' into videostreaminfo

stephendade · Feb 27, 2024 · e0e4549 · e0e4549
2 parents dc3c4e0 + c619331
commit e0e4549
Show file tree

Hide file tree

Showing 14 changed files with 148 additions and 408 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -16,11 +16,11 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 20.x]
+        node-version: [18.x, 20.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install packages
       run: |
         cd ./deploy && ./install_common_libraries.sh
@@ -33,7 +33,7 @@ jobs:
         cd ./deploy && ./build_mavlinkrouter.sh
 
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'

diff --git a/README.md b/README.md
@@ -90,17 +90,6 @@ sudo apt update
 sudo apt install -y nodejs
 ```
 
-Note that the Raspberry Pi Zero (1) requires an unofficial build of nodejs, as Rpanion-server requires
-nodejs version 12 or greater, and official support for the Pi Zero ended with nodejs version 11;
-
-```
-wget https://unofficial-builds.nodejs.org/download/release/v16.19.1/node-v16.19.1-linux-armv6l.tar.xz
-sudo mkdir -p /usr/local/lib/nodejs
-sudo tar -xJvf node-v16.19.1-linux-armv6l.tar.xz -C /usr/local/lib/nodejs
-sudo ln -s /usr/local/lib/nodejs/node-v16.19.1-linux-armv6l/bin/node /usr/local/bin
-sudo ln -s /usr/local/lib/nodejs/node-v16.19.1-linux-armv6l/bin/npm /usr/local/bin
-```
-
 The required prerequisite packages can be installed via:
 
 ```

diff --git a/modules/mavlink-router b/modules/mavlink-router
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,7 +9,6 @@
     "express-fileupload": "^1.4.0",
     "express-rate-limit": "^6.9.0",
     "express-validator": "^7.0.1",
-    "microtime": "^3.1.1",
     "moment": "^2.29.4",
     "node-mavlink": "^2.0.5",
     "npm": "^9.8.1",

diff --git a/python/tlog2kmz.py b/python/tlog2kmz.py
@@ -44,7 +44,7 @@ def mavtogpx_filepath():
 
 def convert_tlog_files():
     """Convert any tlog files to GPX,  KML, KMZ and PNG."""
-    mavlog = glob.glob("flightlogs/tlogs/*.tlog")
+    mavlog = glob.glob("flightlogs/*.tlog")
     latest_file = max(mavlog, key=os.path.getctime)
     kmzlogs = glob.glob("flightlogs/kmzlogs/*.kmz")
     passed = True

diff --git a/server/cloudUpload.js b/server/cloudUpload.js
@@ -14,7 +14,6 @@ class cloudUpload {
     }
 
     this.topfolder = path.join(appRoot.toString(), 'flightlogs')
-    this.binlogfolder = path.join(this.topfolder, 'binlogs')
 
     this.rsyncPid = null
 
@@ -40,7 +39,7 @@ class cloudUpload {
         const rsync = new Rsync()
           .shell('ssh -o StrictHostKeyChecking=no')
           .flags('avzP')
-          .source(this.binlogfolder + '/')
+          .source(this.topfolder + '/')
           .destination(this.options.binUploadLink)
           .include('*.bin')
+3 −2		.github/workflows/main.yml
+29 −17		README.md
+44 −2		examples/config.sample
+1 −1		meson.build
+108 −7		src/endpoint.cpp
+49 −1		src/endpoint.h
+158 −0		src/endpoints_test.cpp
+1 −0		src/logendpoint.cpp
+1 −0		src/logendpoint.h
+8 −1		src/main.cpp
+7 −0		src/mainloop.cpp
+3 −0		src/meson.build
+77 −0		src/tlog.cpp
+42 −0		src/tlog.h