Skip to content

Commit

Permalink
charybdis: fix PWM33XX_CS_PIN defines
Browse files Browse the repository at this point in the history
This is a follow-up of qmk#17613.
  • Loading branch information
Charly Delay committed Jul 23, 2022
1 parent 4b73cea commit 55bd457
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 38 deletions.
8 changes: 2 additions & 6 deletions keyboards/bastardkb/charybdis/3x5/blackpill/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,5 @@
#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4

/* PMW3360 settings. */
#define PMW3360_CS_PIN B14
#define PMW3360_CS_MODE 3
#define PMW3360_CS_DIVISOR 64

/** Improve trackball firmware upload speed at boot. */
#define PMW3360_FIRMWARE_UPLOAD_FAST
#define PMW33XX_CS_PIN B14
#define PMW33XX_CS_DIVISOR 64
3 changes: 0 additions & 3 deletions keyboards/bastardkb/charybdis/3x5/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
/* Set 0 if debouncing isn't needed. */
#define DEBOUNCE 5

/* PMW33XX settings. */
#define PMW33XX_CS_PIN B0

/* Trackball angle adjustment. */
#define ROTATIONAL_TRANSFORM_ANGLE -25

Expand Down
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@
#define RGB_DI_PIN D3

/* PMW3360 settings. */
#define PMW3360_CS_PIN B0
#define PMW33XX_CS_PIN B0
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
#define RGB_DI_PIN D3

/* PMW3360 settings. */
#define PMW3360_CS_PIN F0
#define PMW33XX_CS_PIN F0
6 changes: 3 additions & 3 deletions keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

/* Key matrix configuration. */
#define MATRIX_ROW_PINS \
{ GP26, GP5, GP4, GP9 }
{ GP26, GP5, GP4, GP9 }
#define MATRIX_COL_PINS \
{ GP28, GP15, GP6, GP7, GP8 }
{ GP28, GP15, GP6, GP7, GP8 }

/* Handedness. */
#define MASTER_RIGHT
Expand All @@ -42,7 +42,7 @@
#define SPI_SCK_PIN GP18
#define SPI_MOSI_PIN GP19
#define SPI_MISO_PIN GP20
#define PMW3360_CS_PIN GP14
#define PMW33XX_CS_PIN GP14

/* Reset. */
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
Expand Down
8 changes: 2 additions & 6 deletions keyboards/bastardkb/charybdis/3x6/blackpill/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,5 @@
#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4

/* PMW3360 settings. */
#define PMW3360_CS_PIN B14
#define PMW3360_CS_MODE 3
#define PMW3360_CS_DIVISOR 64

/** Improve trackball firmware upload speed at boot. */
#define PMW3360_FIRMWARE_UPLOAD_FAST
#define PMW33XX_CS_PIN B14
#define PMW33XX_CS_DIVISOR 64
3 changes: 0 additions & 3 deletions keyboards/bastardkb/charybdis/3x6/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
/* Set 0 if debouncing isn't needed. */
#define DEBOUNCE 5

/* PMW33XX settings. */
#define PMW33XX_CS_PIN B0

/* Trackball angle adjustment. */
#define ROTATIONAL_TRANSFORM_ANGLE -25

Expand Down
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
#define RGB_DI_PIN D3

/* PMW3360 settings. */
#define PMW3360_CS_PIN B0
#define PMW33XX_CS_PIN B0
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
#define RGB_DI_PIN D3

/* PMW3360 settings. */
#define PMW3360_CS_PIN F0
#define PMW33XX_CS_PIN F0
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#define SPI_SCK_PIN GP18
#define SPI_MOSI_PIN GP19
#define SPI_MISO_PIN GP20
#define PMW3360_CS_PIN GP14
#define PMW33XX_CS_PIN GP14

/* Reset. */
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
Expand Down
8 changes: 2 additions & 6 deletions keyboards/bastardkb/charybdis/4x6/blackpill/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,5 @@
#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4

/* PMW3360 settings. */
#define PMW3360_CS_PIN B14
#define PMW3360_CS_MODE 3
#define PMW3360_CS_DIVISOR 64

/** Improve trackball firmware upload speed at boot. */
#define PMW3360_FIRMWARE_UPLOAD_FAST
#define PMW33XX_CS_PIN B14
#define PMW33XX_CS_DIVISOR 64
3 changes: 0 additions & 3 deletions keyboards/bastardkb/charybdis/4x6/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
/* Set 0 if debouncing isn't needed. */
#define DEBOUNCE 5

/* PMW33XX settings. */
#define PMW33XX_CS_PIN B0

/* Trackball angle adjustment. */
#define ROTATIONAL_TRANSFORM_ANGLE -25

Expand Down
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@
#define RGB_DI_PIN D3

/* PMW3360 settings. */
#define PMW3360_CS_PIN B0
#define PMW33XX_CS_PIN B0
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
#define RGB_DI_PIN D3

/* PMW3360 settings. */
#define PMW3360_CS_PIN F0
#define PMW33XX_CS_PIN F0
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#define SPI_SCK_PIN GP18
#define SPI_MOSI_PIN GP19
#define SPI_MISO_PIN GP20
#define PMW3360_CS_PIN GP14
#define PMW33XX_CS_PIN GP14

/* Reset. */
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
Expand Down

0 comments on commit 55bd457

Please sign in to comment.