Merge branch 'main' into 'devel'

feat(rog-control-center): Major UI/UX improvements and new features See merge request asus-linux/asusctl!243
fix(ci): Resolve yaml invalid error by adding explicit stages
2026-01-22 17:33:19 +01:00 · 2026-01-16 19:46:41 +00:00 · 2026-01-16 20:43:46 +01:00 · 2026-01-16 19:53:58 +01:00 · 2026-01-16 19:18:15 +01:00 · 2026-01-16 19:13:00 +01:00
5 changed files with 40 additions and 5 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,6 +31,7 @@ stages:
  - deploy

 format:
+  stage: format
  except:
    - tags
  <<: *rust_cache
@@ -42,6 +43,7 @@ format:
    - rm -rf "$CI_PROJECT_DIR/ci-target" || true

 check:
+  stage: check
  except:
    - tags
  <<: *rust_cache
@@ -55,6 +57,7 @@ check:
    - rm -rf "$CI_PROJECT_DIR/ci-target" || true

 test:
+  stage: test
  except:
    - tags
  <<: *rust_cache
@@ -65,6 +68,7 @@ test:
    - rm -rf "$CI_PROJECT_DIR/ci-target" || true

 release:
+  stage: release
  only:
    - tags
  <<: *rust_cache
@@ -90,7 +94,7 @@ pages:
    - rm -rf public
    - mkdir public
    - cp -R ci-target/doc/* public
-    - cp extra/index.html public
+    - if [ -f extra/index.html ]; then cp extra/index.html public; else echo "no extra/index.html to copy"; fi
  artifacts:
    paths:
      - public
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog

+## [6.3.1]
+
+### Changes
+- Removed a lighting mode that is unavailable in windows to G835L: thanks to @shevchenko0013 again!
+
+
 ## [6.3.0]

 ### Changed
--- a/README.md
+++ b/README.md
@@ -13,9 +13,7 @@ Now includes a GUI, `rog-control-center`.

 Due to on-going driver work the minimum suggested kernel version is always **the latest*, as improvements and fixes are continuous.

-Support for some new features is not avilable unless you run a patched kernel with the work I am doing [in this github repo](https://github.com/flukejones/linux/tree/wip/ally-6.13). Use the linked branch, or `wip/ally-6.12`. Everything that is done here is upstreamed eventually (a long process).
-
-Z13 devices will need [these](https://lore.kernel.org/linux-input/20240416090402.31057-1-luke@ljones.dev/T/#t)
+Support for TDP is tied to the new asus-armoury driver: available mainline since linux 6.19: everything older is not supported.

 ## X11 support

@@ -180,3 +178,7 @@ Reference to any ASUS products, services, processes, or other information and/or
 The use of ROG and ASUS trademarks within this website and associated tools and libraries is only to provide a recognisable identifier to users to enable them to associate that these tools will work with ASUS ROG laptops.

 ---
+
+## AI Disaclaimer
+
+Portions of this code have been written by various AI tools and reviewed by the maintainer exaclty as with every other contribution.
--- a/extra/index.html
+++ b/extra/index.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <title>asusctl docs</title>
+  <!-- Redirect to the generated crate docs -->
+  <meta http-equiv="refresh" content="0;url=asusctl/index.html">
+  <link rel="canonical" href="asusctl/index.html">
+  <style>
+    body { font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial; color:#222; display:flex; align-items:center; justify-content:center; height:100vh; margin:0 }
+    .box { text-align:center }
+    a { color: #0366d6 }
+  </style>
+</head>
+<body>
+  <div class="box">
+    <h1>asusctl documentation</h1>
+    <p>Redirecting to the generated docs — if your browser doesn't redirect automatically, <a href="asusctl/index.html">click here</a>.</p>
+    <p>If you expected a different landing page, update <code>extra/index.html</code> accordingly.</p>
+  </div>
+</body>
+</html>
--- a/rog-aura/data/aura_support.ron
+++ b/rog-aura/data/aura_support.ron
@@ -570,7 +570,7 @@
        device_name: "G835L",
        product_id: "",
        layout_name: "g814ji-per-key",
-        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Comet, Flash],
        basic_zones: [],
        advanced_type: PerKey,
        power_zones: [Keyboard, Lightbar, Logo],
Author	SHA1	Message	Date
mihai2mn	9cbc2272b5	Merge branch 'main' into 'devel' feat(rog-control-center): Major UI/UX improvements and new features See merge request asus-linux/asusctl!243	2026-01-16 19:46:41 +00:00
mihai2mn	f5f997e057	fix(ci): Resolve yaml invalid error by adding explicit stages	2026-01-16 20:43:46 +01:00
Denis Benato	b20ecf5378	chore: README.md edits	2026-01-16 19:53:58 +01:00
Denis Benato	ade839e981	chore: Update README.md	2026-01-16 19:18:15 +01:00
Denis Benato	d625c279a6	fix: G835LW doesn't have pulse available in windows	2026-01-16 19:13:00 +01:00
Denis Benato	5ea14be3fa	chore: add extra/index.html: docs landing redirect to asusctl docs	2026-01-14 14:25:13 +01:00
Denis Benato	64c2e55db4	chore: prepare for a new version	2026-01-14 02:27:39 +01:00