Skip to content

Increased mapping layers from 4 to 8 #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
miwagner1 wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Increased mapping layers from 4 to 8 #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
247852e
Change available remap layers to 12
miwagner1 Apr 8, 2024
687b76f
Update build-nrf52.yml
miwagner1 Apr 8, 2024
afe63bf
Update index.html
miwagner1 Apr 8, 2024
4cfdd16
Max layers tested working is 8
miwagner1 Apr 8, 2024
09fe5ee
Max layers tested working is 8
miwagner1 Apr 8, 2024
ba13c91
Max layers tested working is 8
miwagner1 Apr 8, 2024
6610332
Max layers tested working is 8
miwagner1 Apr 8, 2024
b15da7e
Update build-nrf52.yml
miwagner1 Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config-tool-web/code.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 8;
const NMACROS = 32;
const NEXPRESSIONS = 8;
const MACRO_ITEMS_IN_PACKET = 6;
Expand Down Expand Up @@ -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],
'partial_scroll_timeout': DEFAULT_PARTIAL_SCROLL_TIMEOUT,
'tap_hold_threshold': DEFAULT_TAP_HOLD_THRESHOLD,
'gpio_debounce_time_ms': DEFAULT_GPIO_DEBOUNCE_TIME,
Expand Down
34 changes: 33 additions & 1 deletion config-tool-web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,22 @@ <h1 class="mt-sm-5 mt-3">HID Remapper Configuration</h1>
<input type="checkbox" id="unmapped_passthrough_checkbox3" class="form-check-input">
<label for="unmapped_passthrough_checkbox3" class="form-check-label">3</label>
</div>
<div class="form-check form-check-inline">
<input type="checkbox" id="unmapped_passthrough_checkbox4" class="form-check-input">
<label for="unmapped_passthrough_checkbox4" class="form-check-label">4</label>
</div>
<div class="form-check form-check-inline">
<input type="checkbox" id="unmapped_passthrough_checkbox5" class="form-check-input">
<label for="unmapped_passthrough_checkbox5" class="form-check-label">5</label>
</div>
<div class="form-check form-check-inline">
<input type="checkbox" id="unmapped_passthrough_checkbox6" class="form-check-input">
<label for="unmapped_passthrough_checkbox6" class="form-check-label">6</label>
</div>
<div class="form-check form-check-inline">
<input type="checkbox" id="unmapped_passthrough_checkbox7" class="form-check-input">
<label for="unmapped_passthrough_checkbox7" class="form-check-label">7</label>
</div>
</div>
<div class="row mt-3">
<div class="col-4 text-end">
Expand Down Expand Up @@ -290,7 +306,7 @@ <h1 class="mt-sm-5 mt-3">HID Remapper Configuration</h1>
</div>
<div class="col-3">
<div class="d-flex lh-1 text-center">
<div class="flex-fill row gx-1 justify-content-center">
<div class="flex-fill row gx-1 w-25 justify-content-center">
<div class="col-auto">
<input class="form-check-input layer_checkbox0" type="checkbox" value="">
<br><span class="text-muted small">0</span>
Expand All @@ -307,6 +323,22 @@ <h1 class="mt-sm-5 mt-3">HID Remapper Configuration</h1>
<input class="form-check-input layer_checkbox3" type="checkbox" value="">
<br><span class="text-muted small">3</span>
</div>
<div class="col-auto">
<input class="form-check-input layer_checkbox4" type="checkbox" value="">
<br><span class="text-muted small">4</span>
</div>
<div class="col-auto">
<input class="form-check-input layer_checkbox5" type="checkbox" value="">
<br><span class="text-muted small">5</span>
</div>
<div class="col-auto">
<input class="form-check-input layer_checkbox6" type="checkbox" value="">
<br><span class="text-muted small">6</span>
</div>
<div class="col-auto">
<input class="form-check-input layer_checkbox7" type="checkbox" value="">
<br><span class="text-muted small">7</span>
</div>
</div>
<div class="row gx-1">
<div class="col-auto ms-1" title="Sticky">
Expand Down
4 changes: 4 additions & 0 deletions config-tool-web/usages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,10 @@ 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' },
"0xfff20001": { 'name': 'Macro 1', 'class': 'other' },
"0xfff20002": { 'name': 'Macro 2', 'class': 'other' },
"0xfff20003": { 'name': 'Macro 3', 'class': 'other' },
Expand Down
2 changes: 1 addition & 1 deletion firmware/src/remapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 8;
const uint32_t LAYERS_USAGE_PAGE = 0xFFF10000;
const uint32_t MACRO_USAGE_PAGE = 0xFFF20000;
const uint32_t EXPR_USAGE_PAGE = 0xFFF30000;
Expand Down