merged lyonbot

.github/workflows/build.yml

@@ -90,7 +90,10 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   build-macos:
-    runs-on: macOS-latest
+    strategy:
+      matrix:
+        os: [macos-latest, macos-13] # -latest if for Apple Silicon, -13 is for Intel
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
     - uses: actions/cache@v3
@@ -114,16 +117,18 @@ jobs:
       # run: MACOSX_DEPLOYMENT_TARGET=10.13 cargo bundle --release
       run: cargo bundle --release
     - name: Package
-      run: cd target/release/bundle/osx/ && zip -r macOS.zip Weylus.app
+      run: |
+        MACOS_BUILD_NAME=macos-$([ "${{ matrix.os }}" == "macos-latest" ] && echo "arm" || echo "intel")
+        echo "MACOS_BUILD_NAME=$MACOS_BUILD_NAME" >> $GITHUB_ENV
+        cd target/release/bundle/osx/ && zip -r ${MACOS_BUILD_NAME}.zip Weylus.app
     - name: Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: ${{ runner.os }}
-        path: |
-          target/release/bundle/osx/macOS.zip
+        name: ${{ env.MACOS_BUILD_NAME }}
+        path: target/release/bundle/osx/${{ env.MACOS_BUILD_NAME }}.zip
     - name: ArtifactsDebug
       if: failure()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ runner.os }}-ffbuild
         path: |

.gitignore

@@ -6,5 +6,8 @@
 /deps/libva
 c_helper/target
 c_helper/Cargo.lock
-*.js
-*.js.map
+.DS_Store
+node_modules
+/www/static/lib.js
+/www/static/style.css
+/www/static/*.map

.vscode/launch.json

@@ -0,0 +1,42 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Debug executable 'weylus'",
+      "cargo": {
+        "args": [
+          "build",
+          "--bin=weylus",
+          "--package=weylus"
+        ],
+        "filter": {
+          "name": "weylus",
+          "kind": "bin"
+        }
+      },
+      "args": [],
+      "cwd": "${workspaceFolder}"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Debug unit tests in executable 'weylus'",
+      "cargo": {
+        "args": [
+          "test",
+          "--no-run",
+          "--bin=weylus",
+          "--package=weylus"
+        ],
+        "filter": {
+          "name": "weylus",
+          "kind": "bin"
+        }
+      },
+      "args": [],
+      "cwd": "${workspaceFolder}"
+    }
+  ]
+}

Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 description = "Use your iPad or Android tablet as graphic tablet."
 
 [dependencies]
-autopilot = { git = "https://github.com/H-M-H/autopilot-rs.git", rev = "63eed09c715bfb665bb23172a3930a528e11691c" }
+autopilot = { git = "https://github.com/lyonbot/autopilot-rs.git", rev = "a92b41edb4818d0d4b4289d49e65420dbe9ab081", version = "0.4.0" }
 bitflags = "^1.3"
 dirs = "^4.0"
 fltk = { version = "^1", features = ["no-pango"] }
@@ -47,7 +47,7 @@ pnet_datalink = "^0.31"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "^0.9"
-core-graphics = "^0.22"
+core-graphics = "^0.23"
 
 [features]
 bench = []