Override custom keycode list if the keyboard uses BMP

remap-keys · Nov 2, 2023 · fbdb415 · fbdb415
1 parent 4f1ce64
commit fbdb415
Showing 1 changed file with 29 additions and 9 deletions.
diff --git a/src/actions/hid.action.ts b/src/actions/hid.action.ts
@@ -25,6 +25,7 @@ import { LayoutOption } from '../components/configure/keymap/Keymap';
 import { maxValueByBitLength } from '../utils/NumberUtils';
 import { KeyOp } from '../gen/types/KeyboardDefinition';
 import { getEncoderIdList } from './utils';
+import { bmpKeyInfoList } from '../services/hid/KeycodeInfoListBmp';
 
 const PRODUCT_PREFIX_FOR_BLE_MICRO_PRO = '(BMP)';
 
@@ -290,13 +291,32 @@ export const hidActionsThunk = {
         product_id: keyboard.getInformation().productId,
         product_name: keyboard.getInformation().productName,
       });
-      dispatch(
-        HidActions.updateBleMicroPro(
-          keyboard
-            .getInformation()
-            .productName.includes(PRODUCT_PREFIX_FOR_BLE_MICRO_PRO)
-        )
-      );
+
+      const isBleMicroPro = keyboard
+        .getInformation()
+        .productName.includes(PRODUCT_PREFIX_FOR_BLE_MICRO_PRO);
+
+      // Override custom keycode list if the keyboard uses BLE Micro Pro
+      const customKeycodes = !isBleMicroPro
+        ? entities.keyboardDefinition?.customKeycodes
+        : bmpKeyInfoList.map((k) => {
+            return {
+              name: k.keycodeInfo.name.long,
+              title: k.desc,
+              shortName: k.keycodeInfo.name.short,
+            };
+          });
+
+      if (isBleMicroPro) {
+        dispatch(HidActions.updateBleMicroPro(isBleMicroPro));
+        dispatch(
+          StorageActions.updateKeyboardDefinition({
+            ...entities.keyboardDefinition,
+            customKeycodes: customKeycodes,
+          })
+        );
+      }
+
       const viaProtocolVersionResult = await keyboard.fetchViaProtocolVersion();
       if (!viaProtocolVersionResult.success) {
         dispatch(
@@ -338,15 +358,15 @@ export const hidActionsThunk = {
         entities.keyboardDefinition!.matrix.rows,
         entities.keyboardDefinition!.matrix.cols,
         app.labelLang,
-        entities.keyboardDefinition!.customKeycodes
+        customKeycodes
       );
       dispatch(HidActions.updateKeymaps(keymaps));
       const encodersKeymaps: IEncoderKeymaps[] = await loadEncodersKeymap(
         dispatch,
         keyboard,
         layerCount,
         app.labelLang,
-        entities.keyboardDefinition!.customKeycodes,
+        customKeycodes,
         entities.keyboardDefinition!.layouts.keymap,
         viaProtocolVersion
       );