ci: adapt to new format

Reviewed-on: NaxdyOrg/NaxGCC-FW#23
Reviewed-by: Naxdy <naxdy@naxdy.org>
Co-authored-by: Marcel Romagnuolo <marcello.r@gmx.net>
Co-committed-by: Marcel Romagnuolo <marcello.r@gmx.net>

.forgejo/workflows/clippy-check.yml

@@ -11,12 +11,6 @@ jobs:
     runs-on: nix-flakes
 
     steps:
-      - name: Set up packages
-        run: |
-          echo "extra-substituters = https://builder.naxdy.org/attic" >> /etc/nix/nix.conf
-          echo "extra-trusted-public-keys = attic:05LdE8Nav5Qd1E+KOJqSwdr+WE1z8AUmSb3oKL7s8dk=" >> /etc/nix/nix.conf
-          nix profile install nixpkgs#nodejs "github:zhaofengli/attic?ref=6eabc3f02fae3683bffab483e614bebfcd476b21"
-          echo "PATH=/nix/var/nix/profiles/per-user/root/profile/bin:$PATH" >> "$GITHUB_ENV"
       - uses: actions/checkout@v4
       - name: Run Clippy
         run: |

.forgejo/workflows/nightly-release.yml

@@ -13,24 +13,16 @@ jobs:
     runs-on: nix-flakes
 
     steps:
-      - name: Set up packages
-        run: |
-          echo "extra-substituters = https://builder.naxdy.org/attic" >> /etc/nix/nix.conf
-          echo "extra-trusted-public-keys = attic:05LdE8Nav5Qd1E+KOJqSwdr+WE1z8AUmSb3oKL7s8dk=" >> /etc/nix/nix.conf
-          nix profile install nixpkgs#nodejs "github:zhaofengli/attic?ref=6eabc3f02fae3683bffab483e614bebfcd476b21"
-          echo "PATH=/nix/var/nix/profiles/per-user/root/profile/bin:$PATH" >> "$GITHUB_ENV"
       - name: Set up attic binary cache
-        run: |
-          attic login "${{ vars.PUBLIC_BINARY_CACHE_NAME }}" "${{ vars.BINARY_CACHE_URL }}" "${{ secrets.PUBLIC_BINARY_CACHE_AUTH_KEY }}"
-          attic use "${{ vars.PUBLIC_BINARY_CACHE_NAME }}"
+        uses: https://git.naxdy.org/NaxdyOrg/attic-action@v0.3
+        with:
+          endpoint: "${{ vars.BINARY_CACHE_URL }}"
+          token: "${{ secrets.PUBLIC_BINARY_CACHE_AUTH_KEY }}"
+          cache: "${{ vars.PUBLIC_BINARY_CACHE_NAME }}"
       - uses: actions/checkout@v4
       - name: Build firmware image
         run: |
           nix build .# -o dist --print-build-logs
-      - name: Push derivations to binary cache
-        run: |
-          cd /nix/store
-          attic push "${{ vars.PUBLIC_BINARY_CACHE_NAME }}" $(ls /nix/store --ignore='*.drv' --ignore='*fake_nixpkgs*')
       - name: (Re-)generate tag
         run: |
           git config --global user.email "noreply@naxdy.org"

.forgejo/workflows/stable-release.yml

@@ -10,24 +10,16 @@ jobs:
     runs-on: nix-flakes
 
     steps:
-      - name: Set up packages
-        run: |
-          echo "extra-substituters = https://builder.naxdy.org/attic" >> /etc/nix/nix.conf
-          echo "extra-trusted-public-keys = attic:05LdE8Nav5Qd1E+KOJqSwdr+WE1z8AUmSb3oKL7s8dk=" >> /etc/nix/nix.conf
-          nix profile install nixpkgs#nodejs "github:zhaofengli/attic?ref=6eabc3f02fae3683bffab483e614bebfcd476b21"
-          echo "PATH=/nix/var/nix/profiles/per-user/root/profile/bin:$PATH" >> "$GITHUB_ENV"
       - name: Set up attic binary cache
-        run: |
-          attic login "${{ vars.PUBLIC_BINARY_CACHE_NAME }}" "${{ vars.BINARY_CACHE_URL }}" "${{ secrets.PUBLIC_BINARY_CACHE_AUTH_KEY }}"
-          attic use "${{ vars.PUBLIC_BINARY_CACHE_NAME }}"
+        uses: https://git.naxdy.org/NaxdyOrg/attic-action@v0.3
+        with:
+          endpoint: "${{ vars.BINARY_CACHE_URL }}"
+          token: "${{ secrets.PUBLIC_BINARY_CACHE_AUTH_KEY }}"
+          cache: "${{ vars.PUBLIC_BINARY_CACHE_NAME }}"
       - uses: actions/checkout@v4
       - name: Build firmware image
         run: |
           nix build .# -o dist --print-build-logs
-      - name: Push derivations to binary cache
-        run: |
-          cd /nix/store
-          attic push "${{ vars.PUBLIC_BINARY_CACHE_NAME }}" $(ls /nix/store --ignore='*.drv' --ignore='*fake_nixpkgs*')
       - name: Publish stable release
         uses: https://gitea.com/actions/gitea-release-action@v1.3.0
         with:

src/input_filter.rs

@@ -7,6 +7,10 @@ use crate::{
 
 /**
  * Houses functionality for modifying GCC state before it is sent to the console.
+ *
+ * General info for implementing filters on the sticks:
+ * X and Y values of a stick go each from 0 to 255.
+ * 127.5 is the middle value and when both X and Y are 127.5 the stick is in neutral position.
  */
 
 pub trait InputFilter: Sized {
@@ -100,6 +104,33 @@ impl InputFilter for CStickUpTiltFilter {
     }
 }
 
+/// Improves hitting up/down angled forward tilt at the cost
+/// of making it impossible to hit turnaround up & down tilt
+/// and making it slightly harder to hit regular forward tilt.
+pub struct CStickAngledFTiltFilter;
+
+impl InputFilter for CStickAngledFTiltFilter {
+    fn apply_filter(&mut self, gcc_state: &mut GcReport) {
+        if gcc_state.cstick_y > 147 {
+            if (147..=225).contains(&gcc_state.cstick_x) {
+                gcc_state.cstick_x = 205;
+                gcc_state.cstick_y = 205;
+            } else if (30..=107).contains(&gcc_state.cstick_x) {
+                gcc_state.cstick_x = 50;
+                gcc_state.cstick_y = 205;
+            }
+        } else if gcc_state.cstick_y < 107 {
+            if (147..=225).contains(&gcc_state.cstick_x) {
+                gcc_state.cstick_x = 205;
+                gcc_state.cstick_y = 50;
+            } else if (30..=107).contains(&gcc_state.cstick_x) {
+                gcc_state.cstick_x = 50;
+                gcc_state.cstick_y = 50;
+            }
+        }
+    }
+}
+
 /// Does nothing.
 #[derive(Default)]
 pub struct DummyFilter;