Skip to content
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

Move SPLIT_HAND_PIN setup to split_pre_init #17271

Merged
merged 3 commits into from
Jun 6, 2022
Merged

Move SPLIT_HAND_PIN setup to split_pre_init #17271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82be357
Move SPLIT_HAND_PIN setup to split_pre_init
daskygit May 31, 2022
92380f1
doppelganger should use old behaviour
daskygit Jun 5, 2022
f5a8f18
Add comment for future
daskygit Jun 6, 2022
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
36 changes: 21 additions & 15 deletions keyboards/doppelganger/doppelganger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,31 @@
*/
#include "doppelganger.h"

void keyboard_pre_init_kb (void) {
setPinOutput(C6);
setPinOutput(B0);
void keyboard_pre_init_kb(void) {
setPinOutput(C6);
setPinOutput(B0);
}

bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
// writePin sets the pin high for 1 and low for 0.
// In this example the pins are inverted, setting
// it low/0 turns it on, and high/1 turns the LED off.
// This behavior depends on whether the LED is between the pin
// and VCC or the pin and GND.
writePin(C6, !led_state.caps_lock);
}
return res;
bool res = led_update_user(led_state);
if (res) {
// writePin sets the pin high for 1 and low for 0.
// In this example the pins are inverted, setting
// it low/0 turns it on, and high/1 turns the LED off.
// This behavior depends on whether the LED is between the pin
// and VCC or the pin and GND.
writePin(C6, !led_state.caps_lock);
}
return res;
}

__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
writePin(B0, !(state & (1UL << 1)));
return state;
writePin(B0, !(state & (1UL << 1)));
return state;
}

// Override core logic as we reuse SPLIT_HAND_PIN within matrix pins
bool is_keyboard_left(void) {
daskygit marked this conversation as resolved.
Show resolved Hide resolved
setPinInput(SPLIT_HAND_PIN);
return readPin(SPLIT_HAND_PIN);
}
5 changes: 4 additions & 1 deletion quantum/split_common/split_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ static uint8_t peek_matrix_intersection(pin_t out_pin, pin_t in_pin) {
__attribute__((weak)) bool is_keyboard_left(void) {
#if defined(SPLIT_HAND_PIN)
// Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand
setPinInput(SPLIT_HAND_PIN);
# ifdef SPLIT_HAND_PIN_LOW_IS_LEFT
return !readPin(SPLIT_HAND_PIN);
# else
Expand Down Expand Up @@ -132,6 +131,10 @@ __attribute__((weak)) bool is_keyboard_master(void) {

// this code runs before the keyboard is fully initialized
void split_pre_init(void) {
#if defined(SPLIT_HAND_PIN)
setPinInput(SPLIT_HAND_PIN);
wait_us(100);
#endif
isLeftHand = is_keyboard_left();

#if defined(RGBLIGHT_ENABLE) && defined(RGBLED_SPLIT)
Expand Down