Skip to content

Commit 54a160d

Browse files
committed
Swap bindings for bootloader and config modes
1 parent c8ff9b8 commit 54a160d

16 files changed

Lines changed: 17 additions & 16 deletions

File tree

HAL/avr/avr_nousb/include/config_defaults.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ const Config default_config = {
116116
},
117117
.has_project_m_options = true,
118118
.project_m_options = {
119-
.true_z_press = false,
119+
.true_z_press = true,
120120
.disable_ledgedash_socd_override = false,
121121
.has_custom_airdodge = false,
122122
.custom_airdodge = { .x = 0, .y = 0 },

HAL/avr/avr_usb/include/config_defaults.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ const Config default_config = {
169169
},
170170
.has_project_m_options = true,
171171
.project_m_options = {
172-
.true_z_press = false,
172+
.true_z_press = true,
173173
.disable_ledgedash_socd_override = false,
174174
.has_custom_airdodge = false,
175175
.custom_airdodge = { .x = 0, .y = 0 },

HAL/pico/include/config_defaults.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ const Config default_config = {
126126
CommunicationBackendConfig {
127127
.backend_id = COMMS_BACKEND_N64,
128128
.default_mode_config = 1,
129+
.activation_binding = { BTN_RT3 },
129130
},
130131
CommunicationBackendConfig {
131132
.backend_id = COMMS_BACKEND_NES,
@@ -142,7 +143,7 @@ const Config default_config = {
142143
CommunicationBackendConfig {
143144
.backend_id = COMMS_BACKEND_CONFIGURATOR,
144145
.activation_binding_count = 1,
145-
.activation_binding = { BTN_RT2 },
146+
.activation_binding = { BTN_MB1 },
146147
}
147148
},
148149
.keyboard_modes_count = 1,

config/arduino/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void setup() {
6868
gpio_input.UpdateInputs(inputs);
6969

7070
// Check bootloader button hold as early as possible for safety.
71-
if (inputs.mb1) {
71+
if (inputs.rt2) {
7272
Serial.begin(115200);
7373
reboot_bootloader();
7474
}

config/b0xx_r1/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void setup() {
6868
gpio_input.UpdateInputs(inputs);
6969

7070
// Check bootloader button hold as early as possible for safety.
71-
if (inputs.mb1) {
71+
if (inputs.rt2) {
7272
Serial.begin(115200);
7373
reboot_bootloader();
7474
}

config/b0xx_r2/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void setup() {
7070
gpio_input.UpdateInputs(inputs);
7171

7272
// Check bootloader button hold as early as possible for safety.
73-
if (inputs.mb1) {
73+
if (inputs.rt2) {
7474
Serial.begin(115200);
7575
reboot_bootloader();
7676
}

config/b0xx_r4/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void setup() {
6969
gpio_input.UpdateInputs(inputs);
7070

7171
// Check bootsel button hold as early as possible for safety.
72-
if (inputs.mb1) {
72+
if (inputs.rt2) {
7373
reboot_bootloader();
7474
}
7575

config/c53/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void setup() {
5353
matrix_input.UpdateInputs(inputs);
5454

5555
// Bootsel button hold as early as possible for safety.
56-
if (inputs.mb1) {
56+
if (inputs.rt2) {
5757
reboot_bootloader();
5858
}
5959

config/gccmx/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void setup() {
6767
gpio_input.UpdateInputs(inputs);
6868

6969
// Check bootloader button hold as early as possible for safety.
70-
if (inputs.mb1) {
70+
if (inputs.rt2) {
7171
Serial.begin(115200);
7272
reboot_bootloader();
7373
}

config/gccpcb1/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void setup() {
6565
gpio_input.UpdateInputs(inputs);
6666

6767
// Check bootloader button hold as early as possible for safety.
68-
if (inputs.mb1) {
68+
if (inputs.rt2) {
6969
Serial.begin(115200);
7070
reboot_bootloader();
7171
}

0 commit comments

Comments
 (0)