Merge branch 'develop'

Author: jbatonnet

.github/FUNDING.yml

@@ -1 +1 @@
-custom: [ 'https://www.paypal.com/donate/?business=NA32NR3HY8R7Y&no_recurring=1&item_name=Please%20remember%20that%20I%20work%20on%20Rinkhals%20for%20fun%20and%20not%20for%20the%20donations.%20I%20do%20not%20accept%20donations%20to%20work%20on%20specific%20bugs%20or%20features.%20Now%20if%20you%20really%20want%20to,%20everything%20you%20donate%20will%20be%20used%20to%20buy%20my%20next%20printer,%20and%20maybe%20add%20support%20for%20it%20%F0%9F%98%8A&currency_code=CAD' ]
+custom: [ 'https://www.paypal.com/donate/?business=NA32NR3HY8R7Y&no_recurring=1&item_name=Please%20remember%20that%20I%20work%20on%20Rinkhals%20for%20fun%20and%20not%20for%20the%20donations.%20I%20do%20not%20accept%20donations%20to%20work%20on%20specific%20bugs%20or%20features.%20Now%20if%20you%20really%20want%20to,%20everything%20you%20donate%20will%20be%20used%20to%20buy%20my%20next%20printer,%20and%20maybe%20add%20support%20for%20it%20%F0%9F%98%8A&currency_code=CAD' ]

.github/workflows/gh-pages-deploy.yml

@@ -1,49 +1,49 @@
-name: Docs Github Pages Deployment
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - docs/**
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: 3.x
-          cache: 'pip'
-      - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
-      - run: pip install -r ./docs/requirements.txt
-      - name: MkDocs Build
-        working-directory: ./docs
-        run: mkdocs build
-      - name: Upload static files
-        id: deployment
-        uses: actions/upload-pages-artifact@v3 # or specific "vX.X.X" version tag for this action
-        with:
-          path: ./docs/site
-
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
+name: Docs Github Pages Deployment
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - docs/**
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+          cache: 'pip'
+      - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
+      - run: pip install -r ./docs/requirements.txt
+      - name: MkDocs Build
+        working-directory: ./docs
+        run: mkdocs build
+      - name: Upload static files
+        id: deployment
+        uses: actions/upload-pages-artifact@v3 # or specific "vX.X.X" version tag for this action
+        with:
+          path: ./docs/site
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

LICENSE

@@ -1,29 +1,29 @@
-All my scripts / code is provided under this license:
-
-    The MIT License (MIT)
-
-    Copyright (c) 2025 Julien Batonnet
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-
-
-All existing code / binaries / projects (included here to ease the build process) are under their own licenses, such as but not limited to:
-
-- files/3-rinkhals/opt/rinkhals/ui/MaterialIcons-Regular.ttf > https://github.com/google/material-design-icons/blob/master/LICENSE
-- */icon.png > https://www.flaticon.com/free-icon/cobra_375098
+All my scripts / code is provided under this license:
+
+    The MIT License (MIT)
+
+    Copyright (c) 2025 Julien Batonnet
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+
+
+All existing code / binaries / projects (included here to ease the build process) are under their own licenses, such as but not limited to:
+
+- files/3-rinkhals/opt/rinkhals/ui/MaterialIcons-Regular.ttf > https://github.com/google/material-design-icons/blob/master/LICENSE
+- */icon.png > https://www.flaticon.com/free-icon/cobra_375098

README.md

@@ -17,10 +17,10 @@ Latest version will likely support the two latest firmwares from Anycubic, unles
 Here are the suported printers and firmwares with latest Rinkhals release:
 | Model  | Tested firmwares | Notes |
 | -- | -- | -- |
-| Kobra 3 (+ combo) | `2.3.9.3` `2.4.0` |
+| Kobra 3 (+ combo) | `2.4.0` `2.4.0.4` |
 | Kobra 2 Pro | `3.1.2.3` | Only with mainboard [Trigorilla Spe **B** v1.0.x](https://1coderookie.github.io/Kobra2ProInsights/hardware/mainboard/#trigorilla_spe_b_v10x-stock-new-revision). `3.1.4` is buggy |
-| Kobra S1 (+ combo) | `2.5.1.6` `2.5.2.3` |
-| Kobra 3 Max (+ combo) | `2.4.6` |
+| Kobra S1 (+ combo) | `2.5.2.3` `2.5.3.1` |
+| Kobra 3 Max (+ combo) | `2.4.6` `2.4.6.5` |
 
 In case you're wondering this project is named after rinkhals, a sub-species of Cobras ... Kobra ... Rinkhals 👏
 

build/swu-tools/ssh/README.md

@@ -1,35 +1,35 @@
-## Dependencies
-
-dropbear
-> /lib/libc.so.0
-> /lib/ld-uClibc.so.0
-
-sftp-server
-> /usr/lib/libssl.so.1.1
-> /usr/lib/libcrypto.so.1.1
-> /lib/libc.so.0
-> /lib/libatomic.so.1
-> /lib/ld-uClibc.so.0
-
-## Patches
-
-/lib/ld-uClibc.so.0
-/tmp/ssh//ld-uClibc
-
-/usr/libexec/sftp-server
-/tmp/ssh/sftp-server    
-
-cat dropbear.bak |
-    sed "s/\/lib\/ld-uClibc.so.0/\/tmp\/ssh\/\/ld-uClibc/g" \
-    sed "s/\/usr\/libexec\/sftp-server/\/tmp\/ssh\/sftp-server    /g" \
-    > dropbear
-
-cat sftp-server.bak |
-    sed "s/\/lib\/ld-uClibc.so.0/\/tmp\/ssh\/\/ld-uClibc/g" \
-    > sftp-server
-
-chmod +x *
-
-## How to run
-
-LD_LIBRARY_PATH=$(pwd) ./dropbear -F -E -a -p 2222 -P dropbear.pid -r dropbear_rsa_host_key
+## Dependencies
+
+dropbear
+> /lib/libc.so.0
+> /lib/ld-uClibc.so.0
+
+sftp-server
+> /usr/lib/libssl.so.1.1
+> /usr/lib/libcrypto.so.1.1
+> /lib/libc.so.0
+> /lib/libatomic.so.1
+> /lib/ld-uClibc.so.0
+
+## Patches
+
+/lib/ld-uClibc.so.0
+/tmp/ssh//ld-uClibc
+
+/usr/libexec/sftp-server
+/tmp/ssh/sftp-server    
+
+cat dropbear.bak |
+    sed "s/\/lib\/ld-uClibc.so.0/\/tmp\/ssh\/\/ld-uClibc/g" \
+    sed "s/\/usr\/libexec\/sftp-server/\/tmp\/ssh\/sftp-server    /g" \
+    > dropbear
+
+cat sftp-server.bak |
+    sed "s/\/lib\/ld-uClibc.so.0/\/tmp\/ssh\/\/ld-uClibc/g" \
+    > sftp-server
+
+chmod +x *
+
+## How to run
+
+LD_LIBRARY_PATH=$(pwd) ./dropbear -F -E -a -p 2222 -P dropbear.pid -r dropbear_rsa_host_key

docs/README.md

@@ -1,5 +1,5 @@
-To deploy the documentation locally, you'll need to:
-- Have Python installed
-- Install pip dependencies from the `requirements.txt` file
-- Run `python -m mkdocs serve` from this directory
-- Go to http://127.0.0.1:8000/Rinkhals/
+To deploy the documentation locally, you'll need to:
+- Have Python installed
+- Install pip dependencies from the `requirements.txt` file
+- Run `python -m mkdocs serve` from this directory
+- Go to http://127.0.0.1:8000/Rinkhals/

docs/docs/faq.md

@@ -75,4 +75,4 @@ If you update your printer firmware to a version that's not supported with Rinkh
 
 - Wait for the new Rinkhals version to be released. Please do not open issues or ask for ETA, I'm working on my free time!
 - Reinstall a supported version of your printer firmware and install a matching Rinkhals version
-- Starting from 20250316_01, you can create a .enable-rinkhals file at the root of a USB drive, plug it and reboot your printer. It will force Rinkhals to start, but you might experience weird behavior or even worst as the version was not tested.
+- Starting from 20250316_01, you can create a .enable-rinkhals file at the root of a USB drive, plug it and reboot your printer. It will force Rinkhals to start, but you might experience weird behavior or even worse as the version was not tested.

docs/requirements.txt

@@ -1,4 +1,4 @@
-mkdocs-material ~= 9.0
-mkdocs-nav-weight == 0.2.0
-mkdocs-glightbox == 0.4.0
+mkdocs-material ~= 9.0
+mkdocs-nav-weight == 0.2.0
+mkdocs-glightbox == 0.4.0
 Pygments ~= 2.0

files/3-rinkhals/etc/resolv.conf

@@ -1,2 +1,2 @@
-nameserver 1.1.1.1
-nameserver 8.8.8.8
+nameserver 1.1.1.1
+nameserver 8.8.8.8

files/3-rinkhals/home/rinkhals/printer_data/config/printer.custom.cfg

@@ -1,15 +1,15 @@
-# The content of this file will be merged with the main config file
-# You can add new sections, properties, or override existing ones
-# Check printer.generated.cfg to see the generated printer config used in GoKlipper
-
-# You can override a section from the main config file by adding it here
-# New properties will be merged and added, and existing ones will override the main config file
-# [pause_resume]
-# z_up: 11
-
-# You can remove entire sections using a ! before the section name
-# [!gcode_macro M486]
-
-# You can also remove specific properties from a section using a ! before the property name
-# [pause_resume]
-# !z_up:
+# The content of this file will be merged with the main config file
+# You can add new sections, properties, or override existing ones
+# Check printer.generated.cfg to see the generated printer config used in GoKlipper
+
+# You can override a section from the main config file by adding it here
+# New properties will be merged and added, and existing ones will override the main config file
+# [pause_resume]
+# z_up: 11
+
+# You can remove entire sections using a ! before the section name
+# [!gcode_macro M486]
+
+# You can also remove specific properties from a section using a ! before the property name
+# [pause_resume]
+# !z_up: