From 247852e5a71bd953908a3da4daad4c3cf5495843 Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Mon, 8 Apr 2024 13:04:00 -0500 Subject: [PATCH 1/8] Change available remap layers to 12 Change available remap layers to 12 --- config-tool-web/code.js | 4 +-- config-tool-web/index.html | 64 ++++++++++++++++++++++++++++++++++++++ config-tool-web/usages.js | 8 +++++ firmware/src/remapper.cc | 2 +- 4 files changed, 75 insertions(+), 3 deletions(-) diff --git a/config-tool-web/code.js b/config-tool-web/code.js index c8997f42..9fc063ab 100644 --- a/config-tool-web/code.js +++ b/config-tool-web/code.js @@ -17,7 +17,7 @@ const DEFAULT_GPIO_DEBOUNCE_TIME = 5; const DEFAULT_SCALING = 1000; const DEFAULT_MACRO_ENTRY_DURATION = 1; -const NLAYERS = 4; +const NLAYERS = 12; const NMACROS = 32; const NEXPRESSIONS = 8; const MACRO_ITEMS_IN_PACKET = 6; @@ -102,7 +102,7 @@ let target_modal = null; let extra_usages = { 'source': [], 'target': [] }; let config = { 'version': CONFIG_VERSION, - 'unmapped_passthrough_layers': [0, 1, 2, 3], + 'unmapped_passthrough_layers': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], 'partial_scroll_timeout': DEFAULT_PARTIAL_SCROLL_TIMEOUT, 'tap_hold_threshold': DEFAULT_TAP_HOLD_THRESHOLD, 'gpio_debounce_time_ms': DEFAULT_GPIO_DEBOUNCE_TIME, diff --git a/config-tool-web/index.html b/config-tool-web/index.html index 0ea63783..4bdde35c 100644 --- a/config-tool-web/index.html +++ b/config-tool-web/index.html @@ -91,6 +91,38 @@

HID Remapper Configuration

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
@@ -307,6 +339,38 @@

HID Remapper Configuration


3
+
+ +
4 +
+
+ +
5 +
+
+ +
6 +
+
+ +
7 +
+
+ +
8 +
+
+ +
9 +
+
+ +
10 +
+
+ +
11 +
diff --git a/config-tool-web/usages.js b/config-tool-web/usages.js index 37c4c869..45f1436c 100644 --- a/config-tool-web/usages.js +++ b/config-tool-web/usages.js @@ -436,6 +436,14 @@ const common_target_usages = { "0xfff10001": { 'name': 'Layer 1', 'class': 'other' }, "0xfff10002": { 'name': 'Layer 2', 'class': 'other' }, "0xfff10003": { 'name': 'Layer 3', 'class': 'other' }, + "0xfff10004": { 'name': 'Layer 4', 'class': 'other' }, + "0xfff10005": { 'name': 'Layer 5', 'class': 'other' }, + "0xfff10006": { 'name': 'Layer 6', 'class': 'other' }, + "0xfff10007": { 'name': 'Layer 7', 'class': 'other' }, + "0xfff10008": { 'name': 'Layer 8', 'class': 'other' }, + "0xfff10009": { 'name': 'Layer 9', 'class': 'other' }, + "0xfff1000a": { 'name': 'Layer 10', 'class': 'other' }, + "0xfff1000b": { 'name': 'Layer 11', 'class': 'other' }, "0xfff20001": { 'name': 'Macro 1', 'class': 'other' }, "0xfff20002": { 'name': 'Macro 2', 'class': 'other' }, "0xfff20003": { 'name': 'Macro 3', 'class': 'other' }, diff --git a/firmware/src/remapper.cc b/firmware/src/remapper.cc index 04de994d..8dc8e97b 100644 --- a/firmware/src/remapper.cc +++ b/firmware/src/remapper.cc @@ -28,7 +28,7 @@ const uint8_t H_RESOLUTION_BITMASK = (1 << 2); const uint32_t V_SCROLL_USAGE = 0x00010038; const uint32_t H_SCROLL_USAGE = 0x000C0238; -const uint8_t NLAYERS = 4; +const uint8_t NLAYERS = 12; const uint32_t LAYERS_USAGE_PAGE = 0xFFF10000; const uint32_t MACRO_USAGE_PAGE = 0xFFF20000; const uint32_t EXPR_USAGE_PAGE = 0xFFF30000; From 687b76f09d920c5d86f554b99986ba0b01a67329 Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Mon, 8 Apr 2024 13:28:21 -0500 Subject: [PATCH 2/8] Update build-nrf52.yml --- .github/workflows/build-nrf52.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-nrf52.yml b/.github/workflows/build-nrf52.yml index a891ef1a..27580a8f 100644 --- a/.github/workflows/build-nrf52.yml +++ b/.github/workflows/build-nrf52.yml @@ -1,6 +1,6 @@ name: build-nrf52 on: - push: + workflow_dispatch: paths: - 'firmware/**' - 'firmware-bluetooth/**' From afe63bfbcbc6acbc3662c70ef61f54af445ad8f8 Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Mon, 8 Apr 2024 14:58:10 -0500 Subject: [PATCH 3/8] Update index.html Fix display of layer mappings in browser --- config-tool-web/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-tool-web/index.html b/config-tool-web/index.html index 4bdde35c..7d1bc8eb 100644 --- a/config-tool-web/index.html +++ b/config-tool-web/index.html @@ -322,7 +322,7 @@

HID Remapper Configuration

-
+

0 From 4cfdd16e95bfc415eafefd5e74b126b209eb6e6c Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Mon, 8 Apr 2024 15:18:07 -0500 Subject: [PATCH 4/8] Max layers tested working is 8 Max layers tested working is 8 --- config-tool-web/code.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config-tool-web/code.js b/config-tool-web/code.js index 9fc063ab..b81b5af7 100644 --- a/config-tool-web/code.js +++ b/config-tool-web/code.js @@ -17,7 +17,7 @@ const DEFAULT_GPIO_DEBOUNCE_TIME = 5; const DEFAULT_SCALING = 1000; const DEFAULT_MACRO_ENTRY_DURATION = 1; -const NLAYERS = 12; +const NLAYERS = 8; const NMACROS = 32; const NEXPRESSIONS = 8; const MACRO_ITEMS_IN_PACKET = 6; @@ -102,7 +102,7 @@ let target_modal = null; let extra_usages = { 'source': [], 'target': [] }; let config = { 'version': CONFIG_VERSION, - 'unmapped_passthrough_layers': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], + 'unmapped_passthrough_layers': [0, 1, 2, 3, 4, 5, 6, 7, 8], 'partial_scroll_timeout': DEFAULT_PARTIAL_SCROLL_TIMEOUT, 'tap_hold_threshold': DEFAULT_TAP_HOLD_THRESHOLD, 'gpio_debounce_time_ms': DEFAULT_GPIO_DEBOUNCE_TIME, From 09fe5ee029456b6680be9a6703aa0c3bab24f3b2 Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Mon, 8 Apr 2024 15:19:49 -0500 Subject: [PATCH 5/8] Max layers tested working is 8 Max layers tested working is 8 --- config-tool-web/index.html | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/config-tool-web/index.html b/config-tool-web/index.html index 7d1bc8eb..934cbd3a 100644 --- a/config-tool-web/index.html +++ b/config-tool-web/index.html @@ -107,22 +107,6 @@

HID Remapper Configuration

-
- - -
-
- - -
-
- - -
-
- - -
@@ -355,22 +339,6 @@

HID Remapper Configuration


7
-
- -
8 -
-
- -
9 -
-
- -
10 -
-
- -
11 -
From ba13c91fbcb9849b6d394bcb889c7d12f11467a5 Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Mon, 8 Apr 2024 15:27:09 -0500 Subject: [PATCH 6/8] Max layers tested working is 8 Max layers tested working is 8 --- config-tool-web/usages.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/config-tool-web/usages.js b/config-tool-web/usages.js index 45f1436c..a7ea084c 100644 --- a/config-tool-web/usages.js +++ b/config-tool-web/usages.js @@ -439,11 +439,7 @@ const common_target_usages = { "0xfff10004": { 'name': 'Layer 4', 'class': 'other' }, "0xfff10005": { 'name': 'Layer 5', 'class': 'other' }, "0xfff10006": { 'name': 'Layer 6', 'class': 'other' }, - "0xfff10007": { 'name': 'Layer 7', 'class': 'other' }, - "0xfff10008": { 'name': 'Layer 8', 'class': 'other' }, - "0xfff10009": { 'name': 'Layer 9', 'class': 'other' }, - "0xfff1000a": { 'name': 'Layer 10', 'class': 'other' }, - "0xfff1000b": { 'name': 'Layer 11', 'class': 'other' }, + "0xfff10007": { 'name': 'Layer 7', 'class': 'other' }, "0xfff20001": { 'name': 'Macro 1', 'class': 'other' }, "0xfff20002": { 'name': 'Macro 2', 'class': 'other' }, "0xfff20003": { 'name': 'Macro 3', 'class': 'other' }, From 66103325b7e49c84280a7cd1dad1ace3e3ad01b1 Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Mon, 8 Apr 2024 15:29:46 -0500 Subject: [PATCH 7/8] Max layers tested working is 8 Max layers tested working is 8 --- firmware/src/remapper.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/src/remapper.cc b/firmware/src/remapper.cc index 8dc8e97b..1abe9c8f 100644 --- a/firmware/src/remapper.cc +++ b/firmware/src/remapper.cc @@ -28,7 +28,7 @@ const uint8_t H_RESOLUTION_BITMASK = (1 << 2); const uint32_t V_SCROLL_USAGE = 0x00010038; const uint32_t H_SCROLL_USAGE = 0x000C0238; -const uint8_t NLAYERS = 12; +const uint8_t NLAYERS = 8; const uint32_t LAYERS_USAGE_PAGE = 0xFFF10000; const uint32_t MACRO_USAGE_PAGE = 0xFFF20000; const uint32_t EXPR_USAGE_PAGE = 0xFFF30000; From b15da7e07e72a6fc1b764de7f9291c5208c72178 Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Mon, 8 Apr 2024 15:46:15 -0500 Subject: [PATCH 8/8] Update build-nrf52.yml --- .github/workflows/build-nrf52.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-nrf52.yml b/.github/workflows/build-nrf52.yml index 27580a8f..a891ef1a 100644 --- a/.github/workflows/build-nrf52.yml +++ b/.github/workflows/build-nrf52.yml @@ -1,6 +1,6 @@ name: build-nrf52 on: - workflow_dispatch: + push: paths: - 'firmware/**' - 'firmware-bluetooth/**'