fix 5 way switches and scroll wheel rotation behavior

This commit is contained in:
Sadek Baroudi 2023-07-17 07:39:08 -07:00
parent 6160a256dc
commit dfe82c68cd
3 changed files with 33 additions and 17 deletions

View File

@ -39,10 +39,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
#define ENCODERS_PAD_A {GP26}
#define ENCODERS_PAD_B {GP27}
#define ENCODERS_PAD_A {GP27}
#define ENCODERS_PAD_B {GP26}
#define ENCODER_RESOLUTION 1
/* add this back in later
// Override default fingerpunch encoder behavior
#define FP_ENC_0_LAYER_VOLUME 6
#define FP_ENC_0_LAYER_PGUP_PGDN 1
#define FP_ENC_0_LAYER_ZOOM 2
#define FP_ENC_0_LAYER_DPI_POINTING 3
#define FP_ENC_0_LAYER_SUPER_TAB 4
#define FP_ENC_0_LAYER_SUPER_CTRL_TAB 5
#define FP_ENC_0_LAYER_SCROLL_WHEEL 0
#define FP_ENC_0_LAYER_RGB_MODE 7
#define FP_ENC_0_LAYER_RGB_HUE 8
#define FP_ENC_0_LAYER_RGB_SAT 9
#define FP_ENC_0_LAYER_RGB_VAL 10
*/
#ifdef CIRQUE_ENABLE
// cirque trackpad config
#define CIRQUE_PINNACLE_ADDR 0x2A

View File

@ -35,8 +35,8 @@
K20, K21, K22, K23, K24, K25, K55, K54, K53, K52, K51, K50, \
K06, K16, K26, K62, K63, K64, K56, K46, K36, \
K71, K07, K17, K27, K37, K47, K57, K81, \
K72, K76, K73, K82, K86, K83, \
K74, K84 \
K72, K76, K74, K82, K86, K84, \
K73, K83 \
) \
{ \
{ K00, K01, K02, K03, K04, K05, K06, K07 }, \

View File

@ -34,19 +34,20 @@
// -------------------- Encoder config ------------------------
// For reference, layer numbers are defined in sadekbaroudi.h
#define FP_ENC_0_LAYER_VOLUME 0 // default - base layer
#define FP_ENC_0_LAYER_PGUP_PGDN 1
#define FP_ENC_0_LAYER_ZOOM 2
#define FP_ENC_0_LAYER_DPI_POINTING 3
#define FP_ENC_0_LAYER_SUPER_TAB 4 // right - homing thumb layer
#define FP_ENC_0_LAYER_SUPER_CTRL_TAB 6
#define FP_ENC_0_LAYER_SCROLL_WHEEL 7
#define FP_ENC_0_LAYER_RGB_MODE 5 // right - reachy thumb layer
#define FP_ENC_0_LAYER_RGB_HUE 8
#define FP_ENC_0_LAYER_RGB_SAT 9
#define FP_ENC_0_LAYER_RGB_VAL 10
// Override encoder settings for all keyboards except vulpes majora
#if !defined(KEYBOARD_fingerpunch_vulpes_majora_v1)
#define FP_ENC_0_LAYER_VOLUME 0 // default - base layer
#define FP_ENC_0_LAYER_PGUP_PGDN 1
#define FP_ENC_0_LAYER_ZOOM 2
#define FP_ENC_0_LAYER_DPI_POINTING 3
#define FP_ENC_0_LAYER_SUPER_TAB 4 // right - homing thumb layer
#define FP_ENC_0_LAYER_SUPER_CTRL_TAB 6
#define FP_ENC_0_LAYER_SCROLL_WHEEL 7
#define FP_ENC_0_LAYER_RGB_MODE 5 // right - reachy thumb layer
#define FP_ENC_0_LAYER_RGB_HUE 8
#define FP_ENC_0_LAYER_RGB_SAT 9
#define FP_ENC_0_LAYER_RGB_VAL 10
#endif
// override the default for the scroll wheel encoder on the vulpes minora
#if defined(KEYBOARD_fingerpunch_vulpes_minora) && defined(FP_VIK_PERS60_MODULE)