ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Core] PMW33XX drivers overhaul (#17613)

Browse source 
* PMW33XX drivers overhaul

This combines the PMW3389 and PM3360 drivers as they only differ in the
firmware blobs and CPI get and set functions. The following changes have
been made:

* PMW3389 now gets the same multi-sensor feature that is already available on the
  PMW3360.

* Introduced a shared pmw33xx_report_t struct is now directly readable via SPI
  transactions instead of individual byte-sized reads, saving multiple
  copies and bitshift operations.

* pmw33(89/60)_get_report functions had unreachable branches in their motion
  detection logic these have been simplied as much as possible.

* The fast firmware upload option has been removed as this becomes obsolete by
  the newly introduced polled waiting functions for ChibiOS polled waiting

* PMW33(60/89)_SPI_LSBFIRST and PMW33(60/89)_SPI_MODE config options
  have been removed as they don't need to be configurable.

* All PMW3389 and PMW3360 defines have been unified to a PMW33XX prefix
  to reduce code duplication and make the defines interchangeable

* Adjust keyboards to PMW33XX naming scheme
This commit is contained in:
Stefan Kerkmann 2022-07-14 11:50:00 +02:00 • committed by GitHub
parent 82685fc2ac
commit 3c58f98929
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 1179 additions and 1456 deletions
Download patch file Download diff file Expand all files Collapse all files

4
keyboards/bastardkb/charybdis/3x5/config.h
View file

@ -58,8 +58,8 @@
/* Set 0 if debouncing isn't needed. */
#define DEBOUNCE 5
/* PMW3360 settings. */
#define PMW3360_CS_PIN B0
/* PMW33XX settings. */
#define PMW33XX_CS_PIN B0
// Trackball angle adjustment.
#define ROTATIONAL_TRANSFORM_ANGLE -25

6
keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
View file

@ -98,10 +98,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define EXTERNAL_EEPROM_ADDRESS_SIZE 2
/* pmw3360 config */
#undef PMW3360_CS_PIN
#define PMW3360_CS_PIN B0
#define PMW3360_SPI_MODE 3
#define PMW3360_SPI_DIVISOR 64
#undef PMW33XX_CS_PIN
#define PMW33XX_CS_PIN B0
#define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200
#define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 400

4
keyboards/bastardkb/charybdis/4x6/config.h
View file

@ -60,8 +60,8 @@
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
/* PMW3360 settings. */
#define PMW3360_CS_PIN B0
/* PMW33XX settings. */
#define PMW33XX_CS_PIN B0
#define RGB_DI_PIN D3
#define RGBLED_NUM 56

8
keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
View file

@ -87,11 +87,9 @@
#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 64
#undef PMW3360_CS_PIN
#define PMW3360_CS_PIN A15 // b14
#define PMW3360_CS_MODE 3
#define PMW3360_CS_DIVISOR 64
#define PMW3360_LIFTOFF_DISTANCE 0b1111
#undef PMW33XX_CS_PIN
#define PMW33XX_CS_PIN A15 // b14
#define PMW33XX_LIFTOFF_DISTANCE 0b1111
#undef ROTATIONAL_TRANSFORM_ANGLE
#define ROTATIONAL_TRANSFORM_ANGLE -65

2
keyboards/bbrfkr/dynamis/config.h
View file

@ -52,5 +52,5 @@
#define ENCODERS_PAD_A { B7 }
#define ENCODERS_PAD_B { E6 }
#define PMW3360_CS_PIN SPI_SS_PIN
#define PMW33XX_CS_PIN SPI_SS_PIN
#define POINTING_DEVICE_INVERT_Y

4
keyboards/handwired/tractyl_manuform/4x6_right/config.h
View file

@ -85,7 +85,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
/* PMW3360 Settings */
#define PMW3360_CS_PIN B0
/* PMW33XX Settings */
#define PMW33XX_CS_PIN B0
#define POINTING_DEVICE_RIGHT

2
keyboards/handwired/tractyl_manuform/4x6_right/info.json
View file

@ -3,7 +3,7 @@
"url": "",
"maintainer": "drashna",
"layouts": {
"LAYOUT_5x6_right": {
"LAYOUT_4x6_right": {
"layout": [
{"label":"L00", "x":0, "y":0},
{"label":"L01", "x":1, "y":0},

4
keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
View file

@ -47,5 +47,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define ENCODERS_PAD_B \
{ C7 }
/* PMW3360 Settings */
#define PMW3360_CS_PIN B6
/* PMW33XX Settings */
#define PMW33XX_CS_PIN B6

5
keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
View file

@ -99,6 +99,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define DEBUG_EEPROM_OUTPUT
/* pmw3360 config */
#define PMW3360_CS_PIN B9
#define PMW3360_SPI_MODE 3
#define PMW3360_SPI_DIVISOR 8
#define PMW33XX_CS_PIN B9
#define PMW33XX_SPI_DIVISOR 8

5
keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
View file

@ -102,7 +102,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 64
/* pmw3360 config */
#define PMW3360_CS_PIN B0
#define PMW3360_SPI_MODE 3
#define PMW3360_SPI_DIVISOR 64
#define PMW3360_FIRMWARE_UPLOAD_FAST
#define PMW33XX_CS_PIN B0

4
keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
View file

@ -51,5 +51,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define ENCODERS_PAD_B \
{ D4 }
/* PMW3360 Settings */
#define PMW3360_CS_PIN B0
/* PMW33XX Settings */
#define PMW33XX_CS_PIN B0

2
keyboards/oddball/config.h
View file

@ -56,4 +56,4 @@
// #define BOOTMAGIC_LITE_COLUMN 0
#define ADNS9800_CS_PIN SPI_SS_PIN
#define PMW3360_CS_PIN SPI_SS_PIN
#define PMW33XX_CS_PIN SPI_SS_PIN

4
keyboards/ploopyco/mouse/config.h
View file

@ -77,5 +77,5 @@
// #define DEBUG_LED_PIN F7
/* PMW3360 Settings */
#define PMW3360_CS_PIN B0
/* PMW33XX Settings */
#define PMW33XX_CS_PIN B0

4
keyboards/ploopyco/trackball/config.h
View file

@ -53,6 +53,6 @@
// If board has a debug LED, you can enable it by defining this
// #define DEBUG_LED_PIN F7
/* PMW3360 Settings */
#define PMW3360_CS_PIN B0
/* PMW33XX Settings */
#define PMW33XX_CS_PIN B0
#define POINTING_DEVICE_INVERT_Y