Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Move SPLIT_HAND_PIN setup to split_pre_init (#17271)

Browse source 
* Move SPLIT_HAND_PIN setup to split_pre_init

* doppelganger should use old behaviour

* Add comment for future

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
This commit is contained in:
Dasky 2022-06-06 01:33:32 +01:00 • committed by GitHub
commit 85b3b98570
Failed to generate hash of commit
2 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
keyboards/doppelganger/doppelganger.c
View file

@ -15,25 +15,31 @@
*/ */
#include "doppelganger.h" #include "doppelganger.h"
void keyboard_pre_init_kb (void) { void keyboard_pre_init_kb(void) {
setPinOutput(C6); setPinOutput(C6);
setPinOutput(B0); setPinOutput(B0);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state); bool res = led_update_user(led_state);
if(res) { if (res) {
// writePin sets the pin high for 1 and low for 0. // writePin sets the pin high for 1 and low for 0.
// In this example the pins are inverted, setting // In this example the pins are inverted, setting
// it low/0 turns it on, and high/1 turns the LED off. // it low/0 turns it on, and high/1 turns the LED off.
// This behavior depends on whether the LED is between the pin // This behavior depends on whether the LED is between the pin
// and VCC or the pin and GND. // and VCC or the pin and GND.
writePin(C6, !led_state.caps_lock); writePin(C6, !led_state.caps_lock);
} }
return res; return res;
} }
__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
writePin(B0, !(state & (1UL << 1))); writePin(B0, !(state & (1UL << 1)));
return state; return state;
}
// Override core logic as we reuse SPLIT_HAND_PIN within matrix pins
bool is_keyboard_left(void) {
setPinInput(SPLIT_HAND_PIN);
return readPin(SPLIT_HAND_PIN);
} }

5
quantum/split_common/split_util.c
View file

@ -94,7 +94,6 @@ static uint8_t peek_matrix_intersection(pin_t out_pin, pin_t in_pin) {
__attribute__((weak)) bool is_keyboard_left(void) { __attribute__((weak)) bool is_keyboard_left(void) {
#if defined(SPLIT_HAND_PIN) #if defined(SPLIT_HAND_PIN)
// Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand // 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 # ifdef SPLIT_HAND_PIN_LOW_IS_LEFT
return !readPin(SPLIT_HAND_PIN); return !readPin(SPLIT_HAND_PIN);
# else # else
@ -133,6 +132,10 @@ __attribute__((weak)) bool is_keyboard_master(void) {
// this code runs before the keyboard is fully initialized // this code runs before the keyboard is fully initialized
void split_pre_init(void) { void split_pre_init(void) {
#if defined(SPLIT_HAND_PIN)
setPinInput(SPLIT_HAND_PIN);
wait_us(100);
#endif
isLeftHand = is_keyboard_left(); isLeftHand = is_keyboard_left();
#if defined(RGBLIGHT_ENABLE) && defined(RGBLED_SPLIT) #if defined(RGBLIGHT_ENABLE) && defined(RGBLED_SPLIT)