🔥 only save bottom out threshold on command

Author: peppapighs

src/lib/configurator/calibration/calibration-menu.svelte

@@ -20,14 +20,18 @@ this program. If not, see <https://www.gnu.org/licenses/>.
   import Switch from "$lib/components/switch.svelte"
   import { Button } from "$lib/components/ui/button"
   import { keyboardContext } from "$lib/keyboard"
+  import { isFeatureAvailable } from "$lib/utils"
+  import { toast } from "svelte-sonner"
   import { analogInfoQueryContext } from "../queries/analog-info-query.svelte"
   import { calibrationQueryContext } from "../queries/calibration.query.svelte"
   import { optionsQueryContext } from "../queries/options-query.svelte"
 
+  const keyboard = keyboardContext.get()
   const {
     demo,
+    version,
     metadata: { adcResolution },
-  } = keyboardContext.get()
+  } = keyboard
 
   const analogInfoQuery = analogInfoQueryContext.get()
   const calibrationQuery = calibrationQueryContext.get()
@@ -38,18 +42,22 @@ this program. If not, see <https://www.gnu.org/licenses/>.
 
 <div class="grid size-full grid-cols-[minmax(0,1fr)_24rem]">
   <FixedScrollArea class="flex flex-col gap-4 p-4">
-    <Switch
-      bind:checked={
-        () => options?.saveBottomOutThreshold ?? false,
-        (v) =>
-          options &&
-          optionsQuery.set({ data: { ...options, saveBottomOutThreshold: v } })
-      }
-      disabled={demo || !options}
-      id="save-bottom-out-threshold"
-      title="Save Bottom Out Threshold"
-      description="Periodically save the per-key bottom-out threshold values after some inactivity to be restored on next boot. The saved values will only be cleared on recalibration. This setting applies globally across all profiles."
-    />
+    {#if !isFeatureAvailable("saveCalibrationThreshold", version)}
+      <Switch
+        bind:checked={
+          () => options?.saveBottomOutThreshold ?? false,
+          (v) =>
+            options &&
+            optionsQuery.set({
+              data: { ...options, saveBottomOutThreshold: v },
+            })
+        }
+        disabled={demo || !options}
+        id="save-bottom-out-threshold"
+        title="Save Bottom Out Threshold"
+        description="Periodically save the per-key bottom-out threshold values after some inactivity to be restored on next boot. The saved values will only be cleared on recalibration. This setting applies globally across all profiles."
+      />
+    {/if}
     <CommitSlider
       bind:committed={
         () => calibration?.initialRestValue ?? 0,
@@ -89,14 +97,27 @@ this program. If not, see <https://www.gnu.org/licenses/>.
       step={10}
       title="Initial Bottom Out Threshold"
     />
-    <div>
+    <div class="flex gap-2">
       <Button
         disabled={demo}
         onclick={() => analogInfoQuery.recalibrate()}
         size="sm"
+        variant="destructive"
       >
         Recalibrate
       </Button>
+      {#if isFeatureAvailable("saveCalibrationThreshold", version)}
+        <Button
+          disabled={demo}
+          onclick={async () => {
+            await keyboard.saveCalibrationThreshold()
+            toast.success("Successfully saved calibration threshold.")
+          }}
+          size="sm"
+        >
+          Save Current Threshold
+        </Button>
+      {/if}
     </div>
   </FixedScrollArea>
   <FixedScrollArea class="flex flex-col gap-4 p-4">

src/lib/keyboard/demo-keyboard.svelte.ts

@@ -127,6 +127,9 @@ export class DemoKeyboard implements Keyboard {
       this.#state.profiles[srcProfile],
     )
   }
+  async saveCalibrationThreshold() {
+    return
+  }
 
   async getKeymap({ profile }: GetKeymapParams) {
     return this.#state.profiles[profile].keymap

src/lib/keyboard/hmk-keyboard.svelte.ts

@@ -32,6 +32,7 @@ import { bootloader } from "$lib/libhmk/commands/bootloader"
 import {
   getCalibration,
   recalibrate,
+  saveCalibrationThreshold,
   setCalibration,
 } from "$lib/libhmk/commands/calibration"
 import { factoryReset } from "$lib/libhmk/commands/factory-reset"
@@ -155,6 +156,9 @@ class HMKKeyboard implements Keyboard {
   duplicateProfile(params: DuplicateProfileParams) {
     return duplicateProfile(this.commander, params)
   }
+  saveCalibrationThreshold() {
+    return saveCalibrationThreshold(this.commander)
+  }
 
   getKeymap(params: GetKeymapParams) {
     return getKeymap(this.commander, this.metadata, params)

src/lib/keyboard/index.ts

@@ -74,6 +74,7 @@ export type KeyboardAction = {
   setOptions(params: SetOptionsParams): Promise<void>
   resetProfile(params: ResetProfileParams): Promise<void>
   duplicateProfile(params: DuplicateProfileParams): Promise<void>
+  saveCalibrationThreshold(): Promise<void>
 
   getKeymap(params: GetKeymapParams): Promise<number[][]>
   setKeymap(params: SetKeymapParams): Promise<void>

src/lib/libhmk/commands/calibration.ts

@@ -51,3 +51,10 @@ export async function setCalibration(
     ],
   })
 }
+
+export async function saveCalibrationThreshold(commander: Commander) {
+  await commander.sendCommand({
+    command: HMK_Command.SAVE_CALIBRATION_THRESHOLD,
+    payload: [],
+  })
+}

src/lib/libhmk/commands/index.ts

@@ -32,6 +32,7 @@ export enum HMK_Command {
   DUPLICATE_PROFILE,
   GET_METADATA,
   GET_SERIAL,
+  SAVE_CALIBRATION_THRESHOLD,
 
   GET_KEYMAP = 128,
   SET_KEYMAP,

src/lib/libhmk/index.ts

@@ -18,7 +18,10 @@ import z from "zod"
 
 export const HMK_FIRMWARE_MIN_VERSION = 0x0104
 export const HMK_FIRMWARE_MAX_VERSION = 0x0107
-export const featureVersionMap = { pollingRateSwitch: 0x0105 } as const
+export const featureVersionMap = {
+  pollingRateSwitch: 0x0105,
+  saveCalibrationThreshold: 0x0107,
+} as const
 export type Feature = keyof typeof featureVersionMap
 
 export const HMK_DEVICE_USAGE_PAGE = 0xffab