From ff94f4290e7468bfa232b3b2bf5a152e3e37cf78 Mon Sep 17 00:00:00 2001
From: user_1781515504933 <email_1781515504933>
Date: Fri, 2 Oct 2026 15:50:38 +0700
Subject: [PATCH] feat: add Noir Gear NOIR E1 support

---
 src/app/OverviewPage.tsx                 | 63 +++++++++++++++++-------
 src/app/cards/DpiCard.tsx                |  4 +-
 src/app/cards/availability.test.ts       | 28 +++++++++++
 src/app/cards/availability.ts            |  2 +-
 src/control.css                          | 47 ++++++++++++++++++
 src/device/controller.ts                 | 50 ++++++++++---------
 src/device/m2nex-profiles.test.ts        | 21 ++++++++
 src/device/m2nex-profiles.ts             | 18 ++++---
 src/device/noir.test.ts                  | 27 +++++++---
 src/device/noir.ts                       | 17 +++++--
 src/supported-devices-crosscheck.test.ts | 11 +++++
 src/supported-devices-crosscheck.ts      | 11 +++--
 src/supported-devices-data.ts            |  1 +
 src/ui/device-images.test.ts             |  1 +
 src/ui/device-images.ts                  |  1 +
 15 files changed, 234 insertions(+), 68 deletions(-)

diff --git a/src/app/OverviewPage.tsx b/src/app/OverviewPage.tsx
index 284a5e82..af9a47ee 100644
--- a/src/app/OverviewPage.tsx
+++ b/src/app/OverviewPage.tsx
@@ -15,7 +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 { isNoirE1Status, 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";
@@ -104,6 +104,14 @@ const NOIR_S1_BUTTON_MARKER_POSITIONS: Readonly<Record<string, ButtonMarkerPosit
   dpi: { x: 0.5, y: 0.42 },
 };
 
+const NOIR_E1_BUTTON_MARKER_POSITIONS: Readonly<Record<string, ButtonMarkerPosition>> = {
+  left: { x: 0.28, y: 0.2 },
+  right: { x: 0.72, y: 0.2 },
+  middle: { x: 0.5, y: 0.18 },
+  forward: { x: 0.08, y: 0.32 },
+  backward: { x: 0.08, y: 0.5 },
+};
+
 function m2NexButtonMarkerPosition(button: string): ButtonMarkerPosition | null {
   return M2_NEX_BUTTON_MARKER_POSITIONS[button.trim().toLowerCase()] ?? null;
 }
@@ -112,6 +120,10 @@ function noirS1ButtonMarkerPosition(button: string): ButtonMarkerPosition | null
   return NOIR_S1_BUTTON_MARKER_POSITIONS[button.trim().toLowerCase()] ?? null;
 }
 
+function noirE1ButtonMarkerPosition(button: string): ButtonMarkerPosition | null {
+  return NOIR_E1_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";
@@ -247,12 +259,12 @@ function M2NexProfileOverview({ snapshot }: { snapshot: ControlSnapshot }): Reac
     >
       <div className="m2nex-profile-overview-title">
         <span>{t(locale, "m2nex.overline")}</span>
-        <strong>{t(locale, "m2nex.label")}</strong>
+        <strong>{status.name}</strong>
       </div>
       <label className="m2nex-profile-overview-picker" htmlFor="m2nex-profile-overview-select">
         <select
           id="m2nex-profile-overview-select"
-          aria-label={t(locale, "m2nex.select")}
+          aria-label={`${status.name} profile`}
           value={snapshot.activeM2NexProfile}
           disabled={snapshot.settingInProgress || snapshot.pending.busy}
           onChange={(event) => control.selectM2NexProfile(Number(event.currentTarget.value))}
@@ -318,6 +330,7 @@ export function DeviceShowcaseSidebar({ snapshot }: { snapshot: ControlSnapshot
   const locale = snapshot.preferences.locale;
   const image = snapshot.deviceArtwork;
   const isNoirS1 = isNoirS1Status(status);
+  const isNoirE1 = isNoirE1Status(status);
   const showButtonMarkers = snapshot.workspaceTab === "buttons"
     && isNoirKsnakeStatus(status)
     && status.buttonMappings != null;
@@ -337,22 +350,34 @@ export function DeviceShowcaseSidebar({ snapshot }: { snapshot: ControlSnapshot
               }}
             />
             <div className="button-map-markers" aria-hidden="true">
-              {Object.keys(status.buttonMappings ?? {}).map((button, index) => {
-                const position = isNoirS1
-                  ? noirS1ButtonMarkerPosition(button)
-                  : m2NexButtonMarkerPosition(button);
-                if (!position) return null;
-                return (
-                  <span
-                    key={button}
-                    className="button-map-marker"
-                    style={{ left: `${position.x * 100}%`, top: `${position.y * 100}%` }}
-                  >
-                    {String(index + 1).padStart(2, "0")}
-                  </span>
-                );
-              })}
+              {Object.keys(status.buttonMappings ?? {})
+                .filter((button) => !isNoirE1 || button.trim().toLowerCase() !== "dpi")
+                .map((button, index) => {
+                  const position = isNoirS1
+                    ? noirS1ButtonMarkerPosition(button)
+                    : isNoirE1
+                      ? noirE1ButtonMarkerPosition(button)
+                      : m2NexButtonMarkerPosition(button);
+                  if (!position) return null;
+                  return (
+                    <span
+                      key={button}
+                      className="button-map-marker"
+                      style={{ left: `${position.x * 100}%`, top: `${position.y * 100}%` }}
+                    >
+                      {String(index + 1).padStart(2, "0")}
+                    </span>
+                  );
+                })}
             </div>
+            {isNoirE1 ? (
+              <div className="button-map-underside-callout" aria-hidden="true">
+                <span className="button-map-underside-badge">
+                  <span className="button-map-underside-number">06</span>
+                  <span>DPI <small>UNDERSIDE</small></span>
+                </span>
+              </div>
+            ) : null}
           </div>
         ) : (
           <img
@@ -719,7 +744,7 @@ function DeviceListView({ snapshot }: { snapshot: ControlSnapshot }): ReactNode
               const batteryText = liveStatus?.batteryPercent != null ? `${liveStatus.batteryPercent}%` : "–%";
               const imageSrc = deviceImage({ vendorId: device.vendorId, productId: device.productId } as HIDDevice, device.name);
               const imageFilename = deviceImageFilename(device.name);
-              const imageClass = imageFilename === "noir-m2-nex.png" || imageFilename === "noir-s1.png"
+              const imageClass = imageFilename === "noir-m2-nex.png" || imageFilename === "noir-s1.png" || imageFilename === "noir-e1.png"
                 ? " device-tile-image-is-portrait"
                 : "";
               return (
diff --git a/src/app/cards/DpiCard.tsx b/src/app/cards/DpiCard.tsx
index db4e0638..31ebaf32 100644
--- a/src/app/cards/DpiCard.tsx
+++ b/src/app/cards/DpiCard.tsx
@@ -6,7 +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 { isNoirE1Status, 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";
@@ -471,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 = !isNoirS1Status(status);
+  const singleDpiAvailable = !isNoirS1Status(status) && !isNoirE1Status(status);
 
   const label = (source: typeof status): string => `${source.dpi.toLocaleString()} DPI`;
 
diff --git a/src/app/cards/availability.test.ts b/src/app/cards/availability.test.ts
index 45f31366..ab63ca61 100644
--- a/src/app/cards/availability.test.ts
+++ b/src/app/cards/availability.test.ts
@@ -454,6 +454,34 @@ test("the generic button card follows the driver\'s mappings, not the advanced s
   assert.equal(has.processing, false, "the rest of the advanced section stays closed");
 });
 
+test("NOIR E1 gets the same core configurator controls even without a family hint", () => {
+  const has = cardAvailability(snapshot({
+    status: {
+      brand: "K-snake",
+      name: "NOIR E1",
+      ui: { showAdvancedSection: 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: "Forward",
+      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.lightingAdvanced, false);
+});
+
 test("the G-Wolves XVI generation opens sleep, debounce and processing, but not signal", () => {
   const cards = cardAvailability(snapshot({
     status: {
diff --git a/src/app/cards/availability.ts b/src/app/cards/availability.ts
index 37445331..0b4058e0 100644
--- a/src/app/cards/availability.ts
+++ b/src/app/cards/availability.ts
@@ -157,7 +157,7 @@ export function cardAvailability(snapshot: ControlSnapshot): CardAvailability {
       && status.debounceMs !== null && status.debounceMs !== undefined,
     sleep: host && (traits.sleep || capabilities?.sleepOptions != null || razerSleep)
       && ui?.hideSleepCard !== true,
-    ksnakeScroll: ui?.family === "ksnake" && status.scrollDirection != null,
+    ksnakeScroll: (ui?.family === "ksnake" || isNoirKsnake) && status.scrollDirection != null,
     lowPower: host && razerLowPower,
     processing: host && processing,
     ninjutsoSensor: host && traits.ninjutso
diff --git a/src/control.css b/src/control.css
index 161d6484..8e4bbcfb 100644
--- a/src/control.css
+++ b/src/control.css
@@ -1482,6 +1482,53 @@ nav { display: grid; gap: .3rem; margin-top: 1.4rem; }
   line-height: 1;
   transform: translate(-50%, -50%);
 }
+.button-map-underside-callout {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-top: .18rem;
+  line-height: 1;
+}
+.button-map-underside-callout::before {
+  width: 1px;
+  height: .72rem;
+  border-radius: 2px;
+  background: #727985;
+  content: "";
+}
+.button-map-underside-badge {
+  display: inline-flex;
+  align-items: center;
+  gap: .42rem;
+  padding: .2rem .58rem .2rem .22rem;
+  border: 1px solid #41464f;
+  border-radius: 999px;
+  background: #24272d;
+  box-shadow: 0 2px 8px rgb(0 0 0 / 32%);
+  color: #e0e3e8;
+  font: 650 .59rem var(--font-mono);
+  letter-spacing: .04em;
+  text-transform: uppercase;
+}
+.button-map-underside-badge small {
+  margin-left: .2rem;
+  color: #9ba2ac;
+  font: inherit;
+  font-size: .51rem;
+  letter-spacing: .06em;
+}
+.button-map-underside-number {
+  display: grid;
+  width: 1.42rem;
+  height: 1.42rem;
+  place-items: center;
+  border: 1px solid #fff;
+  border-radius: 50%;
+  background: #f2f3f5;
+  color: #202329;
+  font: 700 .57rem var(--font-mono);
+  letter-spacing: .02em;
+}
 .showcase-sidebar-info { width: 100%; min-width: 0; margin-top: 1rem; }
 .showcase-sidebar-name {
   margin: 0;
diff --git a/src/device/controller.ts b/src/device/controller.ts
index dafa26e6..d0337290 100644
--- a/src/device/controller.ts
+++ b/src/device/controller.ts
@@ -108,11 +108,13 @@ import {
   loadM2NexProfiles,
   parseM2NexProfileImport,
   saveM2NexProfiles,
+  NOIR_E1_PROFILE_COUNT,
+  NOIR_E1_PROFILE_STORAGE_KEY,
   NOIR_S1_PROFILE_COUNT,
   NOIR_S1_PROFILE_STORAGE_KEY,
   type M2NexProfile,
 } from "./m2nex-profiles";
-import { isNoirKsnakeStatus as isNoirKsnakeIdentity, isNoirS1Status as isNoirS1Identity } from "./noir.ts";
+import { isNoirE1Status, isNoirKsnakeStatus as isNoirKsnakeIdentity, isNoirS1Status as isNoirS1Identity } from "./noir.ts";
 import {
   LOGITECH_HAPTIC_EFFECTS,
   LOGITECH_HAPTIC_PRESETS,
@@ -694,21 +696,22 @@ function ksnakeMacroClient(): KsnakeMacroClient | null {
     : null;
 }
 
-function isM2NexStatus(status: MouseStatus | null | undefined = latestDeviceStatus): boolean {
+function isNoirProfileDevice(status: MouseStatus | null | undefined = latestDeviceStatus): boolean {
   return isNoirKsnakeIdentity(status);
 }
 
-function isNoirS1Status(status: MouseStatus | null | undefined = latestDeviceStatus): boolean {
-  return isNoirS1Identity(status);
-}
 
 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;
+  if (isNoirS1Identity(status)) {
+    return { count: NOIR_S1_PROFILE_COUNT, storageKey: NOIR_S1_PROFILE_STORAGE_KEY };
+  }
+  if (isNoirE1Status(status)) {
+    return { count: NOIR_E1_PROFILE_COUNT, storageKey: NOIR_E1_PROFILE_STORAGE_KEY };
+  }
+  return undefined;
 }
 
 function persistM2NexProfiles(): void {
@@ -716,7 +719,7 @@ function persistM2NexProfiles(): void {
 }
 
 function syncActiveM2NexProfileButtonDefaults(): void {
-  if (!isM2NexStatus() || !m2nexProfiles?.[activeM2NexProfile]) return;
+  if (!isNoirProfileDevice() || !m2nexProfiles?.[activeM2NexProfile]) return;
   m2nexProfiles = m2nexProfiles.map((profile, index) => index === activeM2NexProfile
     ? { ...profile, buttonMappings: { ...profile.buttonMappings, ...KSNAKE_DEFAULT_BUTTON_MAPPINGS } }
     : profile);
@@ -730,7 +733,7 @@ function profileMacroTable(): KsnakeMacroProfile[] | null {
 }
 
 function seedM2NexProfiles(status: MouseStatus): void {
-  if (!isM2NexStatus(status)) {
+  if (!isNoirProfileDevice(status)) {
     m2nexProfiles = null;
     activeM2NexProfile = 0;
     m2nexProfileDirty = false;
@@ -759,7 +762,7 @@ function setEditorToM2NexProfile(): void {
 }
 
 function syncActiveM2NexProfileButton(button: string, action: string): void {
-  if (!isM2NexStatus() || !m2nexProfiles?.[activeM2NexProfile]) return;
+  if (!isNoirProfileDevice() || !m2nexProfiles?.[activeM2NexProfile]) return;
   m2nexProfiles = m2nexProfiles.map((profile, index) => index === activeM2NexProfile
     ? { ...profile, buttonMappings: { ...profile.buttonMappings, [button]: action } }
     : profile);
@@ -791,7 +794,7 @@ export function loadKsnakeMacros(): void {
   }
   ksnakeMacrosLoading = false;
   ksnakeMacrosError = null;
-  if (isM2NexStatus() && m2nexProfiles?.[activeM2NexProfile]) setEditorToM2NexProfile();
+  if (isNoirProfileDevice() && m2nexProfiles?.[activeM2NexProfile]) setEditorToM2NexProfile();
   else ksnakeMacros = cloneKsnakeMacros([]);
   stagedKsnakeMacros = null;
   emit();
@@ -799,7 +802,7 @@ export function loadKsnakeMacros(): void {
 
 /** Select one of the local M2-NEX profile slots. The device is unchanged until Apply profile. */
 export function selectM2NexProfile(index: number): void {
-  if (!isM2NexStatus() || !m2nexProfiles?.[index]) return;
+  if (!isNoirProfileDevice() || !m2nexProfiles?.[index]) return;
   if (hasPendingChanges()) {
     setReadStatus(st("m2nex.switchBlocked"));
     return;
@@ -813,7 +816,7 @@ export function selectM2NexProfile(index: number): void {
 /** 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;
+  if (!isNoirProfileDevice() || !m2nexProfiles?.[activeM2NexProfile]) return;
   const current = m2nexProfiles[activeM2NexProfile];
   const suggested = `Profile ${activeM2NexProfile + 1}`;
   const name = window.prompt("Profile name", suggested)?.trim();
@@ -829,7 +832,7 @@ export function createM2NexProfile(): void {
 
 /** Import the official-style `{ deviceModel, profileData }` JSON envelope. */
 export function importM2NexProfiles(text: string): void {
-  if (!isM2NexStatus() || !m2nexProfiles) return;
+  if (!isNoirProfileDevice() || !m2nexProfiles) return;
   let raw: unknown;
   try {
     raw = JSON.parse(text);
@@ -867,7 +870,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 (!isNoirProfileDevice() || !m2nexProfiles?.[activeM2NexProfile]) return;
   if (button === "Left") return;
   const current = m2nexProfiles[activeM2NexProfile];
   m2nexProfiles = m2nexProfiles.map((profile, index) => index === activeM2NexProfile
@@ -881,7 +884,7 @@ export function updateM2NexProfileButton(button: string, action: string): void {
 
 /** Save the currently displayed device settings into the selected local slot. */
 export function saveCurrentM2NexProfile(): void {
-  if (!isM2NexStatus() || !latestDeviceStatus || !m2nexProfiles?.[activeM2NexProfile]) return;
+  if (!isNoirProfileDevice() || !latestDeviceStatus || !m2nexProfiles?.[activeM2NexProfile]) return;
   const status = withPendingChanges(latestDeviceStatus);
   const current = m2nexProfiles[activeM2NexProfile];
   const macros = profileMacroTable();
@@ -905,7 +908,7 @@ export function saveCurrentM2NexProfile(): void {
 
 /** Apply a complete local M2-NEX profile through the same verified setters as the individual controls. */
 export async function applyM2NexProfile(index = activeM2NexProfile): Promise<void> {
-  if (!isM2NexStatus() || !latestDeviceStatus || !m2nexProfiles?.[index]) return;
+  if (!isNoirProfileDevice() || !latestDeviceStatus || !m2nexProfiles?.[index]) return;
   if (hasPendingChanges()) {
     setReadStatus(st("m2nex.applyBlocked"));
     return;
@@ -970,7 +973,8 @@ export async function applyM2NexProfile(index = activeM2NexProfile): Promise<voi
       emit();
       await rawClient.setPollingRate(profile.pollingRateHz);
     }
-    if (profile.scrollDirection && before.scrollDirection !== profile.scrollDirection) {
+    if (profile.scrollDirection && before.scrollDirection !== profile.scrollDirection
+      && typeof rawClient.setScrollDirection === "function") {
       pendingStatusText = `Applying ${profile.name}: scroll direction…`;
       readStatus = pendingStatusText;
       emit();
@@ -1018,7 +1022,7 @@ export function applyKsnakeMacro(slot: number, profile: KsnakeMacroProfile): voi
       if (active === client) {
         ksnakeMacros = cloneKsnakeMacros(next);
         stagedKsnakeMacros = null;
-        if (isM2NexStatus() && m2nexProfiles?.[activeM2NexProfile]) {
+        if (isNoirProfileDevice() && m2nexProfiles?.[activeM2NexProfile]) {
           m2nexProfiles = m2nexProfiles.map((profile, index) => index === activeM2NexProfile
             ? { ...profile, macros: cloneKsnakeMacros(next) }
             : profile);
@@ -2563,8 +2567,8 @@ async function activateClientNow(client: SupportedClient): Promise<void> {
     // tuning are editable on the first status snapshot.
     capabilities = readCapabilities();
     applyStatus(status);
-    if (isM2NexStatus(status) && m2nexProfiles === null) seedM2NexProfiles(status);
-    if (!isM2NexStatus(status)) {
+    if (isNoirProfileDevice(status) && m2nexProfiles === null) seedM2NexProfiles(status);
+    if (!isNoirProfileDevice(status)) {
       m2nexProfiles = null;
       activeM2NexProfile = 0;
       m2nexProfileDirty = false;
@@ -4805,7 +4809,7 @@ 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;
+  if (!isNoirProfileDevice()) return;
   const client = active as unknown as Partial<{
     resetButtonMappings(): Promise<unknown>;
   }> | null;
diff --git a/src/device/m2nex-profiles.test.ts b/src/device/m2nex-profiles.test.ts
index 56bfd17e..8ad5808a 100644
--- a/src/device/m2nex-profiles.test.ts
+++ b/src/device/m2nex-profiles.test.ts
@@ -2,6 +2,8 @@ import assert from "node:assert/strict";
 import test from "node:test";
 
 import {
+  NOIR_E1_PROFILE_COUNT,
+  NOIR_E1_PROFILE_STORAGE_KEY,
   M2NEX_PROFILE_STORAGE_KEY,
   NOIR_S1_PROFILE_COUNT,
   NOIR_S1_PROFILE_STORAGE_KEY,
@@ -97,3 +99,22 @@ test("S1 profiles use a separate six-slot browser-storage entry", () => {
   assert.equal(loaded[5]?.name, "Productivity");
   assert.equal(store.getItem(M2NEX_PROFILE_STORAGE_KEY), null);
 });
+test("E1 has six isolated local profile slots without changing M2-NEX storage", () => {
+  const store = storage();
+  const profiles = defaultM2NexProfiles(seed(), NOIR_E1_PROFILE_COUNT);
+  profiles[0]!.name = "E1 gaming";
+  saveM2NexProfiles(store, profiles, {
+    count: NOIR_E1_PROFILE_COUNT,
+    storageKey: NOIR_E1_PROFILE_STORAGE_KEY,
+  });
+
+  const loaded = loadM2NexProfiles(store, seed(), {
+    count: NOIR_E1_PROFILE_COUNT,
+    storageKey: NOIR_E1_PROFILE_STORAGE_KEY,
+  });
+  const m2nex = loadM2NexProfiles(store, seed());
+  assert.equal(loaded.length, 6);
+  assert.equal(loaded[0]?.name, "E1 gaming");
+  assert.equal(m2nex.length, 3);
+  assert.notEqual(NOIR_E1_PROFILE_STORAGE_KEY, M2NEX_PROFILE_STORAGE_KEY);
+});
diff --git a/src/device/m2nex-profiles.ts b/src/device/m2nex-profiles.ts
index 7e896bce..4306dd5b 100644
--- a/src/device/m2nex-profiles.ts
+++ b/src/device/m2nex-profiles.ts
@@ -7,6 +7,9 @@ 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";
+/** E1 keeps its six configurator slots separate from M2-NEX local data. */
+export const NOIR_E1_PROFILE_COUNT = 6;
+export const NOIR_E1_PROFILE_STORAGE_KEY = "openmouse.noir-e1.profiles.v1";
 
 export interface M2NexProfile {
   id: number;
@@ -26,6 +29,11 @@ interface StoredM2NexProfiles {
   profiles: M2NexProfile[];
 }
 
+export interface M2NexProfileStoreOptions {
+  count?: number;
+  storageKey?: string;
+}
+
 export type M2NexProfileSeed = Pick<
   MouseStatus,
   "dpi" | "dpiStages" | "activeDpiStage" | "pollingRateHz" | "buttonMappings" | "scrollDirection"
@@ -67,12 +75,10 @@ function seedProfile(id: number, seed: M2NexProfileSeed): M2NexProfile {
   };
 }
 
-export interface M2NexProfileStoreOptions {
-  count?: number;
-  storageKey?: string;
-}
-
-export function defaultM2NexProfiles(seed: M2NexProfileSeed, count = M2NEX_PROFILE_COUNT): M2NexProfile[] {
+export function defaultM2NexProfiles(
+  seed: M2NexProfileSeed,
+  count = M2NEX_PROFILE_COUNT,
+): M2NexProfile[] {
   return Array.from({ length: count }, (_, id) => seedProfile(id, seed));
 }
 
diff --git a/src/device/noir.test.ts b/src/device/noir.test.ts
index 3326996c..a2d0fe5b 100644
--- a/src/device/noir.test.ts
+++ b/src/device/noir.test.ts
@@ -1,7 +1,14 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
-import { isNoirKsnakeStatus, isNoirS1Status, NOIR_DPI_STAGE_COLORS, noirBrandLabel } from "./noir.ts";
+import {
+  isNoirE1Status,
+  isNoirKsnakeStatus,
+  isNoirM2NexStatus,
+  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);
@@ -12,13 +19,17 @@ test("NOIR S1 is recognized with either current K-snake or Noir Gear branding",
   assert.equal(noirBrandLabel({ brand: "K-snake", name: "NOIR S1" }), "Noir Gear");
 });
 
-test("Noir DPI indicator palette matches the factory stage order", () => {
+test("NOIR E1 is recognized under the vendor or chipset brand without matching M2-NEX", () => {
+  assert.equal(isNoirE1Status({ brand: "K-snake", name: "NOIR E1" }), true);
+  assert.equal(isNoirE1Status({ brand: "Noir Gear", name: "noir e1" }), true);
+  assert.equal(isNoirE1Status({ brand: "Other", name: "NOIR E1" }), false);
+  assert.equal(isNoirM2NexStatus({ brand: "Noir Gear", name: "NOIR E1" }), false);
+  assert.equal(isNoirKsnakeStatus({ brand: "K-snake", name: "NOIR E1" }), true);
+  assert.equal(noirBrandLabel({ brand: "K-snake", name: "NOIR E1" }), "Noir Gear");
+});
+
+test("NOIR DPI indicator palette matches the device stage order", () => {
   assert.deepEqual(NOIR_DPI_STAGE_COLORS, [
-    "#ff5a5a",
-    "#4ade80",
-    "#60a5fa",
-    "#facc15",
-    "#22d3ee",
-    "#e879f9",
+    "#ff5a5a", "#4ade80", "#60a5fa", "#facc15", "#22d3ee", "#e879f9",
   ]);
 });
diff --git a/src/device/noir.ts b/src/device/noir.ts
index c390e1d3..09d8f268 100644
--- a/src/device/noir.ts
+++ b/src/device/noir.ts
@@ -2,22 +2,31 @@ import type { MouseStatus } from "@openmouse/protocol/drivers/mouse-types";
 
 type DeviceIdentity = Pick<MouseStatus, "brand" | "name">;
 
+export function isNoirM2NexStatus(status: DeviceIdentity | null | undefined): boolean {
+  return status?.brand === "Noir Gear" && status.name === "M2-NEX";
+}
+
 /** 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");
 }
 
+/** E1 is exposed by the shared K-snake transport under either brand. */
+export function isNoirE1Status(status: DeviceIdentity | null | undefined): boolean {
+  return status?.name.trim().toUpperCase() === "NOIR E1"
+    && (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);
+  return isNoirM2NexStatus(status) || isNoirS1Status(status) || isNoirE1Status(status);
 }
 
 export function noirBrandLabel(status: DeviceIdentity): string {
-  return isNoirS1Status(status) ? "Noir Gear" : status.brand;
+  return isNoirS1Status(status) || isNoirE1Status(status) ? "Noir Gear" : status.brand;
 }
 
-/** Factory DPI-indicator colours in the K-snake/Noir firmware order. */
+/** Factory DPI indicator colours in the K-snake/Noir firmware order. */
 export const NOIR_DPI_STAGE_COLORS = [
   "#ff5a5a",
   "#4ade80",
diff --git a/src/supported-devices-crosscheck.test.ts b/src/supported-devices-crosscheck.test.ts
index 3d51cd11..eff11922 100644
--- a/src/supported-devices-crosscheck.test.ts
+++ b/src/supported-devices-crosscheck.test.ts
@@ -75,6 +75,17 @@ test("M2-NEX resolves to the Noir Gear supported row despite the shared OEM PID"
   assert.match(result.detail, /already listed as Supported/);
 });
 
+test("NOIR E1 resolves to its own pending row despite sharing the M2-NEX PID", () => {
+  const result = crosscheckSupportedDevices(
+    device({ brand: "Noir Gear", name: "NOIR E1", vendorId: 0xa8a4, productId: 0x2255 }),
+    "pass",
+  );
+  assert.equal(result.listed, true);
+  assert.equal(result.matchedBy, "pid");
+  assert.equal(result.status, "pending");
+  assert.equal(result.pageModel, "NOIR E1");
+});
+
 test("brand+model name match on a likely row with a passing run qualifies for Supported", () => {
   const result = crosscheckSupportedDevices(
     device({ brand: "ATK", name: "F1 Ultimate" }),
diff --git a/src/supported-devices-crosscheck.ts b/src/supported-devices-crosscheck.ts
index d8b5a997..6f724f21 100644
--- a/src/supported-devices-crosscheck.ts
+++ b/src/supported-devices-crosscheck.ts
@@ -85,12 +85,13 @@ export function crosscheckSupportedDevices(
 
   if (byPid.length > 0) {
     matchedBy = "pid";
-    // Prefer rows whose brand matches the connected device; otherwise take the
-    // most upstream status among the PID rows (a PID shared across models, as
-    // with Incott, reports the best-known status).
+    // Prefer an exact model name before brand/status. Shared PIDs can map to
+    // multiple Noir Gear models, so name avoids inheriting a sibling's status.
     const ranked = byPid.sort(
       (left, right) =>
-        Number(brandMatches(right)) - Number(brandMatches(left))
+        Number(normalize(right.model) === normalize(device.name ?? ""))
+        - Number(normalize(left.model) === normalize(device.name ?? ""))
+        || Number(brandMatches(right)) - Number(brandMatches(left))
         || STATUS_ORDER[left.status] - STATUS_ORDER[right.status],
     );
     match = ranked[0] ?? null;
@@ -132,4 +133,4 @@ export function crosscheckSupportedDevices(
   }
 
   return { listed: true, status: match.status, label, matchedBy, pageModel: model, detail };
-}
\ No newline at end of file
+}
diff --git a/src/supported-devices-data.ts b/src/supported-devices-data.ts
index 2e06116f..b5f87394 100644
--- a/src/supported-devices-data.ts
+++ b/src/supported-devices-data.ts
@@ -562,6 +562,7 @@ export const SUPPORTED_DEVICES: readonly SupportedDeviceEntry[] = [
   { brand: "MSI", model: "Clutch GM41 Lightweight Wireless (Stalker 2 Edition)", status: "pending" },
   { brand: "MSI", model: "GM340", status: "pending" },
   { brand: "MSI", model: "Versa 300", status: "pending" },
+  { brand: "Noir Gear", model: "NOIR E1", status: "pending", pids: [0x2255] },
   { brand: "Noir Gear", model: "S1 Series", status: "pending" },
   { brand: "NOS", model: "M750", status: "pending" },
   { brand: "NOS", model: "M800", status: "pending" },
diff --git a/src/ui/device-images.test.ts b/src/ui/device-images.test.ts
index 3462a6b6..5ac37e44 100644
--- a/src/ui/device-images.test.ts
+++ b/src/ui/device-images.test.ts
@@ -253,6 +253,7 @@ test("K-snake X11 resolves by name regardless of transport", () => {
 test("Noir Gear M2-NEX resolves to its maintainer-hosted artwork", () => {
   assert.equal(deviceImage(null, "M2-NEX"), CDN + "noir-m2-nex.png");
   assert.equal(deviceImage(null, "Noir Gear M2-NEX"), CDN + "noir-m2-nex.png");
+  assert.equal(deviceImage(null, "NOIR E1"), CDN + "noir-e1.png");
 });
 
 test("Noir S1 resolves to the reserved maintainer-hosted artwork filename", () => {
diff --git a/src/ui/device-images.ts b/src/ui/device-images.ts
index a1410034..30f00c5e 100644
--- a/src/ui/device-images.ts
+++ b/src/ui/device-images.ts
@@ -173,6 +173,7 @@ function resolveDeviceImageFilename(_device: HIDDevice | null | undefined, displ
   // retail shell. Keep its artwork match name-based so USB and 2.4 GHz
   // receiver connections resolve to the same product image.
   if (/m2\s*[-_]?\s*nex/i.test(displayName)) return "noir-m2-nex.png";
+  if (/\bnoir\s*e1\b/i.test(displayName)) return "noir-e1.png";
   if (/fantech/i.test(displayName)) return "unknown-device.png";
   return "unknown-device.png";
 }