From e8bb9c659106c52fed653114272d763882f7e1a0 Mon Sep 17 00:00:00 2001
From: user_1781515504933 <email_1781515504933>
Date: Wed, 30 Sep 2026 14:15:33 +0700
Subject: [PATCH 1/9] feat: add Noir S1 configurator workspace

---
 src/app/OverviewPage.tsx           |  54 +++++++++++-
 src/app/cards/AdvancedCards.tsx    |  20 ++++-
 src/app/cards/DpiCard.tsx          |  12 ++-
 src/app/cards/PerformanceCards.tsx |   1 +
 src/app/cards/availability.test.ts |  36 ++++++++
 src/app/cards/availability.ts      |  10 +--
 src/control.css                    |   4 +
 src/device/controller.ts           | 132 +++++++++++++++++++++++++++--
 src/device/m2nex-profiles.test.ts  |  10 +++
 src/device/m2nex-profiles.ts       |  56 +++++++++---
 10 files changed, 302 insertions(+), 33 deletions(-)

diff --git a/src/app/OverviewPage.tsx b/src/app/OverviewPage.tsx
index 326df2f6..08e33f02 100644
--- a/src/app/OverviewPage.tsx
+++ b/src/app/OverviewPage.tsx
@@ -94,10 +94,23 @@ const M2_NEX_BUTTON_MARKER_POSITIONS: Readonly<Record<string, ButtonMarkerPositi
   "scroll down": { x: 0.62, y: 0.29 },
 };
 
+const NOIR_S1_BUTTON_MARKER_POSITIONS: Readonly<Record<string, ButtonMarkerPosition>> = {
+  left: { x: 0.39, y: 0.24 },
+  right: { x: 0.61, y: 0.24 },
+  middle: { x: 0.5, y: 0.31 },
+  forward: { x: 0.27, y: 0.47 },
+  backward: { x: 0.27, y: 0.59 },
+  dpi: { x: 0.5, y: 0.42 },
+};
+
 function m2NexButtonMarkerPosition(button: string): ButtonMarkerPosition | null {
   return M2_NEX_BUTTON_MARKER_POSITIONS[button.trim().toLowerCase()] ?? null;
 }
 
+function noirS1ButtonMarkerPosition(button: string): ButtonMarkerPosition | null {
+  return NOIR_S1_BUTTON_MARKER_POSITIONS[button.trim().toLowerCase()] ?? null;
+}
+
 // Device artwork requests go straight to the documented GitHub issue form
 // (public/devices/README.md, .github/ISSUE_TEMPLATE/device-artwork.yml).
 const ARTWORK_ISSUE_URL = "https://github.com/OpenMouse-Project/openmouse/issues/new?template=device-artwork.yml";
@@ -219,7 +232,10 @@ function DeviceShowcase({ snapshot }: {
 function M2NexProfileOverview({ snapshot }: { snapshot: ControlSnapshot }): ReactNode {
   const status = snapshot.status;
   const locale = snapshot.preferences.locale;
-  if (status?.brand !== "Noir Gear" || status.name !== "M2-NEX" || snapshot.m2nexProfiles === null) return null;
+  const isNoirProfile = status?.brand === "Noir Gear"
+    && (status.name === "M2-NEX" || status.name === "NOIR S1");
+  const profileImportRef = useRef<HTMLInputElement>(null);
+  if (!isNoirProfile || snapshot.m2nexProfiles === null) return null;
   const profile = snapshot.m2nexProfiles[snapshot.activeM2NexProfile];
   if (!profile) return null;
   const applyDisabled = snapshot.settingInProgress || snapshot.pending.count > 0;
@@ -250,6 +266,20 @@ function M2NexProfileOverview({ snapshot }: { snapshot: ControlSnapshot }): Reac
         {snapshot.m2nexProfileDirty ? t(locale, "m2nex.pending") : t(locale, "m2nex.saved")}
       </span>
       <div className="m2nex-profile-overview-actions">
+        <button
+          type="button"
+          disabled={snapshot.settingInProgress || snapshot.pending.busy}
+          onClick={control.createM2NexProfile}
+        >
+          New
+        </button>
+        <button
+          type="button"
+          disabled={snapshot.settingInProgress || snapshot.pending.busy}
+          onClick={() => profileImportRef.current?.click()}
+        >
+          Import
+        </button>
         <button
           className="m2nex-profile-overview-apply"
           type="button"
@@ -266,6 +296,18 @@ function M2NexProfileOverview({ snapshot }: { snapshot: ControlSnapshot }): Reac
           {t(locale, "m2nex.save")}
         </button>
       </div>
+      <input
+        ref={profileImportRef}
+        className="visually-hidden"
+        type="file"
+        accept="application/json,.json"
+        onChange={(event) => {
+          const file = event.currentTarget.files?.[0];
+          event.currentTarget.value = "";
+          if (!file) return;
+          void file.text().then((text) => control.importM2NexProfiles(text));
+        }}
+      />
     </section>
   );
 }
@@ -275,9 +317,10 @@ export function DeviceShowcaseSidebar({ snapshot }: { snapshot: ControlSnapshot
   if (!status) return null;
   const locale = snapshot.preferences.locale;
   const image = snapshot.deviceArtwork;
+  const isNoirS1 = status.brand === "Noir Gear" && status.name === "NOIR S1";
   const showButtonMarkers = snapshot.workspaceTab === "buttons"
     && status.brand === "Noir Gear"
-    && status.name === "M2-NEX"
+    && (status.name === "M2-NEX" || isNoirS1)
     && status.buttonMappings != null;
 
   return (
@@ -296,7 +339,9 @@ export function DeviceShowcaseSidebar({ snapshot }: { snapshot: ControlSnapshot
             />
             <div className="button-map-markers" aria-hidden="true">
               {Object.keys(status.buttonMappings ?? {}).map((button, index) => {
-                const position = m2NexButtonMarkerPosition(button);
+                const position = isNoirS1
+                  ? noirS1ButtonMarkerPosition(button)
+                  : m2NexButtonMarkerPosition(button);
                 if (!position) return null;
                 return (
                   <span
@@ -767,7 +812,8 @@ export function OverviewPage({
   const locale = preferences.locale;
 
   const tabs = availableWorkspaceTabs(status !== null, cardAvailability(snapshot), {
-    hideLighting: status?.brand === "Noir Gear" && status.name === "M2-NEX",
+    hideLighting: status?.brand === "Noir Gear"
+      && (status.name === "M2-NEX" || status.name === "NOIR S1"),
   });
   const workspaceTab = availableWorkspaceTab(snapshot.workspaceTab, tabs);
   const workspaceSnapshot = workspaceTab === snapshot.workspaceTab
diff --git a/src/app/cards/AdvancedCards.tsx b/src/app/cards/AdvancedCards.tsx
index 8fe2ed24..726d2060 100644
--- a/src/app/cards/AdvancedCards.tsx
+++ b/src/app/cards/AdvancedCards.tsx
@@ -1940,12 +1940,14 @@ export function ButtonMappingCard({ snapshot }: { snapshot: ControlSnapshot }):
   if (!status?.buttonMappings || !status.buttonOptions?.length) return null;
   const locale = snapshot.preferences.locale;
   const options = status.buttonOptions;
-  const isM2Nex = status.brand === "Noir Gear"
-    && status.name === "M2-NEX"
+  const isNoirProfile = status.brand === "Noir Gear"
+    && (status.name === "M2-NEX" || status.name === "NOIR S1")
     && snapshot.m2nexProfiles !== null;
-  const selectedM2NexProfile = isM2Nex
+  const selectedM2NexProfile = isNoirProfile
     ? snapshot.m2nexProfiles?.[snapshot.activeM2NexProfile]
     : null;
+  const isM2Nex = status.brand === "Noir Gear" && status.name === "M2-NEX";
+  const canResetKsnake = isNoirProfile;
   const mappings = selectedM2NexProfile?.buttonMappings ?? status.buttonMappings;
   // fixedButtons lands with mouse-protocol#68; read defensively so this
   // builds against the published protocol until then.
@@ -1989,6 +1991,18 @@ export function ButtonMappingCard({ snapshot }: { snapshot: ControlSnapshot }):
           );
         })}
       </div>
+      {canResetKsnake ? (
+        <div className="button-map-footer">
+          <button
+            type="button"
+            className="button-map-reset"
+            disabled={snapshot.settingInProgress || snapshot.pending.busy}
+            onClick={control.resetKsnakeButtonMappings}
+          >
+            Reset to default
+          </button>
+        </div>
+      ) : null}
       {!selectedM2NexProfile ? (
         <p className="field-note">{t(locale, "map.defaultNote")}</p>
       ) : null}
diff --git a/src/app/cards/DpiCard.tsx b/src/app/cards/DpiCard.tsx
index b7c1f69c..d689cf09 100644
--- a/src/app/cards/DpiCard.tsx
+++ b/src/app/cards/DpiCard.tsx
@@ -48,7 +48,9 @@ function DpiStageEditor({
 
   const naturalMode: "logitech" | "stage" | "generic" = isLogitech ? "logitech" : isStage ? "stage" : "generic";
   const mode: "logitech" | "stage" | "generic" = editorView === "single" ? "generic" : naturalMode;
-  const showM2NexStageColors = mode === "stage" && status?.brand === "Noir Gear" && status.name === "M2-NEX";
+  const stageColors = mode === "stage" ? status?.dpiStageColors ?? null : null;
+  const showStageColors = mode === "stage"
+    && (stageColors?.length ?? 0) >= (status?.dpiStages?.length ?? 0);
   const limits = snapshot.profile.slotLimits;
   // The single-DPI (generic) view writes the live DPI, not the profile, so it
   // must not be gated behind the profile's slot-write lock.
@@ -269,7 +271,7 @@ function DpiStageEditor({
   const enabledCount = rows.filter((row) => row.enabled).length;
 
   return (
-    <div id="dpi-stage-editor" className={`dpi-editor mode-${mode}${showM2NexStageColors ? " has-m2nex-stage-colors" : ""}`}>
+    <div id="dpi-stage-editor" className={`dpi-editor mode-${mode}${showStageColors ? " has-m2nex-stage-colors" : ""}`}>
       <div className="dpi-editor-bar">
         <span className="dpi-editor-bar-label">
           {t(locale, mode === "logitech" ? "dpi.slotsInUse" : mode === "stage" ? "dpi.stagesInUse" : "dpi.presetsInUse")}
@@ -285,11 +287,13 @@ function DpiStageEditor({
             ? compactIndex(index) === snapshot.dpiSlotPlan.defaultIndex
             : false;
           const highlighted = mode === "generic" ? row.enabled : mode === "stage" ? isActive === true : isStarting;
-          const stageColorClass = showM2NexStageColors ? ` m2nex-stage-${index + 1}` : "";
+          const stageColorClass = showStageColors ? ` m2nex-stage-${index + 1}` : "";
+          const stageColor = showStageColors ? stageColors?.[index] : undefined;
           return (
             <div
               key={index}
               className={`dpi-editor-row${row.enabled ? "" : " is-off"}${highlighted ? " is-active" : ""}${stageColorClass}`}
+              style={stageColor ? { "--dpi-stage-color": stageColor } as CSSProperties : undefined}
             >
               <label className="dpi-editor-check">
                 <input
@@ -310,7 +314,7 @@ function DpiStageEditor({
                 aria-pressed={highlighted}
                 onClick={() => setActive(index)}
               >
-                {showM2NexStageColors ? <span className="dpi-editor-stage-swatch" aria-hidden="true" /> : null}
+                {showStageColors ? <span className="dpi-editor-stage-swatch" aria-hidden="true" /> : null}
                 <span>{index + 1}</span>
               </button>
               <input
diff --git a/src/app/cards/PerformanceCards.tsx b/src/app/cards/PerformanceCards.tsx
index 08be77a6..5f6be781 100644
--- a/src/app/cards/PerformanceCards.tsx
+++ b/src/app/cards/PerformanceCards.tsx
@@ -204,6 +204,7 @@ export function SensorCard({ snapshot }: { snapshot: ControlSnapshot }): ReactNo
 export function hasLiftOff(snapshot: ControlSnapshot): boolean {
   const status = snapshot.status;
   if (!status || snapshot.profile.slotsAvailable) return false;
+  if (status.ui?.hideLodControl === true) return false;
   return Boolean(status.asymmetricLiftOff)
     || Boolean(status.liftOffScale)
     || status.liftOffDistance != null
diff --git a/src/app/cards/availability.test.ts b/src/app/cards/availability.test.ts
index 2c36c32d..e4ec45dd 100644
--- a/src/app/cards/availability.test.ts
+++ b/src/app/cards/availability.test.ts
@@ -389,6 +389,42 @@ test("M2-NEX keeps lighting out of Advanced", () => {
   assert.equal(has.lightingAdvanced, false);
 });
 
+test("NOIR S1 exposes its standard controls and hides unsupported extras", () => {
+  const has = cardAvailability(snapshot({
+    status: {
+      brand: "Noir Gear",
+      name: "NOIR S1",
+      ui: {
+        family: "ksnake",
+        showAdvancedSection: true,
+        hideSleepCard: true,
+        hideLodControl: true,
+      },
+      buttonMappings: {
+        Left: "Left click",
+        Right: "Right click",
+        Middle: "Middle click",
+        Forward: "Forward",
+        Backward: "Backward",
+        DPI: "DPI loop",
+      },
+      buttonOptions: ["Left click", "Right click", "Scroll up", "DPI loop"],
+      dpiStages: [800, 1200, 1600, 3200, 5000, 12000],
+      scrollDirection: "Reverse",
+      lighting: {} as never,
+    },
+  }));
+  assert.equal(has.dpi, true);
+  assert.equal(has.polling, true);
+  assert.equal(has.buttonMapping, true);
+  assert.equal(has.ksnakeScroll, true);
+  assert.equal(has.ksnakeMacros, true);
+  assert.equal(has.lighting, true);
+  assert.equal(has.lightingAdvanced, false);
+  assert.equal(has.sleep, false);
+  assert.equal(has.sensor, false);
+});
+
 test("the generic button card follows the driver\'s mappings, not the advanced section", () => {
   const has = cardAvailability(snapshot({
     status: {
diff --git a/src/app/cards/availability.ts b/src/app/cards/availability.ts
index 79426176..4eb6bbd9 100644
--- a/src/app/cards/availability.ts
+++ b/src/app/cards/availability.ts
@@ -95,9 +95,10 @@ export function cardAvailability(snapshot: ControlSnapshot): CardAvailability {
   const { traits, capabilities } = snapshot;
   const ready = !snapshot.settingsPending;
   const host = traits.advancedSection;
-  const isM2Nex = status.brand === "Noir Gear" && status.name === "M2-NEX";
+  const isNoirKsnake = status.brand === "Noir Gear"
+    && (status.name === "M2-NEX" || status.name === "NOIR S1");
 
-  const sensor = !(!status.gamingSurfaceMode
+  const sensor = ui?.hideLodControl !== true && !(!status.gamingSurfaceMode
     && Array.isArray(status.supportedLiftOffDistances)
     && status.supportedLiftOffDistances.length === 0);
 
@@ -137,14 +138,13 @@ export function cardAvailability(snapshot: ControlSnapshot): CardAvailability {
     lightforce: Boolean(status.lightforceSwitchMode),
     superstrike: traits.logitech && status.analogButtonTuning?.buttons.length === 2,
     lighting: Boolean(status.lighting || status.lightingZones?.length),
-    lightingAdvanced: host && !isM2Nex && Boolean(status.lighting || status.lightingZones?.length),
+    lightingAdvanced: host && !isNoirKsnake && Boolean(status.lighting || status.lightingZones?.length),
     onboardProfiles: (status.profileCount ?? 0) > 1 && status.activeProfile != null,
     buttonMapping: Boolean(status.buttonMappings) && Boolean(status.buttonOptions?.length),
     // K-snake/M2-NEX exposes the macro write/commit path. The editor starts
     // with local slots because this firmware does not expose a reliable macro
     // read through the browser.
-    ksnakeMacros: ui?.family === "ksnake"
-      || (status.brand === "Noir Gear" && status.name === "M2-NEX"),
+    ksnakeMacros: ui?.family === "ksnake" || isNoirKsnake,
     powerMode: host && Boolean(status.powerModes?.length),
     profiles: traits.logitech
       && status.deviceMode !== undefined && status.deviceMode !== "Unknown",
diff --git a/src/control.css b/src/control.css
index e1d76383..8e48f13f 100644
--- a/src/control.css
+++ b/src/control.css
@@ -1920,6 +1920,10 @@ body { height: 100vh; overflow: hidden; }
   border-color: color-mix(in srgb, var(--ui-accent) 82%, #ffffff);
   background: color-mix(in srgb, var(--ui-accent) 82%, #ffffff);
 }
+.button-map-footer { display:flex;justify-content:flex-end;margin-top:.7rem;padding-top:.65rem;border-top:1px solid var(--border-rule) }
+.button-map-reset { padding:.42rem .65rem;border:1px solid var(--border);border-radius:6px;background:var(--surface-control);color:var(--text-soft);font-size:.62rem;font-weight:600;cursor:pointer }
+.button-map-reset:hover:not(:disabled) { border-color:var(--border-hover);color:var(--text-hover);background:var(--surface-hover-soft) }
+.button-map-reset:disabled { opacity:.5;cursor:not-allowed }
 @media (max-width: 760px) {
   .m2nex-profile-overview {
     width: calc(100% - 1rem);
diff --git a/src/device/controller.ts b/src/device/controller.ts
index 5f179bf3..1a3b035a 100644
--- a/src/device/controller.ts
+++ b/src/device/controller.ts
@@ -106,7 +106,10 @@ import type { KsnakeMacroProfile } from "@openmouse/protocol/ksnake";
 import {
   cloneM2NexProfile,
   loadM2NexProfiles,
+  parseM2NexProfileImport,
   saveM2NexProfiles,
+  NOIR_S1_PROFILE_COUNT,
+  NOIR_S1_PROFILE_STORAGE_KEY,
   type M2NexProfile,
 } from "./m2nex-profiles";
 import {
@@ -668,6 +671,7 @@ type M2NexProfileClient = KsnakeMacroClient & {
   setDpiStageValue(stage: number, dpi: number): Promise<unknown>;
   setActiveDpiStage(stage: number): Promise<unknown>;
   setPollingRate(rate: number): Promise<unknown>;
+  setScrollDirection(direction: NonNullable<MouseStatus["scrollDirection"]>): Promise<unknown>;
 };
 
 function ksnakeMacroClient(): KsnakeMacroClient | null {
@@ -678,11 +682,24 @@ function ksnakeMacroClient(): KsnakeMacroClient | null {
 }
 
 function isM2NexStatus(status: MouseStatus | null | undefined = latestDeviceStatus): boolean {
-  return status?.brand === "Noir Gear" && status.name === "M2-NEX";
+  return status?.brand === "Noir Gear" && (status.name === "M2-NEX" || status.name === "NOIR S1");
+}
+
+function isNoirS1Status(status: MouseStatus | null | undefined = latestDeviceStatus): boolean {
+  return status?.brand === "Noir Gear" && status.name === "NOIR S1";
+}
+
+function noirProfileStoreOptions(status: MouseStatus | null | undefined = latestDeviceStatus): {
+  count?: number;
+  storageKey?: string;
+} | undefined {
+  return isNoirS1Status(status)
+    ? { count: NOIR_S1_PROFILE_COUNT, storageKey: NOIR_S1_PROFILE_STORAGE_KEY }
+    : undefined;
 }
 
 function persistM2NexProfiles(): void {
-  if (m2nexProfiles !== null) saveM2NexProfiles(localStorage, m2nexProfiles);
+  if (m2nexProfiles !== null) saveM2NexProfiles(localStorage, m2nexProfiles, noirProfileStoreOptions());
 }
 
 function profileMacroTable(): KsnakeMacroProfile[] | null {
@@ -704,8 +721,9 @@ function seedM2NexProfiles(status: MouseStatus): void {
     activeDpiStage: status.activeDpiStage,
     pollingRateHz: status.pollingRateHz,
     buttonMappings: status.buttonMappings,
+    scrollDirection: status.scrollDirection,
     macros: null,
-  });
+  }, noirProfileStoreOptions(status));
   activeM2NexProfile = Math.min(activeM2NexProfile, m2nexProfiles.length - 1);
   m2nexProfileDirty = false;
 }
@@ -763,10 +781,65 @@ export function selectM2NexProfile(index: number): void {
   emit();
 }
 
+/** Create a named local slot without changing the hardware. The vendor S1
+ * utility calls this action Create; the selected slot is the new draft. */
+export function createM2NexProfile(): void {
+  if (!isM2NexStatus() || !m2nexProfiles?.[activeM2NexProfile]) return;
+  const current = m2nexProfiles[activeM2NexProfile];
+  const suggested = `Profile ${activeM2NexProfile + 1}`;
+  const name = window.prompt("Profile name", suggested)?.trim();
+  if (!name) return;
+  m2nexProfiles = m2nexProfiles.map((profile, index) => index === activeM2NexProfile
+    ? { ...cloneM2NexProfile(current), name }
+    : profile);
+  m2nexProfileDirty = true;
+  persistM2NexProfiles();
+  setReadStatus(`${name} created locally. Apply it when you are ready.`);
+  emit();
+}
+
+/** Import the official-style `{ deviceModel, profileData }` JSON envelope. */
+export function importM2NexProfiles(text: string): void {
+  if (!isM2NexStatus() || !m2nexProfiles) return;
+  let raw: unknown;
+  try {
+    raw = JSON.parse(text);
+  } catch {
+    setReadStatus("This profile file is not valid JSON.");
+    emit();
+    return;
+  }
+  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
+    setReadStatus("This profile file has an unsupported format.");
+    emit();
+    return;
+  }
+  const payload = raw as { deviceModel?: unknown };
+  if (typeof payload.deviceModel === "string" && payload.deviceModel !== latestDeviceStatus?.name) {
+    setReadStatus(`This profile belongs to ${payload.deviceModel}, not ${latestDeviceStatus?.name ?? "this mouse"}.`);
+    emit();
+    return;
+  }
+  const profiles = parseM2NexProfileImport(raw, m2nexProfiles.length);
+  if (!profiles) {
+    setReadStatus(`Import requires exactly ${m2nexProfiles.length} valid profile slots.`);
+    emit();
+    return;
+  }
+  m2nexProfiles = profiles;
+  activeM2NexProfile = 0;
+  m2nexProfileDirty = false;
+  setEditorToM2NexProfile();
+  persistM2NexProfiles();
+  setReadStatus(`${latestDeviceStatus?.name ?? "Mouse"} profiles imported.`);
+  pushToast("success", "Profiles imported", `${profiles.length} local profiles are ready to apply.`);
+  emit();
+}
+
 /** Edit the selected profile without touching the mouse yet. */
 export function updateM2NexProfileButton(button: string, action: string): void {
   if (!isM2NexStatus() || !m2nexProfiles?.[activeM2NexProfile]) return;
-  if (button === "Left") return;
+  if (button === "Left" && !isNoirS1Status()) return;
   const current = m2nexProfiles[activeM2NexProfile];
   m2nexProfiles = m2nexProfiles.map((profile, index) => index === activeM2NexProfile
     ? { ...profile, buttonMappings: { ...profile.buttonMappings, [button]: action } }
@@ -790,6 +863,7 @@ export function saveCurrentM2NexProfile(): void {
         activeDpiStage: status.activeDpiStage ?? 0,
         pollingRateHz: status.pollingRateHz,
         buttonMappings: { ...(status.buttonMappings ?? {}) },
+        scrollDirection: status.scrollDirection ?? profile.scrollDirection,
         macros: macros ?? profile.macros,
       }
     : profile);
@@ -816,7 +890,8 @@ export async function applyM2NexProfile(index = activeM2NexProfile): Promise<voi
     || typeof rawClient.setButtonMapping !== "function"
     || typeof rawClient.setDpiStageValue !== "function"
     || typeof rawClient.setActiveDpiStage !== "function"
-    || typeof rawClient.setPollingRate !== "function") {
+    || typeof rawClient.setPollingRate !== "function"
+    || typeof rawClient.setScrollDirection !== "function") {
     setReadStatus(st("m2nex.incomplete"));
     return;
   }
@@ -838,7 +913,7 @@ export async function applyM2NexProfile(index = activeM2NexProfile): Promise<voi
     const currentMappings = before.buttonMappings ?? {};
     const options = before.buttonOptions ?? [];
     for (const [button, action] of Object.entries(profile.buttonMappings)) {
-      if (button === "Left" || action.startsWith("Custom (") || action === "Unknown") continue;
+      if ((!isNoirS1Status() && button === "Left") || action.startsWith("Custom (") || action === "Unknown") continue;
       if (!options.includes(action) || currentMappings[button] === action) continue;
       pendingStatusText = `Applying ${profile.name}: ${button}…`;
       readStatus = pendingStatusText;
@@ -866,6 +941,12 @@ export async function applyM2NexProfile(index = activeM2NexProfile): Promise<voi
       emit();
       await rawClient.setPollingRate(profile.pollingRateHz);
     }
+    if (profile.scrollDirection && before.scrollDirection !== profile.scrollDirection) {
+      pendingStatusText = `Applying ${profile.name}: scroll direction…`;
+      readStatus = pendingStatusText;
+      emit();
+      await rawClient.setScrollDirection(profile.scrollDirection);
+    }
 
     const status = await statusAfterWrite(active as SupportedClient);
     applyStatus(status);
@@ -4685,6 +4766,45 @@ export function applyDeviceButtonMapping(button: string, action: string): void {
   });
 }
 
+/** Restore the verified K-snake/Noir button table. This is intentionally
+ * separate from the unverified full factory-reset command in the vendor UI. */
+export function resetKsnakeButtonMappings(): void {
+  if (!isM2NexStatus()) return;
+  const client = active as unknown as Partial<{
+    resetButtonMappings(): Promise<unknown>;
+  }> | null;
+  if (typeof client?.resetButtonMappings !== "function") {
+    setReadStatus("Button defaults are not available on this firmware.");
+    emit();
+    return;
+  }
+  stageChange({
+    key: "ksnake-button-reset",
+    label: "Default button map",
+    command: "Restore default button mapping",
+    progress: "Restoring default button mapping…",
+    preview: (status) => {
+      if (!status.buttonMappings) return;
+      const defaults: Record<string, string> = {
+        Left: "Left click",
+        Right: "Right click",
+        Middle: "Middle click",
+        Forward: "Forward",
+        Backward: "Backward",
+        "Scroll up": "Scroll up",
+        "Scroll down": "Scroll down",
+        DPI: "DPI loop",
+      };
+      status.buttonMappings = Object.fromEntries(
+        Object.keys(status.buttonMappings).map((button) => [button, defaults[button] ?? status.buttonMappings?.[button] ?? "Unknown"]),
+      );
+    },
+    apply: async () => {
+      await client.resetButtonMappings!();
+    },
+  });
+}
+
 /**
  * Switch a numbered onboard profile on any driver that exposes `setProfile`.
  * The device's DPI and polling belong to the profile, so the panel re-reads
diff --git a/src/device/m2nex-profiles.test.ts b/src/device/m2nex-profiles.test.ts
index a056b3e5..e244fe9a 100644
--- a/src/device/m2nex-profiles.test.ts
+++ b/src/device/m2nex-profiles.test.ts
@@ -3,8 +3,10 @@ import test from "node:test";
 
 import {
   M2NEX_PROFILE_STORAGE_KEY,
+  NOIR_S1_PROFILE_COUNT,
   defaultM2NexProfiles,
   loadM2NexProfiles,
+  parseM2NexProfileImport,
   saveM2NexProfiles,
   type M2NexProfileSeed,
 } from "./m2nex-profiles.ts";
@@ -70,3 +72,11 @@ test("invalid stored profiles fall back to current mouse settings", () => {
   assert.deepEqual(loaded.map((profile) => profile.name), ["Profile 1", "Profile 2", "Profile 3"]);
   assert.deepEqual(loaded[0]?.dpiStages, [800, 1600, 3200]);
 });
+
+test("S1 keeps six local slots and accepts the vendor profile envelope", () => {
+  const profiles = defaultM2NexProfiles(seed(), NOIR_S1_PROFILE_COUNT);
+  const imported = parseM2NexProfileImport({ deviceModel: "NOIR S1", profileData: profiles }, NOIR_S1_PROFILE_COUNT);
+  assert.equal(profiles.length, 6);
+  assert.equal(imported?.length, NOIR_S1_PROFILE_COUNT);
+  assert.equal(imported?.[5]?.name, "Profile 6");
+});
diff --git a/src/device/m2nex-profiles.ts b/src/device/m2nex-profiles.ts
index ed2053e7..7e896bce 100644
--- a/src/device/m2nex-profiles.ts
+++ b/src/device/m2nex-profiles.ts
@@ -1,9 +1,12 @@
 import type { KsnakeMacroProfile } from "@openmouse/protocol/ksnake";
 import type { MouseStatus } from "@openmouse/protocol/drivers/mouse-types";
 
-/** The same three-slot mental model used by the M2-NEX vendor application. */
+/** M2-NEX keeps the compact three-slot model used by its vendor utility. */
 export const M2NEX_PROFILE_COUNT = 3;
 export const M2NEX_PROFILE_STORAGE_KEY = "openmouse.m2-nex.profiles.v1";
+/** S1's official configurator exposes six local profile slots. */
+export const NOIR_S1_PROFILE_COUNT = 6;
+export const NOIR_S1_PROFILE_STORAGE_KEY = "openmouse.noir-s1.profiles.v1";
 
 export interface M2NexProfile {
   id: number;
@@ -13,6 +16,7 @@ export interface M2NexProfile {
   activeDpiStage: number;
   pollingRateHz: number;
   buttonMappings: Record<string, string>;
+  scrollDirection?: "Forward" | "Reverse";
   /** Null means this profile has no trustworthy macro table yet. */
   macros: KsnakeMacroProfile[] | null;
 }
@@ -24,7 +28,7 @@ interface StoredM2NexProfiles {
 
 export type M2NexProfileSeed = Pick<
   MouseStatus,
-  "dpi" | "dpiStages" | "activeDpiStage" | "pollingRateHz" | "buttonMappings"
+  "dpi" | "dpiStages" | "activeDpiStage" | "pollingRateHz" | "buttonMappings" | "scrollDirection"
 > & {
   macros?: readonly KsnakeMacroProfile[] | null;
 };
@@ -44,6 +48,7 @@ export function cloneM2NexProfile(profile: M2NexProfile): M2NexProfile {
     activeDpiStage: profile.activeDpiStage,
     pollingRateHz: profile.pollingRateHz,
     buttonMappings: { ...profile.buttonMappings },
+    ...(profile.scrollDirection ? { scrollDirection: profile.scrollDirection } : {}),
     macros: cloneMacros(profile.macros),
   };
 }
@@ -57,12 +62,18 @@ function seedProfile(id: number, seed: M2NexProfileSeed): M2NexProfile {
     activeDpiStage: Math.min(Math.max(seed.activeDpiStage ?? 0, 0), stages.length - 1),
     pollingRateHz: seed.pollingRateHz,
     buttonMappings: { ...(seed.buttonMappings ?? {}) },
+    ...(seed.scrollDirection ? { scrollDirection: seed.scrollDirection } : {}),
     macros: cloneMacros(seed.macros),
   };
 }
 
-export function defaultM2NexProfiles(seed: M2NexProfileSeed): M2NexProfile[] {
-  return Array.from({ length: M2NEX_PROFILE_COUNT }, (_, id) => seedProfile(id, seed));
+export interface M2NexProfileStoreOptions {
+  count?: number;
+  storageKey?: string;
+}
+
+export function defaultM2NexProfiles(seed: M2NexProfileSeed, count = M2NEX_PROFILE_COUNT): M2NexProfile[] {
+  return Array.from({ length: count }, (_, id) => seedProfile(id, seed));
 }
 
 function validProfile(value: unknown): value is M2NexProfile {
@@ -79,11 +90,12 @@ function validProfile(value: unknown): value is M2NexProfile {
     && typeof profile.buttonMappings === "object"
     && profile.buttonMappings !== null
     && Object.values(profile.buttonMappings).every((action) => typeof action === "string")
+    && (profile.scrollDirection === undefined || profile.scrollDirection === "Forward" || profile.scrollDirection === "Reverse")
     && (profile.macros === null || profile.macros === undefined || Array.isArray(profile.macros));
 }
 
-function normalizeProfiles(raw: unknown): M2NexProfile[] | null {
-  if (!Array.isArray(raw) || raw.length !== M2NEX_PROFILE_COUNT || !raw.every(validProfile)) return null;
+function normalizeProfiles(raw: unknown, count: number): M2NexProfile[] | null {
+  if (!Array.isArray(raw) || raw.length !== count || !raw.every(validProfile)) return null;
   return raw.map((value, id) => {
     const profile = value as M2NexProfile;
     const stages = profile.dpiStages.slice();
@@ -94,23 +106,44 @@ function normalizeProfiles(raw: unknown): M2NexProfile[] | null {
       activeDpiStage: Math.min(Math.max(profile.activeDpiStage, 0), stages.length - 1),
       pollingRateHz: profile.pollingRateHz,
       buttonMappings: { ...profile.buttonMappings },
+      ...(profile.scrollDirection ? { scrollDirection: profile.scrollDirection } : {}),
       macros: cloneMacros(profile.macros),
     };
   });
 }
 
-/** Load the three profile slots for M2-NEX from browser-local storage. */
+/** Validate a vendor-style import payload without trusting names, ids, or
+ * profile contents from a downloaded JSON file. */
+export function parseM2NexProfileImport(
+  raw: unknown,
+  count: number,
+): M2NexProfile[] | null {
+  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return null;
+  const payload = raw as { profileData?: unknown; profiles?: unknown };
+  const data = payload.profileData ?? payload.profiles;
+  const profiles = Array.isArray(data) ? data : (
+    typeof data === "object" && data !== null && Array.isArray((data as { profiles?: unknown }).profiles)
+      ? (data as { profiles: unknown[] }).profiles
+      : null
+  );
+  return profiles ? normalizeProfiles(profiles, count) : null;
+}
+
+/** Load local profile slots from browser-local storage. */
 export function loadM2NexProfiles(
   storage: Pick<Storage, "getItem">,
   seed: M2NexProfileSeed,
+  options: M2NexProfileStoreOptions = {},
 ): M2NexProfile[] {
-  const defaults = defaultM2NexProfiles(seed);
+  const count = options.count ?? M2NEX_PROFILE_COUNT;
+  const storageKey = options.storageKey ?? M2NEX_PROFILE_STORAGE_KEY;
+  const defaults = defaultM2NexProfiles(seed, count);
   try {
-    const raw = storage.getItem(M2NEX_PROFILE_STORAGE_KEY);
+    const raw = storage.getItem(storageKey);
     if (!raw) return defaults;
     const parsed = JSON.parse(raw) as Partial<StoredM2NexProfiles>;
     return parsed.version === 1
-      ? normalizeProfiles(parsed.profiles) ?? defaults
+      ? normalizeProfiles(parsed.profiles, count) ?? defaults
       : defaults;
   } catch {
     return defaults;
@@ -121,13 +154,14 @@ export function loadM2NexProfiles(
 export function saveM2NexProfiles(
   storage: Pick<Storage, "setItem">,
   profiles: readonly M2NexProfile[],
+  options: M2NexProfileStoreOptions = {},
 ): void {
   const payload: StoredM2NexProfiles = {
     version: 1,
     profiles: profiles.map(cloneM2NexProfile),
   };
   try {
-    storage.setItem(M2NEX_PROFILE_STORAGE_KEY, JSON.stringify(payload));
+    storage.setItem(options.storageKey ?? M2NEX_PROFILE_STORAGE_KEY, JSON.stringify(payload));
   } catch {
     // The in-memory profile remains usable when browser storage is blocked or full.
   }

From 3b382dca510ac026e0ac8e22378a57e6a5c2269d Mon Sep 17 00:00:00 2001
From: user_1781515504933 <email_1781515504933>
Date: Wed, 30 Sep 2026 14:38:58 +0700
Subject: [PATCH 2/9] fix: hide native S1 profile import control

---
 src/app/OverviewPage.tsx |  4 ++--
 src/control.css          | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/app/OverviewPage.tsx b/src/app/OverviewPage.tsx
index 08e33f02..b66c079e 100644
--- a/src/app/OverviewPage.tsx
+++ b/src/app/OverviewPage.tsx
@@ -243,7 +243,7 @@ function M2NexProfileOverview({ snapshot }: { snapshot: ControlSnapshot }): Reac
     <section
       id="m2nex-profile-overview"
       className="m2nex-profile-overview"
-      aria-label={t(locale, "m2nex.controls")}
+      aria-label={`${status.name} ${t(locale, "m2nex.controls")}`}
     >
       <div className="m2nex-profile-overview-title">
         <span>{t(locale, "m2nex.overline")}</span>
@@ -298,7 +298,7 @@ function M2NexProfileOverview({ snapshot }: { snapshot: ControlSnapshot }): Reac
       </div>
       <input
         ref={profileImportRef}
-        className="visually-hidden"
+        className="m2nex-profile-import-input"
         type="file"
         accept="application/json,.json"
         onChange={(event) => {
diff --git a/src/control.css b/src/control.css
index 8e48f13f..161d6484 100644
--- a/src/control.css
+++ b/src/control.css
@@ -1920,6 +1920,17 @@ body { height: 100vh; overflow: hidden; }
   border-color: color-mix(in srgb, var(--ui-accent) 82%, #ffffff);
   background: color-mix(in srgb, var(--ui-accent) 82%, #ffffff);
 }
+.m2nex-profile-import-input {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0 0 0 0);
+  white-space: nowrap;
+  border: 0;
+}
 .button-map-footer { display:flex;justify-content:flex-end;margin-top:.7rem;padding-top:.65rem;border-top:1px solid var(--border-rule) }
 .button-map-reset { padding:.42rem .65rem;border:1px solid var(--border);border-radius:6px;background:var(--surface-control);color:var(--text-soft);font-size:.62rem;font-weight:600;cursor:pointer }
 .button-map-reset:hover:not(:disabled) { border-color:var(--border-hover);color:var(--text-hover);background:var(--surface-hover-soft) }

From c6a852580607dd65c30bdf478573574f3d6eccb0 Mon Sep 17 00:00:00 2001
From: user_1781515504933 <email_1781515504933>
Date: Wed, 30 Sep 2026 15:07:24 +0700
Subject: [PATCH 3/9] fix: make S1 DPI loop stages editable

---
 src/app/cards/DpiCard.tsx | 27 +++++++++++++++++++++++----
 src/control-profiles.css  |  2 ++
 src/device/controller.ts  | 16 ++++++++--------
 3 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/app/cards/DpiCard.tsx b/src/app/cards/DpiCard.tsx
index d689cf09..4ff72098 100644
--- a/src/app/cards/DpiCard.tsx
+++ b/src/app/cards/DpiCard.tsx
@@ -70,7 +70,15 @@ function DpiStageEditor({
     if (mode === "stage" && status?.dpiStages) {
       const stages = status.dpiStages.slice(0, rowCap);
       const last = stages[stages.length - 1] ?? status.dpi ?? 800;
-      const rows = stages.map((value) => ({ enabled: true, value: String(value), lod: DEFAULT_LOD }));
+      const activeStageCount = Math.min(
+        Math.max(status.dpiStageCount ?? stages.length, 0),
+        stages.length,
+      );
+      const rows = stages.map((value, index) => ({
+        enabled: index < activeStageCount,
+        value: String(value),
+        lod: DEFAULT_LOD,
+      }));
       while (rows.length < rowCap) rows.push({ enabled: false, value: String(last), lod: DEFAULT_LOD });
       return rows;
     }
@@ -105,7 +113,7 @@ function DpiStageEditor({
   const sourceSig = mode === "logitech"
     ? (snapshot.dpiSlotPlan?.stages.map((stage) => stage.x).join(",") ?? "-")
     : mode === "stage"
-      ? (status?.dpiStages?.join(",") ?? "-")
+      ? `${status?.dpiStageCount ?? status?.dpiStages?.length ?? 0}:${status?.dpiStages?.join(",") ?? "-"}`
       : String(status?.dpi ?? 0);
   const lastSigRef = useRef(sourceSig);
   useEffect(() => {
@@ -154,7 +162,8 @@ function DpiStageEditor({
     if (mode === "stage") {
       const enabled = next.filter((row) => row.enabled);
       const current = status?.dpiStages ?? [];
-      if (stageEditor?.countEditable === true && enabled.length !== current.length) {
+      const currentCount = status?.dpiStageCount ?? current.length;
+      if (stageEditor?.countEditable === true && enabled.length !== currentCount) {
         control.applyDpiStageCount(enabled.length);
       }
       enabled.forEach((row, position) => {
@@ -183,7 +192,7 @@ function DpiStageEditor({
   };
 
   const setEnabled = (index: number, enabled: boolean): void => {
-    const next = rows.map((row, i) => (i === index ? { ...row, enabled: !row.enabled } : row));
+    let next = rows.map((row, i) => (i === index ? { ...row, enabled: !row.enabled } : row));
     if (mode === "generic") {
       if (!enabled || next[index].enabled === rows[index].enabled) return;
       const snap = closestDpiOption(options, parseRow(next[index].value) ?? status?.dpi ?? 0);
@@ -195,6 +204,16 @@ function DpiStageEditor({
       touchedRef.current = Date.now();
       return;
     }
+    // K-snake stores a stage count, not an arbitrary bitmask. Keep the local
+    // editor contiguous so disabling stage 3 cannot silently move stage 6's
+    // value into stage 5 on the next write.
+    if (mode === "stage" && stageEditor?.countEditable === true) {
+      const currentCount = rows.filter((row) => row.enabled).length;
+      const nextCount = next[index]?.enabled
+        ? Math.max(currentCount, index + 1)
+        : Math.max(1, Math.min(currentCount, index));
+      next = next.map((row, i) => ({ ...row, enabled: i < nextCount }));
+    }
     const count = next.filter((row) => row.enabled).length;
     if (count < 1 || count > countCap) return;
     if (fixedStageCount) return;
diff --git a/src/control-profiles.css b/src/control-profiles.css
index eae49928..3cd9a704 100644
--- a/src/control-profiles.css
+++ b/src/control-profiles.css
@@ -242,6 +242,8 @@
 .dpi-editor-check > input:focus-visible + .dpi-editor-box { outline:2px solid var(--ui-accent);outline-offset:2px }
 .dpi-editor-check:has(> input:disabled) { cursor:not-allowed;opacity:.45 }
 .dpi-editor-check:has(> input:disabled) .dpi-editor-box { border-color:var(--border);background:var(--surface-control) }
+.dpi-editor-check:has(> input:disabled:checked) { opacity:.82 }
+.dpi-editor-check:has(> input:disabled:checked) .dpi-editor-box { border-color:color-mix(in srgb,var(--ui-accent) 70%,var(--border));background:color-mix(in srgb,var(--ui-accent) 28%,var(--surface-control));color:var(--ui-accent) }
 .dpi-editor-check > input:disabled { cursor:not-allowed }
 .dpi-editor-row.is-off { opacity:.55 }
 .dpi-editor-row > button.dpi-editor-index { padding:.4rem 0;border:1px solid var(--border);border-radius:6px;background:var(--surface-raised);color:var(--text-input);font:650 .72rem/1 var(--font-mono);font-variant-numeric:tabular-nums;text-align:center;cursor:pointer }
diff --git a/src/device/controller.ts b/src/device/controller.ts
index 1a3b035a..c17801fb 100644
--- a/src/device/controller.ts
+++ b/src/device/controller.ts
@@ -2952,7 +2952,9 @@ export function applyDpiStageCount(count: number): void {
   if (!editor || editor.countEditable !== true) return;
   if (!Number.isInteger(count) || count < 1 || count > editor.maxStages) return;
   if (!("setDpiStageCount" in requireSettingsClient())) return;
-  const currentCount = latestDeviceStatus?.dpiStages?.length ?? count;
+  const currentCount = latestDeviceStatus?.dpiStageCount
+    ?? latestDeviceStatus?.dpiStages?.length
+    ?? count;
   if (count < currentCount) {
     for (const change of pendingChanges()) {
       const match = /^dpi-stage(?:-color)?-(\d+)$/.exec(change.key);
@@ -2968,14 +2970,12 @@ export function applyDpiStageCount(count: number): void {
     progress: `Setting ${count} DPI stages…`,
     preview: (status) => {
       const current = status.dpiStages?.slice() ?? [];
-      if (count <= current.length) status.dpiStages = current.slice(0, count);
-      else {
-        const padded = current.slice();
-        while (padded.length < count) padded.push(padded.at(-1) ?? status.dpi);
-        status.dpiStages = padded;
-      }
+      const padded = current.slice();
+      while (padded.length < count) padded.push(padded.at(-1) ?? status.dpi);
+      status.dpiStages = padded;
+      status.dpiStageCount = count;
       if (status.dpiStageColors) {
-        const colors = status.dpiStageColors.slice(0, count);
+        const colors = status.dpiStageColors.slice();
         while (colors.length < count) colors.push(colors.at(-1) ?? "#000000");
         status.dpiStageColors = colors;
       }

From f3d8d509eb3d43aab99258349274b61534ef00b2 Mon Sep 17 00:00:00 2001
From: user_1781515504933 <email_1781515504933>
Date: Wed, 30 Sep 2026 15:30:36 +0700
Subject: [PATCH 4/9] feat: hide single DPI toggle when unsupported

---
 src/app/cards/DpiCard.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/cards/DpiCard.tsx b/src/app/cards/DpiCard.tsx
index 4ff72098..d7dd8242 100644
--- a/src/app/cards/DpiCard.tsx
+++ b/src/app/cards/DpiCard.tsx
@@ -476,6 +476,7 @@ export function DpiCard({ snapshot }: { snapshot: ControlSnapshot }): ReactNode
     || (Boolean(status?.ui?.dpiStageEditor)
       && Array.isArray(status?.dpiStages)
       && (status?.dpiStages?.length ?? 0) > 0);
+  const singleDpiAvailable = status?.ui?.hideSingleDpi !== true;
 
   const label = (source: typeof status): string => `${source.dpi.toLocaleString()} DPI`;
 
@@ -496,7 +497,7 @@ export function DpiCard({ snapshot }: { snapshot: ControlSnapshot }): ReactNode
                 ) : null}
               </h2>
             </div>
-            {stageCapable ? (
+            {stageCapable && singleDpiAvailable ? (
               <div
                 className="dpi-view-toggle"
                 role="group"
@@ -558,7 +559,7 @@ export function DpiCard({ snapshot }: { snapshot: ControlSnapshot }): ReactNode
 
         <DpiStageEditor
           snapshot={snapshot}
-          editorView={stageCapable ? editorView : undefined}
+          editorView={stageCapable && singleDpiAvailable ? editorView : stageCapable ? "stage" : undefined}
         />
 
         <div className="setting-action">

From 42dee8cc692c7b3bb9c155b1ca0ae82f56fae68a Mon Sep 17 00:00:00 2001
From: user_1781515504933 <email_1781515504933>
Date: Wed, 30 Sep 2026 17:03:56 +0700
Subject: [PATCH 5/9] fix: focus S1 macro recorder capture surface

---
 src/app/cards/AdvancedCards.tsx | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/app/cards/AdvancedCards.tsx b/src/app/cards/AdvancedCards.tsx
index 726d2060..33c741b2 100644
--- a/src/app/cards/AdvancedCards.tsx
+++ b/src/app/cards/AdvancedCards.tsx
@@ -1556,6 +1556,7 @@ export function KsnakeMacroCard({ snapshot }: { snapshot: ControlSnapshot }): Re
   const recordedStepsRef = useRef<KsnakeMacroStep[]>([]);
   const recordingOriginalStepsRef = useRef<KsnakeMacroStep[] | null>(null);
   const recordingClockRef = useRef<number | null>(null);
+  const recorderFocusRef = useRef<HTMLElement | null>(null);
   const staged = snapshot.pending.keys.includes("ksnake-macros");
   const disabled = snapshot.settingInProgress || snapshot.pending.busy;
   const controlsDisabled = disabled || isRecording;
@@ -1641,6 +1642,12 @@ export function KsnakeMacroCard({ snapshot }: { snapshot: ControlSnapshot }): Re
   useEffect(() => {
     if (!isRecording) return undefined;
 
+    // The Record button keeps focus after it is clicked. Keyboard events then
+    // target that button, and the recorder-control guard (correctly) ignores
+    // them as UI input. Move focus to a neutral capture surface so the first
+    // physical key pressed after starting a recording is captured.
+    recorderFocusRef.current?.focus();
+
     const isRecorderControl = (target: EventTarget | null): boolean => (
       target instanceof Element && Boolean(target.closest("[data-macro-recorder-control]"))
     );
@@ -1769,7 +1776,13 @@ export function KsnakeMacroCard({ snapshot }: { snapshot: ControlSnapshot }): Re
           })}
         </select>
       </label>
-      <section className={`ksnake-macro-recorder${isRecording ? " is-recording" : ""}`} aria-live="polite">
+      <section
+        ref={recorderFocusRef}
+        className={`ksnake-macro-recorder${isRecording ? " is-recording" : ""}`}
+        aria-live="polite"
+        aria-label="Macro input capture"
+        tabIndex={-1}
+      >
         <div className="ksnake-macro-recorder-status">
           <span className="ksnake-macro-recorder-dot" aria-hidden="true" />
           <div>

From ab54c0189b52ea802294a913d9939cc0f85bce85 Mon Sep 17 00:00:00 2001
From: user_1781515504933 <email_1781515504933>
Date: Wed, 30 Sep 2026 17:11:35 +0700
Subject: [PATCH 6/9] fix: hide unsupported S1 macro controls

---
 src/app/cards/AdvancedCards.tsx    | 8 ++++++--
 src/app/cards/availability.test.ts | 2 +-
 src/app/cards/availability.ts      | 6 +++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/app/cards/AdvancedCards.tsx b/src/app/cards/AdvancedCards.tsx
index 33c741b2..145548d3 100644
--- a/src/app/cards/AdvancedCards.tsx
+++ b/src/app/cards/AdvancedCards.tsx
@@ -1542,7 +1542,8 @@ export function KsnakeMacroCard({ snapshot }: { snapshot: ControlSnapshot }): Re
   const status = snapshot.status;
   const locale = snapshot.preferences.locale;
   const isM2Nex = status?.brand === "Noir Gear" && status.name === "M2-NEX";
-  const macroCapable = status?.ui?.family === "ksnake" || isM2Nex;
+  const isNoirS1 = status?.brand === "Noir Gear" && status.name === "NOIR S1";
+  const macroCapable = !isNoirS1 && (status?.ui?.family === "ksnake" || isM2Nex);
   // Keep the card usable while an older hot-reloaded controller snapshot is
   // still missing the newly added field. Treat that state as "not loaded" so
   // the local editor is prepared instead of silently hiding the card.
@@ -1952,7 +1953,10 @@ export function ButtonMappingCard({ snapshot }: { snapshot: ControlSnapshot }):
   const status = snapshot.status;
   if (!status?.buttonMappings || !status.buttonOptions?.length) return null;
   const locale = snapshot.preferences.locale;
-  const options = status.buttonOptions;
+  const isNoirS1 = status.brand === "Noir Gear" && status.name === "NOIR S1";
+  const options = status.buttonOptions.filter((option) => (
+    !isNoirS1 || !/^Macro \d+$/.test(option)
+  ));
   const isNoirProfile = status.brand === "Noir Gear"
     && (status.name === "M2-NEX" || status.name === "NOIR S1")
     && snapshot.m2nexProfiles !== null;
diff --git a/src/app/cards/availability.test.ts b/src/app/cards/availability.test.ts
index e4ec45dd..eda923c8 100644
--- a/src/app/cards/availability.test.ts
+++ b/src/app/cards/availability.test.ts
@@ -418,7 +418,7 @@ test("NOIR S1 exposes its standard controls and hides unsupported extras", () =>
   assert.equal(has.polling, true);
   assert.equal(has.buttonMapping, true);
   assert.equal(has.ksnakeScroll, true);
-  assert.equal(has.ksnakeMacros, true);
+  assert.equal(has.ksnakeMacros, false);
   assert.equal(has.lighting, true);
   assert.equal(has.lightingAdvanced, false);
   assert.equal(has.sleep, false);
diff --git a/src/app/cards/availability.ts b/src/app/cards/availability.ts
index 4eb6bbd9..9aeed23d 100644
--- a/src/app/cards/availability.ts
+++ b/src/app/cards/availability.ts
@@ -95,6 +95,7 @@ export function cardAvailability(snapshot: ControlSnapshot): CardAvailability {
   const { traits, capabilities } = snapshot;
   const ready = !snapshot.settingsPending;
   const host = traits.advancedSection;
+  const isNoirS1 = status.brand === "Noir Gear" && status.name === "NOIR S1";
   const isNoirKsnake = status.brand === "Noir Gear"
     && (status.name === "M2-NEX" || status.name === "NOIR S1");
 
@@ -144,7 +145,10 @@ export function cardAvailability(snapshot: ControlSnapshot): CardAvailability {
     // K-snake/M2-NEX exposes the macro write/commit path. The editor starts
     // with local slots because this firmware does not expose a reliable macro
     // read through the browser.
-    ksnakeMacros: ui?.family === "ksnake" || isNoirKsnake,
+    // The S1 vendor configurator does not expose an onboard macro editor.
+    // Do not advertise the generic K-snake macro transport for it until the
+    // firmware capability is positively confirmed.
+    ksnakeMacros: !isNoirS1 && (ui?.family === "ksnake" || isNoirKsnake),
     powerMode: host && Boolean(status.powerModes?.length),
     profiles: traits.logitech
       && status.deviceMode !== undefined && status.deviceMode !== "Unknown",

From 06d952f6e88a83a95bd1ecee4deed869c1e27b8e Mon Sep 17 00:00:00 2001
From: user_1781515504933 <email_1781515504933>
Date: Wed, 30 Sep 2026 19:50:12 +0700
Subject: [PATCH 7/9] fix: restore S1 macro controls

---
 src/app/cards/AdvancedCards.tsx    | 8 ++------
 src/app/cards/availability.test.ts | 2 +-
 src/app/cards/availability.ts      | 6 +-----
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/app/cards/AdvancedCards.tsx b/src/app/cards/AdvancedCards.tsx
index 145548d3..33c741b2 100644
--- a/src/app/cards/AdvancedCards.tsx
+++ b/src/app/cards/AdvancedCards.tsx
@@ -1542,8 +1542,7 @@ export function KsnakeMacroCard({ snapshot }: { snapshot: ControlSnapshot }): Re
   const status = snapshot.status;
   const locale = snapshot.preferences.locale;
   const isM2Nex = status?.brand === "Noir Gear" && status.name === "M2-NEX";
-  const isNoirS1 = status?.brand === "Noir Gear" && status.name === "NOIR S1";
-  const macroCapable = !isNoirS1 && (status?.ui?.family === "ksnake" || isM2Nex);
+  const macroCapable = status?.ui?.family === "ksnake" || isM2Nex;
   // Keep the card usable while an older hot-reloaded controller snapshot is
   // still missing the newly added field. Treat that state as "not loaded" so
   // the local editor is prepared instead of silently hiding the card.
@@ -1953,10 +1952,7 @@ export function ButtonMappingCard({ snapshot }: { snapshot: ControlSnapshot }):
   const status = snapshot.status;
   if (!status?.buttonMappings || !status.buttonOptions?.length) return null;
   const locale = snapshot.preferences.locale;
-  const isNoirS1 = status.brand === "Noir Gear" && status.name === "NOIR S1";
-  const options = status.buttonOptions.filter((option) => (
-    !isNoirS1 || !/^Macro \d+$/.test(option)
-  ));
+  const options = status.buttonOptions;
   const isNoirProfile = status.brand === "Noir Gear"
     && (status.name === "M2-NEX" || status.name === "NOIR S1")
     && snapshot.m2nexProfiles !== null;
diff --git a/src/app/cards/availability.test.ts b/src/app/cards/availability.test.ts
index eda923c8..e4ec45dd 100644
--- a/src/app/cards/availability.test.ts
+++ b/src/app/cards/availability.test.ts
@@ -418,7 +418,7 @@ test("NOIR S1 exposes its standard controls and hides unsupported extras", () =>
   assert.equal(has.polling, true);
   assert.equal(has.buttonMapping, true);
   assert.equal(has.ksnakeScroll, true);
-  assert.equal(has.ksnakeMacros, false);
+  assert.equal(has.ksnakeMacros, true);
   assert.equal(has.lighting, true);
   assert.equal(has.lightingAdvanced, false);
   assert.equal(has.sleep, false);
diff --git a/src/app/cards/availability.ts b/src/app/cards/availability.ts
index 9aeed23d..4eb6bbd9 100644
--- a/src/app/cards/availability.ts
+++ b/src/app/cards/availability.ts
@@ -95,7 +95,6 @@ export function cardAvailability(snapshot: ControlSnapshot): CardAvailability {
   const { traits, capabilities } = snapshot;
   const ready = !snapshot.settingsPending;
   const host = traits.advancedSection;
-  const isNoirS1 = status.brand === "Noir Gear" && status.name === "NOIR S1";
   const isNoirKsnake = status.brand === "Noir Gear"
     && (status.name === "M2-NEX" || status.name === "NOIR S1");
 
@@ -145,10 +144,7 @@ export function cardAvailability(snapshot: ControlSnapshot): CardAvailability {
     // K-snake/M2-NEX exposes the macro write/commit path. The editor starts
     // with local slots because this firmware does not expose a reliable macro
     // read through the browser.
-    // The S1 vendor configurator does not expose an onboard macro editor.
-    // Do not advertise the generic K-snake macro transport for it until the
-    // firmware capability is positively confirmed.
-    ksnakeMacros: !isNoirS1 && (ui?.family === "ksnake" || isNoirKsnake),
+    ksnakeMacros: ui?.family === "ksnake" || isNoirKsnake,
     powerMode: host && Boolean(status.powerModes?.length),
     profiles: traits.logitech
       && status.deviceMode !== undefined && status.deviceMode !== "Unknown",

From 8a739054836f8ca134938c25f99f9724db2b8398 Mon Sep 17 00:00:00 2001
From: user_1781515504933 <email_1781515504933>
Date: Thu, 1 Oct 2026 12:33:42 +0700
Subject: [PATCH 8/9] fix: prepare Noir S1 support for submission

---
 docs/noir-s1.md                    | 41 ++++++++++++++++++
 public/devices/README.md           |  5 +++
 src/app/OverviewPage.tsx           | 21 +++++----
 src/app/cards/AdvancedCards.tsx    | 19 +++++----
 src/app/cards/DpiCard.tsx          | 21 ++++-----
 src/app/cards/PerformanceCards.tsx |  3 +-
 src/app/cards/availability.test.ts |  7 +--
 src/app/cards/availability.ts      |  6 +--
 src/device/controller.ts           | 68 ++++++++++++++++++------------
 src/device/m2nex-profiles.test.ts  | 17 ++++++++
 src/device/noir.test.ts            | 24 +++++++++++
 src/device/noir.ts                 | 28 ++++++++++++
 src/i18n-ar.ts                     |  2 +-
 src/i18n-de.ts                     |  2 +-
 src/i18n-es.ts                     |  2 +-
 src/i18n-fr.ts                     |  2 +-
 src/i18n-ja.ts                     |  2 +-
 src/i18n-ko.ts                     |  2 +-
 src/i18n-pt.ts                     |  2 +-
 src/i18n-ru.ts                     |  2 +-
 src/i18n-vi.ts                     |  2 +-
 src/i18n-zh.ts                     |  2 +-
 src/i18n.ts                        |  2 +-
 src/ui/device-images.test.ts       |  5 +++
 src/ui/device-images.ts            |  1 +
 25 files changed, 212 insertions(+), 76 deletions(-)
 create mode 100644 docs/noir-s1.md
 create mode 100644 src/device/noir.test.ts
 create mode 100644 src/device/noir.ts

diff --git a/docs/noir-s1.md b/docs/noir-s1.md
new file mode 100644
index 00000000..abc70aa3
--- /dev/null
+++ b/docs/noir-s1.md
@@ -0,0 +1,41 @@
+# NOIR S1 support notes
+
+## Implementation
+
+The NOIR S1 uses the existing OpenMouse K-snake protocol client (the app pins
+`@openmouse/protocol` 0.22.0). This change adds S1-specific configurator
+behavior to the OpenMouse UI; it does not add or fork a protocol driver.
+
+The S1 UI exposes the settings reported by the device: button assignments,
+the six DPI stages, polling rate, scroll direction, and the K-snake macro
+editor. The Overview profile picker keeps six named slots in browser storage;
+Apply writes the selected slot to the mouse. It is not a claim that those six
+slots are stored as native onboard profiles.
+
+## Hardware validation recorded during development
+
+- Connected and operated over USB wired and the 2.4 GHz receiver.
+- Button remapping, macro assignment/playback, and DPI-stage cycling were
+  confirmed by the user on hardware.
+- Profiles 2–6 were exercised over 2.4 GHz; restoring the button defaults was
+  also confirmed on hardware.
+- The 2.4 GHz Hardware Test reported 13 checks passed, 0 failed, and 1 skipped.
+  The skipped polling-rate sample required mouse movement, which was not
+  observed during that run. This is manual-device evidence, not CI coverage.
+
+## Known limitations
+
+- Macro definitions cannot be reliably read back from the firmware. OpenMouse
+  starts the editor with blank local slots and writes the table when saved;
+  users should save/export their macro setup before changing computers or
+  clearing browser storage.
+- The profile slots are browser-local and must be applied to change device
+  settings. They are not onboard profile switching.
+- Left click is fixed by the shared K-snake protocol and is intentionally not
+  offered as a remappable target.
+- “Reset to default” covers button mappings only. A complete vendor-style
+  factory reset is not implemented or validated by this contribution.
+- The vendor configurator image is not bundled. The UI reserves
+  `noir-s1.png`; a maintainer-hosted artwork request and rights review are
+  separate from this code change. Until the asset is uploaded, the image
+  request/fallback flow applies.
diff --git a/public/devices/README.md b/public/devices/README.md
index 9901283e..4f14332e 100644
--- a/public/devices/README.md
+++ b/public/devices/README.md
@@ -166,6 +166,11 @@ previews, but it is deliberately not committed here. Before publishing the
 asset, Noir Gear must confirm redistribution rights or OpenMouse should use a
 maintainer-created silhouette instead.
 
+`noir-s1.png` is reserved for the NOIR S1 name-fallback mapping. The code PR
+does not include a vendor configurator render; request artwork separately via
+the Device artwork request template and confirm redistribution rights before
+the asset is uploaded.
+
 `delux-m800-mini.png` — the name-fallback mapping in `src/ui/device-images.ts`
 is in place (keyed on reported names like "Delux M800 Mini", "Delux M800 Pro",
 "Delux M800 Mini (Wireless)"). The render was supplied from Delux's official
diff --git a/src/app/OverviewPage.tsx b/src/app/OverviewPage.tsx
index b66c079e..284a5e82 100644
--- a/src/app/OverviewPage.tsx
+++ b/src/app/OverviewPage.tsx
@@ -15,6 +15,7 @@ import {
 } from "lucide-react";
 import { useEffect, useRef, useState, type KeyboardEvent, type ReactNode } from "react";
 import * as control from "../device/controller";
+import { isNoirKsnakeStatus, isNoirS1Status, noirBrandLabel } from "../device/noir.ts";
 import type { ControlSnapshot, WorkspaceTab } from "../device/types";
 import { t, tp, connectionText, type I18nKey } from "../i18n";
 import { Diagnostics, LogitechDetails } from "./Diagnostics";
@@ -137,7 +138,7 @@ function DeviceShowcase({ snapshot }: {
   return (
     <div className="device-showcase">
       <h1 className="device-showcase-name">{status.name}</h1>
-      <p className="device-showcase-brand">{status.brand}</p>
+      <p className="device-showcase-brand">{noirBrandLabel(status)}</p>
       <div className="device-diagram">
         <div
           className="device-diagram-canvas"
@@ -232,10 +233,9 @@ function DeviceShowcase({ snapshot }: {
 function M2NexProfileOverview({ snapshot }: { snapshot: ControlSnapshot }): ReactNode {
   const status = snapshot.status;
   const locale = snapshot.preferences.locale;
-  const isNoirProfile = status?.brand === "Noir Gear"
-    && (status.name === "M2-NEX" || status.name === "NOIR S1");
+  const isNoirProfile = isNoirKsnakeStatus(status);
   const profileImportRef = useRef<HTMLInputElement>(null);
-  if (!isNoirProfile || snapshot.m2nexProfiles === null) return null;
+  if (!status || !isNoirProfile || snapshot.m2nexProfiles === null) return null;
   const profile = snapshot.m2nexProfiles[snapshot.activeM2NexProfile];
   if (!profile) return null;
   const applyDisabled = snapshot.settingInProgress || snapshot.pending.count > 0;
@@ -317,10 +317,9 @@ export function DeviceShowcaseSidebar({ snapshot }: { snapshot: ControlSnapshot
   if (!status) return null;
   const locale = snapshot.preferences.locale;
   const image = snapshot.deviceArtwork;
-  const isNoirS1 = status.brand === "Noir Gear" && status.name === "NOIR S1";
+  const isNoirS1 = isNoirS1Status(status);
   const showButtonMarkers = snapshot.workspaceTab === "buttons"
-    && status.brand === "Noir Gear"
-    && (status.name === "M2-NEX" || isNoirS1)
+    && isNoirKsnakeStatus(status)
     && status.buttonMappings != null;
 
   return (
@@ -369,7 +368,7 @@ export function DeviceShowcaseSidebar({ snapshot }: { snapshot: ControlSnapshot
       </div>
       <div className="showcase-sidebar-info">
         <h2 className="showcase-sidebar-name">{status.name}</h2>
-        <p className="showcase-sidebar-brand">{status.brand}</p>
+        <p className="showcase-sidebar-brand">{noirBrandLabel(status)}</p>
       </div>
       <div className="showcase-sidebar-status">
         <span className="device-showcase-dot" aria-hidden="true" />
@@ -719,7 +718,8 @@ function DeviceListView({ snapshot }: { snapshot: ControlSnapshot }): ReactNode
               const pollText = liveStatus?.pollingRateHz ? `${liveStatus.pollingRateHz} Hz` : "–";
               const batteryText = liveStatus?.batteryPercent != null ? `${liveStatus.batteryPercent}%` : "–%";
               const imageSrc = deviceImage({ vendorId: device.vendorId, productId: device.productId } as HIDDevice, device.name);
-              const imageClass = deviceImageFilename(device.name) === "noir-m2-nex.png"
+              const imageFilename = deviceImageFilename(device.name);
+              const imageClass = imageFilename === "noir-m2-nex.png" || imageFilename === "noir-s1.png"
                 ? " device-tile-image-is-portrait"
                 : "";
               return (
@@ -812,8 +812,7 @@ export function OverviewPage({
   const locale = preferences.locale;
 
   const tabs = availableWorkspaceTabs(status !== null, cardAvailability(snapshot), {
-    hideLighting: status?.brand === "Noir Gear"
-      && (status.name === "M2-NEX" || status.name === "NOIR S1"),
+    hideLighting: isNoirKsnakeStatus(status),
   });
   const workspaceTab = availableWorkspaceTab(snapshot.workspaceTab, tabs);
   const workspaceSnapshot = workspaceTab === snapshot.workspaceTab
diff --git a/src/app/cards/AdvancedCards.tsx b/src/app/cards/AdvancedCards.tsx
index 33c741b2..96180fa7 100644
--- a/src/app/cards/AdvancedCards.tsx
+++ b/src/app/cards/AdvancedCards.tsx
@@ -21,6 +21,7 @@ import {
 import { teevolutionSensorModeUi } from "@openmouse/protocol/teevolution";
 import type { KsnakeMacroProfile, KsnakeMacroStep } from "@openmouse/protocol/ksnake";
 import { isPulsarProProtocol } from "../../device/traits";
+import { isNoirKsnakeStatus } from "../../device/noir.ts";
 import * as control from "../../device/controller";
 import { PULSAR_SLEEP_OPTIONS } from "../../device/controller";
 import { selectableValues, sleepLabel, sleepParts, sleepTotalSeconds, valuesWithCurrent, KEYCHRON_SLEEP_MAX_HOURS, KEYCHRON_SLEEP_MAX_SECONDS, KEYCHRON_SLEEP_MIN_SECONDS } from "../../device/options";
@@ -1541,8 +1542,8 @@ function cloneKsnakeMacroProfile(profile: KsnakeMacroProfile | undefined): Ksnak
 export function KsnakeMacroCard({ snapshot }: { snapshot: ControlSnapshot }): ReactNode {
   const status = snapshot.status;
   const locale = snapshot.preferences.locale;
-  const isM2Nex = status?.brand === "Noir Gear" && status.name === "M2-NEX";
-  const macroCapable = status?.ui?.family === "ksnake" || isM2Nex;
+  const isNoirKsnake = isNoirKsnakeStatus(status);
+  const macroCapable = status?.ui?.family === "ksnake" || isNoirKsnake;
   // Keep the card usable while an older hot-reloaded controller snapshot is
   // still missing the newly added field. Treat that state as "not loaded" so
   // the local editor is prepared instead of silently hiding the card.
@@ -1763,7 +1764,7 @@ export function KsnakeMacroCard({ snapshot }: { snapshot: ControlSnapshot }): Re
         </div>
       </div>
       <p className="ksnake-macro-notice">
-        {isM2Nex ? t(locale, "macro.noticeM2nex") : t(locale, "macro.notice")}
+        {isNoirKsnake ? t(locale, "macro.noticeWriteOnly") : t(locale, "macro.notice")}
       </p>
       <label className="ksnake-macro-slot-picker">
         <span>{t(locale, "macro.slotLabel")}</span>
@@ -1953,15 +1954,15 @@ export function ButtonMappingCard({ snapshot }: { snapshot: ControlSnapshot }):
   if (!status?.buttonMappings || !status.buttonOptions?.length) return null;
   const locale = snapshot.preferences.locale;
   const options = status.buttonOptions;
-  const isNoirProfile = status.brand === "Noir Gear"
-    && (status.name === "M2-NEX" || status.name === "NOIR S1")
+  const isNoirProfile = isNoirKsnakeStatus(status)
     && snapshot.m2nexProfiles !== null;
   const selectedM2NexProfile = isNoirProfile
     ? snapshot.m2nexProfiles?.[snapshot.activeM2NexProfile]
     : null;
-  const isM2Nex = status.brand === "Noir Gear" && status.name === "M2-NEX";
   const canResetKsnake = isNoirProfile;
   const mappings = selectedM2NexProfile?.buttonMappings ?? status.buttonMappings;
+  const pendingButtons = new Set(snapshot.pending.keys);
+  const resettingButtons = pendingButtons.has("ksnake-button-reset");
   // fixedButtons lands with mouse-protocol#68; read defensively so this
   // builds against the published protocol until then.
   const fixed = new Set((status as unknown as { fixedButtons?: readonly string[] }).fixedButtons ?? []);
@@ -1970,9 +1971,11 @@ export function ButtonMappingCard({ snapshot }: { snapshot: ControlSnapshot }):
       <div className="setting-heading compact"><div><p>BUTTONS</p><h2>{t(locale, "map.remap")}</h2></div></div>
       <div className="button-map-list">
         {Object.entries(status.buttonMappings).map(([button, deviceAssigned], index) => {
-          const assigned = mappings[button] ?? deviceAssigned;
+          const assigned = resettingButtons || pendingButtons.has(`button-${button}`)
+            ? status.buttonMappings?.[button] ?? mappings[button] ?? deviceAssigned
+            : mappings[button] ?? deviceAssigned;
           const selectId = `button-${button.toLowerCase()}-select`;
-          const isFixed = fixed.has(button) || (isM2Nex && button === "Left");
+          const isFixed = fixed.has(button) || (isNoirKsnakeStatus(status) && button === "Left");
           return (
             <label key={button} className={`button-map-row${isFixed ? " is-fixed" : ""}`} htmlFor={selectId}>
               <span className="button-map-control">
diff --git a/src/app/cards/DpiCard.tsx b/src/app/cards/DpiCard.tsx
index d7dd8242..db4e0638 100644
--- a/src/app/cards/DpiCard.tsx
+++ b/src/app/cards/DpiCard.tsx
@@ -6,6 +6,7 @@ import {
 } from "@openmouse/protocol/drivers/logitech/onboard-profiles";
 import * as control from "../../device/controller";
 import type { ControlSnapshot, LiftOffLevel } from "../../device/types";
+import { isNoirKsnakeStatus, isNoirS1Status, NOIR_DPI_STAGE_COLORS } from "../../device/noir.ts";
 import { closestDpiOption, dpiPresetValues } from "../../dpi-presets";
 import { t, tp } from "../../i18n";
 import { LiftOffDistance, hasLiftOff } from "./PerformanceCards";
@@ -48,7 +49,9 @@ function DpiStageEditor({
 
   const naturalMode: "logitech" | "stage" | "generic" = isLogitech ? "logitech" : isStage ? "stage" : "generic";
   const mode: "logitech" | "stage" | "generic" = editorView === "single" ? "generic" : naturalMode;
-  const stageColors = mode === "stage" ? status?.dpiStageColors ?? null : null;
+  const stageColors = mode === "stage"
+    ? status?.dpiStageColors ?? (isNoirKsnakeStatus(status) ? NOIR_DPI_STAGE_COLORS : null)
+    : null;
   const showStageColors = mode === "stage"
     && (stageColors?.length ?? 0) >= (status?.dpiStages?.length ?? 0);
   const limits = snapshot.profile.slotLimits;
@@ -70,15 +73,7 @@ function DpiStageEditor({
     if (mode === "stage" && status?.dpiStages) {
       const stages = status.dpiStages.slice(0, rowCap);
       const last = stages[stages.length - 1] ?? status.dpi ?? 800;
-      const activeStageCount = Math.min(
-        Math.max(status.dpiStageCount ?? stages.length, 0),
-        stages.length,
-      );
-      const rows = stages.map((value, index) => ({
-        enabled: index < activeStageCount,
-        value: String(value),
-        lod: DEFAULT_LOD,
-      }));
+      const rows = stages.map((value) => ({ enabled: true, value: String(value), lod: DEFAULT_LOD }));
       while (rows.length < rowCap) rows.push({ enabled: false, value: String(last), lod: DEFAULT_LOD });
       return rows;
     }
@@ -113,7 +108,7 @@ function DpiStageEditor({
   const sourceSig = mode === "logitech"
     ? (snapshot.dpiSlotPlan?.stages.map((stage) => stage.x).join(",") ?? "-")
     : mode === "stage"
-      ? `${status?.dpiStageCount ?? status?.dpiStages?.length ?? 0}:${status?.dpiStages?.join(",") ?? "-"}`
+      ? (status?.dpiStages?.join(",") ?? "-")
       : String(status?.dpi ?? 0);
   const lastSigRef = useRef(sourceSig);
   useEffect(() => {
@@ -162,7 +157,7 @@ function DpiStageEditor({
     if (mode === "stage") {
       const enabled = next.filter((row) => row.enabled);
       const current = status?.dpiStages ?? [];
-      const currentCount = status?.dpiStageCount ?? current.length;
+      const currentCount = current.length;
       if (stageEditor?.countEditable === true && enabled.length !== currentCount) {
         control.applyDpiStageCount(enabled.length);
       }
@@ -476,7 +471,7 @@ export function DpiCard({ snapshot }: { snapshot: ControlSnapshot }): ReactNode
     || (Boolean(status?.ui?.dpiStageEditor)
       && Array.isArray(status?.dpiStages)
       && (status?.dpiStages?.length ?? 0) > 0);
-  const singleDpiAvailable = status?.ui?.hideSingleDpi !== true;
+  const singleDpiAvailable = !isNoirS1Status(status);
 
   const label = (source: typeof status): string => `${source.dpi.toLocaleString()} DPI`;
 
diff --git a/src/app/cards/PerformanceCards.tsx b/src/app/cards/PerformanceCards.tsx
index 5f6be781..f6163020 100644
--- a/src/app/cards/PerformanceCards.tsx
+++ b/src/app/cards/PerformanceCards.tsx
@@ -6,6 +6,7 @@ import {
   reportRatesFor,
 } from "@openmouse/protocol/drivers/logitech/onboard-profiles";
 import * as control from "../../device/controller";
+import { isNoirKsnakeStatus } from "../../device/noir.ts";
 import { isNativeAttackSharkX11, RATE_STEPS_HZ } from "../../device/controller";
 import type { ControlSnapshot, LiftOffLevel } from "../../device/types";
 import { t, tp } from "../../i18n";
@@ -204,7 +205,7 @@ export function SensorCard({ snapshot }: { snapshot: ControlSnapshot }): ReactNo
 export function hasLiftOff(snapshot: ControlSnapshot): boolean {
   const status = snapshot.status;
   if (!status || snapshot.profile.slotsAvailable) return false;
-  if (status.ui?.hideLodControl === true) return false;
+  if (isNoirKsnakeStatus(status)) return false;
   return Boolean(status.asymmetricLiftOff)
     || Boolean(status.liftOffScale)
     || status.liftOffDistance != null
diff --git a/src/app/cards/availability.test.ts b/src/app/cards/availability.test.ts
index e4ec45dd..4a38dd60 100644
--- a/src/app/cards/availability.test.ts
+++ b/src/app/cards/availability.test.ts
@@ -392,13 +392,14 @@ test("M2-NEX keeps lighting out of Advanced", () => {
 test("NOIR S1 exposes its standard controls and hides unsupported extras", () => {
   const has = cardAvailability(snapshot({
     status: {
-      brand: "Noir Gear",
+      // The published 0.22 K-snake client identifies this model by name but
+      // still reports its protocol family as the brand.
+      brand: "K-snake",
       name: "NOIR S1",
       ui: {
         family: "ksnake",
         showAdvancedSection: true,
         hideSleepCard: true,
-        hideLodControl: true,
       },
       buttonMappings: {
         Left: "Left click",
@@ -422,7 +423,7 @@ test("NOIR S1 exposes its standard controls and hides unsupported extras", () =>
   assert.equal(has.lighting, true);
   assert.equal(has.lightingAdvanced, false);
   assert.equal(has.sleep, false);
-  assert.equal(has.sensor, false);
+  assert.equal(has.sensor, true, "surface capability is independent of lift-off control visibility");
 });
 
 test("the generic button card follows the driver\'s mappings, not the advanced section", () => {
diff --git a/src/app/cards/availability.ts b/src/app/cards/availability.ts
index 4eb6bbd9..37445331 100644
--- a/src/app/cards/availability.ts
+++ b/src/app/cards/availability.ts
@@ -1,5 +1,6 @@
 import { selectableValues } from "../../device/options.ts";
 import { isPulsarProProtocol } from "../../device/traits.ts";
+import { isNoirKsnakeStatus } from "../../device/noir.ts";
 import type { ControlSnapshot } from "../../device/types";
 
 export interface CardAvailability {
@@ -95,10 +96,9 @@ export function cardAvailability(snapshot: ControlSnapshot): CardAvailability {
   const { traits, capabilities } = snapshot;
   const ready = !snapshot.settingsPending;
   const host = traits.advancedSection;
-  const isNoirKsnake = status.brand === "Noir Gear"
-    && (status.name === "M2-NEX" || status.name === "NOIR S1");
+  const isNoirKsnake = isNoirKsnakeStatus(status);
 
-  const sensor = ui?.hideLodControl !== true && !(!status.gamingSurfaceMode
+  const sensor = !(!status.gamingSurfaceMode
     && Array.isArray(status.supportedLiftOffDistances)
     && status.supportedLiftOffDistances.length === 0);
 
diff --git a/src/device/controller.ts b/src/device/controller.ts
index c17801fb..61668c6b 100644
--- a/src/device/controller.ts
+++ b/src/device/controller.ts
@@ -112,6 +112,7 @@ import {
   NOIR_S1_PROFILE_STORAGE_KEY,
   type M2NexProfile,
 } from "./m2nex-profiles";
+import { isNoirKsnakeStatus as isNoirKsnakeIdentity, isNoirS1Status as isNoirS1Identity } from "./noir.ts";
 import {
   LOGITECH_HAPTIC_EFFECTS,
   LOGITECH_HAPTIC_PRESETS,
@@ -288,6 +289,15 @@ const pulsarClient = (): PulsarClient | null =>
 let onboardProfiles: OnboardProfile[] | null = null;
 let buttons: LogitechReprogrammableControl[] | null = null;
 const KSNAKE_MACROS_KEY = "ksnake-macros";
+const KSNAKE_DEFAULT_BUTTON_MAPPINGS: Readonly<Record<string, string>> = {
+  Left: "Left click",
+  Right: "Right click",
+  Middle: "Middle click",
+  Forward: "Forward",
+  Backward: "Backward",
+  "Scroll up": "Scroll up",
+  "Scroll down": "Scroll down",
+};
 let ksnakeMacros: KsnakeMacroProfile[] | null = null;
 let stagedKsnakeMacros: KsnakeMacroProfile[] | null = null;
 let ksnakeMacrosLoading = false;
@@ -682,11 +692,11 @@ function ksnakeMacroClient(): KsnakeMacroClient | null {
 }
 
 function isM2NexStatus(status: MouseStatus | null | undefined = latestDeviceStatus): boolean {
-  return status?.brand === "Noir Gear" && (status.name === "M2-NEX" || status.name === "NOIR S1");
+  return isNoirKsnakeIdentity(status);
 }
 
 function isNoirS1Status(status: MouseStatus | null | undefined = latestDeviceStatus): boolean {
-  return status?.brand === "Noir Gear" && status.name === "NOIR S1";
+  return isNoirS1Identity(status);
 }
 
 function noirProfileStoreOptions(status: MouseStatus | null | undefined = latestDeviceStatus): {
@@ -702,6 +712,14 @@ function persistM2NexProfiles(): void {
   if (m2nexProfiles !== null) saveM2NexProfiles(localStorage, m2nexProfiles, noirProfileStoreOptions());
 }
 
+function syncActiveM2NexProfileButtonDefaults(): void {
+  if (!isM2NexStatus() || !m2nexProfiles?.[activeM2NexProfile]) return;
+  m2nexProfiles = m2nexProfiles.map((profile, index) => index === activeM2NexProfile
+    ? { ...profile, buttonMappings: { ...profile.buttonMappings, ...KSNAKE_DEFAULT_BUTTON_MAPPINGS } }
+    : profile);
+  persistM2NexProfiles();
+}
+
 function profileMacroTable(): KsnakeMacroProfile[] | null {
   return (stagedKsnakeMacros ?? ksnakeMacros)
     ? cloneKsnakeMacros(stagedKsnakeMacros ?? ksnakeMacros ?? [])
@@ -839,7 +857,7 @@ export function importM2NexProfiles(text: string): void {
 /** Edit the selected profile without touching the mouse yet. */
 export function updateM2NexProfileButton(button: string, action: string): void {
   if (!isM2NexStatus() || !m2nexProfiles?.[activeM2NexProfile]) return;
-  if (button === "Left" && !isNoirS1Status()) return;
+  if (button === "Left") return;
   const current = m2nexProfiles[activeM2NexProfile];
   m2nexProfiles = m2nexProfiles.map((profile, index) => index === activeM2NexProfile
     ? { ...profile, buttonMappings: { ...profile.buttonMappings, [button]: action } }
@@ -913,7 +931,7 @@ export async function applyM2NexProfile(index = activeM2NexProfile): Promise<voi
     const currentMappings = before.buttonMappings ?? {};
     const options = before.buttonOptions ?? [];
     for (const [button, action] of Object.entries(profile.buttonMappings)) {
-      if ((!isNoirS1Status() && button === "Left") || action.startsWith("Custom (") || action === "Unknown") continue;
+      if (button === "Left" || action.startsWith("Custom (") || action === "Unknown") continue;
       if (!options.includes(action) || currentMappings[button] === action) continue;
       pendingStatusText = `Applying ${profile.name}: ${button}…`;
       readStatus = pendingStatusText;
@@ -1053,7 +1071,9 @@ function stageChange(change: PendingChange): void {
     }
     for (const field of fields) gameProfileDraft.touched.add(field);
   }
-  if (matchesDeviceStatus(change)) {
+  // Reset repairs the profile cache too, so it must run even when the current
+  // hardware snapshot already appears to match the factory mapping.
+  if (change.key !== "ksnake-button-reset" && matchesDeviceStatus(change)) {
     dropPendingChange(change.key);
     setReadStatus(st("ctl.alreadyMatches", { label: change.label }));
     return;
@@ -2952,9 +2972,7 @@ export function applyDpiStageCount(count: number): void {
   if (!editor || editor.countEditable !== true) return;
   if (!Number.isInteger(count) || count < 1 || count > editor.maxStages) return;
   if (!("setDpiStageCount" in requireSettingsClient())) return;
-  const currentCount = latestDeviceStatus?.dpiStageCount
-    ?? latestDeviceStatus?.dpiStages?.length
-    ?? count;
+  const currentCount = latestDeviceStatus?.dpiStages?.length ?? count;
   if (count < currentCount) {
     for (const change of pendingChanges()) {
       const match = /^dpi-stage(?:-color)?-(\d+)$/.exec(change.key);
@@ -2970,14 +2988,16 @@ export function applyDpiStageCount(count: number): void {
     progress: `Setting ${count} DPI stages…`,
     preview: (status) => {
       const current = status.dpiStages?.slice() ?? [];
-      const padded = current.slice();
-      while (padded.length < count) padded.push(padded.at(-1) ?? status.dpi);
-      status.dpiStages = padded;
-      status.dpiStageCount = count;
+      status.dpiStages = count <= current.length
+        ? current.slice(0, count)
+        : [...current, ...Array.from({ length: count - current.length }, () => current.at(-1) ?? status.dpi)];
       if (status.dpiStageColors) {
-        const colors = status.dpiStageColors.slice();
-        while (colors.length < count) colors.push(colors.at(-1) ?? "#000000");
-        status.dpiStageColors = colors;
+        status.dpiStageColors = count <= status.dpiStageColors.length
+          ? status.dpiStageColors.slice(0, count)
+          : [...status.dpiStageColors, ...Array.from(
+            { length: count - status.dpiStageColors.length },
+            () => status.dpiStageColors?.at(-1) ?? "#000000",
+          )];
       }
       if ((status.activeDpiStage ?? 0) >= count) {
         status.activeDpiStage = count - 1;
@@ -4785,22 +4805,18 @@ export function resetKsnakeButtonMappings(): void {
     progress: "Restoring default button mapping…",
     preview: (status) => {
       if (!status.buttonMappings) return;
-      const defaults: Record<string, string> = {
-        Left: "Left click",
-        Right: "Right click",
-        Middle: "Middle click",
-        Forward: "Forward",
-        Backward: "Backward",
-        "Scroll up": "Scroll up",
-        "Scroll down": "Scroll down",
-        DPI: "DPI loop",
-      };
       status.buttonMappings = Object.fromEntries(
-        Object.keys(status.buttonMappings).map((button) => [button, defaults[button] ?? status.buttonMappings?.[button] ?? "Unknown"]),
+        Object.keys(status.buttonMappings).map((button) => [
+          button,
+          KSNAKE_DEFAULT_BUTTON_MAPPINGS[button] ?? status.buttonMappings?.[button] ?? "Unknown",
+        ]),
       );
     },
     apply: async () => {
       await client.resetButtonMappings!();
+      // Firmware write acknowledgement is usable, but its map read-back is
+      // not trustworthy; keep the selected local profile aligned with reset.
+      syncActiveM2NexProfileButtonDefaults();
     },
   });
 }
diff --git a/src/device/m2nex-profiles.test.ts b/src/device/m2nex-profiles.test.ts
index e244fe9a..56bfd17e 100644
--- a/src/device/m2nex-profiles.test.ts
+++ b/src/device/m2nex-profiles.test.ts
@@ -4,6 +4,7 @@ import test from "node:test";
 import {
   M2NEX_PROFILE_STORAGE_KEY,
   NOIR_S1_PROFILE_COUNT,
+  NOIR_S1_PROFILE_STORAGE_KEY,
   defaultM2NexProfiles,
   loadM2NexProfiles,
   parseM2NexProfileImport,
@@ -80,3 +81,19 @@ test("S1 keeps six local slots and accepts the vendor profile envelope", () => {
   assert.equal(imported?.length, NOIR_S1_PROFILE_COUNT);
   assert.equal(imported?.[5]?.name, "Profile 6");
 });
+
+test("S1 profiles use a separate six-slot browser-storage entry", () => {
+  const store = storage();
+  const profiles = defaultM2NexProfiles(seed(), NOIR_S1_PROFILE_COUNT);
+  profiles[5]!.name = "Productivity";
+
+  saveM2NexProfiles(store, profiles, { storageKey: NOIR_S1_PROFILE_STORAGE_KEY });
+  const loaded = loadM2NexProfiles(store, seed(), {
+    count: NOIR_S1_PROFILE_COUNT,
+    storageKey: NOIR_S1_PROFILE_STORAGE_KEY,
+  });
+
+  assert.equal(loaded.length, 6);
+  assert.equal(loaded[5]?.name, "Productivity");
+  assert.equal(store.getItem(M2NEX_PROFILE_STORAGE_KEY), null);
+});
diff --git a/src/device/noir.test.ts b/src/device/noir.test.ts
new file mode 100644
index 00000000..3326996c
--- /dev/null
+++ b/src/device/noir.test.ts
@@ -0,0 +1,24 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { isNoirKsnakeStatus, isNoirS1Status, NOIR_DPI_STAGE_COLORS, noirBrandLabel } from "./noir.ts";
+
+test("NOIR S1 is recognized with either current K-snake or Noir Gear branding", () => {
+  assert.equal(isNoirS1Status({ brand: "K-snake", name: "NOIR S1" }), true);
+  assert.equal(isNoirS1Status({ brand: "Noir Gear", name: "NOIR S1" }), true);
+  assert.equal(isNoirS1Status({ brand: "K-snake", name: "K-snake X11" }), false);
+  assert.equal(isNoirS1Status({ brand: "Noir Gear", name: "M2-NEX" }), false);
+  assert.equal(isNoirKsnakeStatus({ brand: "Noir Gear", name: "M2-NEX" }), true);
+  assert.equal(noirBrandLabel({ brand: "K-snake", name: "NOIR S1" }), "Noir Gear");
+});
+
+test("Noir DPI indicator palette matches the factory stage order", () => {
+  assert.deepEqual(NOIR_DPI_STAGE_COLORS, [
+    "#ff5a5a",
+    "#4ade80",
+    "#60a5fa",
+    "#facc15",
+    "#22d3ee",
+    "#e879f9",
+  ]);
+});
diff --git a/src/device/noir.ts b/src/device/noir.ts
new file mode 100644
index 00000000..c390e1d3
--- /dev/null
+++ b/src/device/noir.ts
@@ -0,0 +1,28 @@
+import type { MouseStatus } from "@openmouse/protocol/drivers/mouse-types";
+
+type DeviceIdentity = Pick<MouseStatus, "brand" | "name">;
+
+/** The current public K-snake driver reports NOIR S1 as brand "K-snake". */
+export function isNoirS1Status(status: DeviceIdentity | null | undefined): boolean {
+  return status?.name.trim().toUpperCase() === "NOIR S1"
+    && (status.brand === "Noir Gear" || status.brand === "K-snake");
+}
+
+export function isNoirKsnakeStatus(status: DeviceIdentity | null | undefined): boolean {
+  return (status?.brand === "Noir Gear" && status.name === "M2-NEX")
+    || isNoirS1Status(status);
+}
+
+export function noirBrandLabel(status: DeviceIdentity): string {
+  return isNoirS1Status(status) ? "Noir Gear" : status.brand;
+}
+
+/** Factory DPI-indicator colours in the K-snake/Noir firmware order. */
+export const NOIR_DPI_STAGE_COLORS = [
+  "#ff5a5a",
+  "#4ade80",
+  "#60a5fa",
+  "#facc15",
+  "#22d3ee",
+  "#e879f9",
+] as const;
diff --git a/src/i18n-ar.ts b/src/i18n-ar.ts
index 445a5f22..ab80f54c 100644
--- a/src/i18n-ar.ts
+++ b/src/i18n-ar.ts
@@ -1033,7 +1033,7 @@ export const ar: Record<I18nKey, string> = {
   "macro.steps": "{n} steps",
   "macro.empty": "empty",
   "macro.notice": "Saving updates the onboard macro table on the mouse.",
-  "macro.noticeM2nex": "M2-NEX slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
+  "macro.noticeWriteOnly": "Macro slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
   "macro.recorderHint": "Record input or add an action manually.",
   "macro.events": "{n} events",
   "macro.timingRecorded": "Recorded timing",
diff --git a/src/i18n-de.ts b/src/i18n-de.ts
index 15a3ff0b..096736c4 100644
--- a/src/i18n-de.ts
+++ b/src/i18n-de.ts
@@ -1035,7 +1035,7 @@ export const de: Record<I18nKey, string> = {
   "macro.steps": "{n} steps",
   "macro.empty": "empty",
   "macro.notice": "Saving updates the onboard macro table on the mouse.",
-  "macro.noticeM2nex": "M2-NEX slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
+  "macro.noticeWriteOnly": "Macro slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
   "macro.recorderHint": "Record input or add an action manually.",
   "macro.events": "{n} events",
   "macro.timingRecorded": "Recorded timing",
diff --git a/src/i18n-es.ts b/src/i18n-es.ts
index 96560c90..f8c70bac 100644
--- a/src/i18n-es.ts
+++ b/src/i18n-es.ts
@@ -1035,7 +1035,7 @@ export const es: Record<I18nKey, string> = {
   "macro.steps": "{n} steps",
   "macro.empty": "empty",
   "macro.notice": "Saving updates the onboard macro table on the mouse.",
-  "macro.noticeM2nex": "M2-NEX slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
+  "macro.noticeWriteOnly": "Macro slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
   "macro.recorderHint": "Record input or add an action manually.",
   "macro.events": "{n} events",
   "macro.timingRecorded": "Recorded timing",
diff --git a/src/i18n-fr.ts b/src/i18n-fr.ts
index bddb2ec1..bc77a122 100644
--- a/src/i18n-fr.ts
+++ b/src/i18n-fr.ts
@@ -1035,7 +1035,7 @@ export const fr: Record<I18nKey, string> = {
   "macro.steps": "{n} steps",
   "macro.empty": "empty",
   "macro.notice": "Saving updates the onboard macro table on the mouse.",
-  "macro.noticeM2nex": "M2-NEX slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
+  "macro.noticeWriteOnly": "Macro slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
   "macro.recorderHint": "Record input or add an action manually.",
   "macro.events": "{n} events",
   "macro.timingRecorded": "Recorded timing",
diff --git a/src/i18n-ja.ts b/src/i18n-ja.ts
index eef11f5a..94910ed2 100644
--- a/src/i18n-ja.ts
+++ b/src/i18n-ja.ts
@@ -1035,7 +1035,7 @@ export const ja: Record<I18nKey, string> = {
   "macro.steps": "{n} steps",
   "macro.empty": "empty",
   "macro.notice": "Saving updates the onboard macro table on the mouse.",
-  "macro.noticeM2nex": "M2-NEX slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
+  "macro.noticeWriteOnly": "Macro slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
   "macro.recorderHint": "Record input or add an action manually.",
   "macro.events": "{n} events",
   "macro.timingRecorded": "Recorded timing",
diff --git a/src/i18n-ko.ts b/src/i18n-ko.ts
index 6314e926..324cefd3 100644
--- a/src/i18n-ko.ts
+++ b/src/i18n-ko.ts
@@ -1035,7 +1035,7 @@ export const ko: Record<I18nKey, string> = {
   "macro.steps": "{n} steps",
   "macro.empty": "empty",
   "macro.notice": "Saving updates the onboard macro table on the mouse.",
-  "macro.noticeM2nex": "M2-NEX slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
+  "macro.noticeWriteOnly": "Macro slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
   "macro.recorderHint": "Record input or add an action manually.",
   "macro.events": "{n} events",
   "macro.timingRecorded": "Recorded timing",
diff --git a/src/i18n-pt.ts b/src/i18n-pt.ts
index b03bbd45..6f1af090 100644
--- a/src/i18n-pt.ts
+++ b/src/i18n-pt.ts
@@ -1035,7 +1035,7 @@ export const pt: Record<I18nKey, string> = {
   "macro.steps": "{n} steps",
   "macro.empty": "empty",
   "macro.notice": "Saving updates the onboard macro table on the mouse.",
-  "macro.noticeM2nex": "M2-NEX slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
+  "macro.noticeWriteOnly": "Macro slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
   "macro.recorderHint": "Record input or add an action manually.",
   "macro.events": "{n} events",
   "macro.timingRecorded": "Recorded timing",
diff --git a/src/i18n-ru.ts b/src/i18n-ru.ts
index a937ba89..41e28099 100644
--- a/src/i18n-ru.ts
+++ b/src/i18n-ru.ts
@@ -1035,7 +1035,7 @@ export const ru: Record<I18nKey, string> = {
   "macro.steps": "{n} steps",
   "macro.empty": "empty",
   "macro.notice": "Saving updates the onboard macro table on the mouse.",
-  "macro.noticeM2nex": "M2-NEX slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
+  "macro.noticeWriteOnly": "Macro slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
   "macro.recorderHint": "Record input or add an action manually.",
   "macro.events": "{n} events",
   "macro.timingRecorded": "Recorded timing",
diff --git a/src/i18n-vi.ts b/src/i18n-vi.ts
index 33f33efd..19924517 100644
--- a/src/i18n-vi.ts
+++ b/src/i18n-vi.ts
@@ -1041,7 +1041,7 @@ export const vi: Record<I18nKey, string> = {
   "macro.steps": "{n} steps",
   "macro.empty": "empty",
   "macro.notice": "Saving updates the onboard macro table on the mouse.",
-  "macro.noticeM2nex": "M2-NEX slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
+  "macro.noticeWriteOnly": "Macro slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
   "macro.recorderHint": "Record input or add an action manually.",
   "macro.events": "{n} events",
   "macro.timingRecorded": "Recorded timing",
diff --git a/src/i18n-zh.ts b/src/i18n-zh.ts
index a8d54b86..de10898f 100644
--- a/src/i18n-zh.ts
+++ b/src/i18n-zh.ts
@@ -1035,7 +1035,7 @@ export const zh: Record<I18nKey, string> = {
   "macro.steps": "{n} steps",
   "macro.empty": "empty",
   "macro.notice": "Saving updates the onboard macro table on the mouse.",
-  "macro.noticeM2nex": "M2-NEX slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
+  "macro.noticeWriteOnly": "Macro slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
   "macro.recorderHint": "Record input or add an action manually.",
   "macro.events": "{n} events",
   "macro.timingRecorded": "Recorded timing",
diff --git a/src/i18n.ts b/src/i18n.ts
index 0d1f3e84..edbc7b04 100644
--- a/src/i18n.ts
+++ b/src/i18n.ts
@@ -1041,7 +1041,7 @@ const en = {
   "macro.steps": "{n} steps",
   "macro.empty": "empty",
   "macro.notice": "Saving updates the onboard macro table on the mouse.",
-  "macro.noticeM2nex": "M2-NEX slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
+  "macro.noticeWriteOnly": "Macro slots start blank in OpenMouse. Saving rewrites the onboard macro table.",
   "macro.recording": "Recording input",
   "macro.addActions": "Add actions",
   "macro.recorderHint": "Record input or add an action manually.",
diff --git a/src/ui/device-images.test.ts b/src/ui/device-images.test.ts
index f65c6d3b..1c64e216 100644
--- a/src/ui/device-images.test.ts
+++ b/src/ui/device-images.test.ts
@@ -250,6 +250,11 @@ test("Noir Gear M2-NEX resolves to its maintainer-hosted artwork", () => {
   assert.equal(deviceImage(null, "Noir Gear M2-NEX"), CDN + "noir-m2-nex.png");
 });
 
+test("Noir S1 resolves to the reserved maintainer-hosted artwork filename", () => {
+  assert.equal(deviceImage(null, "NOIR S1"), CDN + "noir-s1.png");
+  assert.equal(deviceImage(null, "Noir Gear / NOIR S1"), CDN + "noir-s1.png");
+});
+
 test("Attack Shark X11 does not inherit K-snake artwork", () => {
   assert.equal(deviceImage(null, "Attack Shark X11"), CDN + "unknown-device.png");
   assert.equal(deviceImage(null, "Attack Shark X11 SE"), CDN + "unknown-device.png");
diff --git a/src/ui/device-images.ts b/src/ui/device-images.ts
index 2997c091..20b042ef 100644
--- a/src/ui/device-images.ts
+++ b/src/ui/device-images.ts
@@ -122,6 +122,7 @@ function resolveDeviceImageFilename(_device: HIDDevice | null | undefined, displ
   if (/\bsword\s*x\b/i.test(displayName)) return "wlmouse-sword-x.png";
   if (/\bdragonfly\s*f2\b/i.test(displayName)) return "vgn-dragonfly-f2.png";
   if (/\bmaya\s*x\b/i.test(displayName)) return "lamzu-maya-x.png";
+  if (/\bnoir\s*s1\b/i.test(displayName)) return "noir-s1.png";
   if (/k[\s-]*snake/i.test(displayName)) return "ksnake-x11.png";
   if (/\bf1\s*v2\b/i.test(displayName)) return "atk-f1-v2-ultra-max.png";
   // Catches any A7 variant whose product id is not pinned above. V3 first, so

From 4e84f99042cd4b3a6128fcf1bd54cc1fd04a6271 Mon Sep 17 00:00:00 2001
From: user_1781515504933 <email_1781515504933>
Date: Wed, 30 Sep 2026 16:00:20 +0700
Subject: [PATCH 9/9] fix: keep direct Noir remaps in profile state

---
 src/device/controller.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/device/controller.ts b/src/device/controller.ts
index 61668c6b..09d06e99 100644
--- a/src/device/controller.ts
+++ b/src/device/controller.ts
@@ -755,6 +755,14 @@ function setEditorToM2NexProfile(): void {
   ksnakeMacrosError = null;
 }
 
+function syncActiveM2NexProfileButton(button: string, action: string): void {
+  if (!isM2NexStatus() || !m2nexProfiles?.[activeM2NexProfile]) return;
+  m2nexProfiles = m2nexProfiles.map((profile, index) => index === activeM2NexProfile
+    ? { ...profile, buttonMappings: { ...profile.buttonMappings, [button]: action } }
+    : profile);
+  persistM2NexProfiles();
+}
+
 function cloneKsnakeMacros(profiles: readonly KsnakeMacroProfile[]): KsnakeMacroProfile[] {
   return Array.from({ length: 32 }, (_, slot) => ({
     steps: (profiles[slot]?.steps ?? []).map((step) => ({ ...step })),
@@ -4782,6 +4790,11 @@ export function applyDeviceButtonMapping(button: string, action: string): void {
         setButtonMapping(button: string, action: string): Promise<unknown>;
       };
       await client.setButtonMapping(button, action);
+      // S1's firmware acknowledges SET_KEYS but returns an all-0xff map on
+      // the next GET_KEYS. Keep the selected local profile in sync with the
+      // confirmed write so the profile overlay does not put the old value
+      // back into the editor after the status refresh.
+      syncActiveM2NexProfileButton(button, action);
     },
   });
 }