Merge pull request #37 from jeffeb3/merge

Merge

.github/workflows/docs_check.yml

@@ -0,0 +1,23 @@
+name: Build mkdocs
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  build:
+    name: Build docs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r docs/requirements.txt
+      - name: mkdocs build
+        run: mkdocs build --clean --strict

.github/workflows/docs_deploy.yml

@@ -0,0 +1,20 @@
+name: Publish docs via GitHub Pages
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Deploy docs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout master
+        uses: actions/checkout@v2
+
+      - name: Deploy docs
+        uses: mhausenblas/mkdocs-deploy-gh-pages@master
+        # Or use mhausenblas/mkdocs-deploy-gh-pages@nomaterial to build without the mkdocs-material theme
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REQUIREMENTS: requirements.txt

.github/workflows/main.yml

@@ -2,11 +2,13 @@ name: Build Image
 
 on:
   schedule:
-    # At 10:15 each day. No idea what time zone this is...
+    # At 10:15 UTC each day.
     - cron:  '15 10 * * *'
 
   pull_request: {}
   push:
+    branches:
+      - master
     tags:
       - v*
 
@@ -52,7 +54,7 @@ jobs:
         submodules: true
 
     - name: Download Raspbian Image
-      run: cd repository/src/image && wget -q -c --trust-server-names 'https://downloads.raspberrypi.org/raspbian_lite_latest'
+      run: cd repository/src/image && wget -q -c --trust-server-names 'https://downloads.raspberrypi.org/raspios_lite_armhf_latest'
 
     - name: Update CustomPiOS Paths
       run: cd repository/src && ../../CustomPiOS/src/update-custompios-paths
@@ -64,12 +66,13 @@ jobs:
       run: sudo modprobe loop && cd repository/src && sudo bash -x ./build_dist
 
     - name: Copy Output
-      run: cp ${{ github.workspace }}/repository/src/workspace/*-raspbian-buster-lite.img "v1pi-${{ env.V1PI_VERSION }}-${{ matrix.hotspot }}".img
+      run: cp ${{ github.workspace }}/repository/src/workspace/*-raspios-bullseye-armhf-lite.img "v1pi-${{ env.V1PI_VERSION }}-${{ matrix.hotspot }}".img
 
     - name: Zip Output
       run: zip -prq "v1pi-${{ env.V1PI_VERSION }}-${{ matrix.hotspot }}".zip "v1pi-${{ env.V1PI_VERSION }}-${{ matrix.hotspot }}".img
 
-    - uses: actions/upload-artifact@v1
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@v2
       with:
         name: v1pi-${{ env.V1PI_VERSION }}-${{ matrix.hotspot }}
         path: v1pi-${{ env.V1PI_VERSION }}-${{ matrix.hotspot }}.img

docs/camera.md

@@ -15,8 +15,8 @@ Set up CNC.js settings
 
 ![image](img/cncjs_webcam_gear.png)
 
-2. Select "Use a M-JPEG stream over HTTP" option, and put this URL for your video stream: `webcam/?action=stream`.
-
+2. Select "Use a M-JPEG stream over HTTP" option, and put this URL for your video stream: `http://v1pi/webcam/?action=stream`.
+  - You may need to put in the IP address or add .local to v1pi to make it work for your network setup.
 ![image](img/cncjs_webcam_settings.png)
 
 2. Click Save Changes.

mkdocs.yml

@@ -19,7 +19,7 @@ theme:
   favicon: "img/favicon.ico"
 
 extra:
-  version: 0.17.0
+  version: 0.18.0
   social:
     - type: 'github'
       link: 'https://github.com/jeffeb3'
@@ -31,6 +31,9 @@ extra:
       link: 'https://liberapay.com/jeffeb3'
     - type: 'globe'
       link: 'https://v1engineering.com'
+  analytics:
+      provider: google
+      property: 'UA-154250450-1'
 
 extra_css: [v1.css]
 
@@ -67,7 +70,3 @@ markdown_extensions:
       permalink: true
   - lightgallery
   - pymdownx.extra
-
-google_analytics:
-  - 'UA-154250450-1'
-  - 'auto'

src/config

@@ -1,6 +1,6 @@
 export DIST_NAME=v1pi
-export DIST_VERSION=0.17.1
-export BASE_IMAGE_ENLARGEROOT=800
+export DIST_VERSION=0.18.0
+export BASE_IMAGE_ENLARGEROOT=1400
 
 source ./hotspot.sh
 

src/modules/cncjs/filesystem/home/pi/.cncrc

@@ -9,12 +9,12 @@
     "commands": [
         {
             "title": "Reboot",
-            "commands": "sudo reboot",
+            "commands": "sudo shutdown -r now",
             "enabled": true
         },
         {
             "title": "Shutdown",
-            "commands": "sudo poweroff",
+            "commands": "sudo shutdown -h now",
             "enabled": true
         }
     ]

src/modules/cncjs/filesystem/home/pi/landingPage/serve.py

@@ -10,13 +10,13 @@ def getServiceRunning(service):
         output = subprocess.check_output(['service', service, 'status'])
     except subprocess.CalledProcessError as err:
         output = err.output
-    if 'active (running)' in output:
+    if b'active (running)' in output:
         print("{} is running".format(service))
         return True
-    if 'active (exited)' in output:
+    if b'active (exited)' in output:
         print("{} has exited".format(service))
         return False
-    if 'inactive (dead)' in output:
+    if b'inactive (dead)' in output:
         print("{} is dead".format(service))
         return False
     print("{} is unknown".format(service))

src/modules/cncjs/filesystem/root/etc/haproxy/haproxy.cfg

@@ -15,8 +15,8 @@ defaults
         option forwardfor
         maxconn 2000
         timeout connect 5s
-        timeout client  15min
-        timeout server  15min
+        timeout client  15m
+        timeout server  15m
 
 frontend landing
         bind :::80 v4v6
@@ -45,7 +45,7 @@ backend octoprint
         errorfile 503 /etc/haproxy/errors/503-no-octoprint.http
 
 backend webcam
-        reqrep ^([^\ :]*)\ /webcam[/]?(.*)     \1\ /\2
+        http-request replace-uri /webcam/(.*) /\1
         server webcam1  127.0.0.1:8080
         errorfile 503 /etc/haproxy/errors/503-no-webcam.http
 

src/modules/cncjs/start_chroot_script

@@ -38,13 +38,14 @@ pushd /home/pi
       # make links to the logos
       pushd landingPage/static
         ln -s /usr/local/lib/node_modules/cncjs/dist/cncjs/app/images/logo-badge-256x256.png logo_cncjs.png
-        ln -s /home/pi/oprint/lib/python2.7/site-packages/octoprint/static/img/logo.png logo_octoprint.png
+        ln -s /home/pi/oprint/lib/python3.9/site-packages/octoprint/static/img/logo.png logo_octoprint.png
         ln -s /var/www/html/app/img/raspAP-logo.png logo_raspap.png
       popd
 
       #build virtualenv
       pushd landingPage
-        sudo -u pi virtualenv flask
+	    # Change to python2 if the landingPage is not comaptible
+        sudo -u pi python3 -m virtualenv --python=python3 flask
         sudo -u pi ./flask/bin/pip install --upgrade pip
         PIP_DEFAULT_TIMEOUT=60 sudo -u pi ./flask/bin/pip install flask
       popd

src/modules/nodejs/config

@@ -2,8 +2,9 @@
 # All our config settings must start with NODEJS
 
 # node.js archive
-# The version of node.js needed for cnc.js is 6: https://cnc.js.org/
-[ -n "$NODEJS_VERSION_STRING" ]  || NODEJS_VERSION_STRING="v6.17.1"
+# The version of node.js needed for cnc.js is 10 or 12: https://cnc.js.org/
+# v10.24.1 armv6l (Pi1,Zero), v12.22.7 arm7l (PI3,4,Zero2 ARMV8)
+[ -n "$NODEJS_VERSION_STRING" ]  || NODEJS_VERSION_STRING="v10.24.1"
 [ -n "$NODEJS_ARCH_STRING" ]     || NODEJS_ARCH_STRING="linux-armv6l"
 [ -n "$NODEJS_VERSION_FOLDER" ]  || NODEJS_VERSION_FOLDER="node-$NODEJS_VERSION_STRING-$NODEJS_ARCH_STRING"
 [ -n "$NODEJS_VERSION_TAR" ]     || NODEJS_VERSION_TAR="$NODEJS_VERSION_FOLDER.tar.gz"