mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-05 01:15:19 +00:00
Compare commits
3 Commits
153bcdcd8d
...
d6ce42ae5b
Author | SHA1 | Date | |
---|---|---|---|
|
d6ce42ae5b | ||
|
67dae1222f | ||
|
8d0f97d110 |
2
.github/workflows/stale.yml
vendored
2
.github/workflows/stale.yml
vendored
@ -13,7 +13,7 @@ jobs:
|
|||||||
stale:
|
stale:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/stale@v7
|
- uses: actions/stale@v8
|
||||||
with:
|
with:
|
||||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
@ -22,8 +22,8 @@ POINTING_DEVICE_DRIVER = adns5050
|
|||||||
|
|
||||||
The ADNS 5050 sensor uses a serial type protocol for communication, and requires an additional light source.
|
The ADNS 5050 sensor uses a serial type protocol for communication, and requires an additional light source.
|
||||||
|
|
||||||
| Setting | Description | Default |
|
| Setting (`config.h`) | Description | Default |
|
||||||
| ------------------- | ------------------------------------------------------------------ | -------------------------- |
|
| -------------------- | ------------------------------------------------------------------ | -------------------------- |
|
||||||
| `ADNS5050_SCLK_PIN` | (Required) The pin connected to the clock pin of the sensor. | `POINTING_DEVICE_SCLK_PIN` |
|
| `ADNS5050_SCLK_PIN` | (Required) The pin connected to the clock pin of the sensor. | `POINTING_DEVICE_SCLK_PIN` |
|
||||||
| `ADNS5050_SDIO_PIN` | (Required) The pin connected to the data pin of the sensor. | `POINTING_DEVICE_SDIO_PIN` |
|
| `ADNS5050_SDIO_PIN` | (Required) The pin connected to the data pin of the sensor. | `POINTING_DEVICE_SDIO_PIN` |
|
||||||
| `ADNS5050_CS_PIN` | (Required) The pin connected to the Chip Select pin of the sensor. | `POINTING_DEVICE_CS_PIN` |
|
| `ADNS5050_CS_PIN` | (Required) The pin connected to the Chip Select pin of the sensor. | `POINTING_DEVICE_CS_PIN` |
|
||||||
@ -42,7 +42,7 @@ POINTING_DEVICE_DRIVER = adns9800
|
|||||||
|
|
||||||
The ADNS 9800 is an SPI driven optical sensor, that uses laser output for surface tracking.
|
The ADNS 9800 is an SPI driven optical sensor, that uses laser output for surface tracking.
|
||||||
|
|
||||||
| Setting | Description | Default |
|
| Setting (`config.h`) | Description | Default |
|
||||||
| ----------------------- | ---------------------------------------------------------------------- | ------------------------ |
|
| ----------------------- | ---------------------------------------------------------------------- | ------------------------ |
|
||||||
| `ADNS9800_CLOCK_SPEED` | (Optional) Sets the clock speed that the sensor runs at. | `2000000` |
|
| `ADNS9800_CLOCK_SPEED` | (Optional) Sets the clock speed that the sensor runs at. | `2000000` |
|
||||||
| `ADNS9800_SPI_LSBFIRST` | (Optional) Sets the Least/Most Significant Byte First setting for SPI. | `false` |
|
| `ADNS9800_SPI_LSBFIRST` | (Optional) Sets the Least/Most Significant Byte First setting for SPI. | `false` |
|
||||||
@ -63,7 +63,7 @@ POINTING_DEVICE_DRIVER = analog_joystick
|
|||||||
|
|
||||||
The Analog Joystick is an analog (ADC) driven sensor. There are a variety of joysticks that you can use for this.
|
The Analog Joystick is an analog (ADC) driven sensor. There are a variety of joysticks that you can use for this.
|
||||||
|
|
||||||
| Setting | Description | Default |
|
| Setting (`config.h`) | Description | Default |
|
||||||
| --------------------------------- | -------------------------------------------------------------------------- | ------------- |
|
| --------------------------------- | -------------------------------------------------------------------------- | ------------- |
|
||||||
| `ANALOG_JOYSTICK_X_AXIS_PIN` | (Required) The pin used for the vertical/X axis. | _not defined_ |
|
| `ANALOG_JOYSTICK_X_AXIS_PIN` | (Required) The pin used for the vertical/X axis. | _not defined_ |
|
||||||
| `ANALOG_JOYSTICK_Y_AXIS_PIN` | (Required) The pin used for the horizontal/Y axis. | _not defined_ |
|
| `ANALOG_JOYSTICK_Y_AXIS_PIN` | (Required) The pin used for the horizontal/Y axis. | _not defined_ |
|
||||||
@ -153,7 +153,7 @@ Additionally, `POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE` is supported in thi
|
|||||||
|
|
||||||
#### Relative mode gestures
|
#### Relative mode gestures
|
||||||
|
|
||||||
| Gesture Setting | Description | Default |
|
| Gesture Setting (`config.h`) | Description | Default |
|
||||||
| -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
|
| -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
|
||||||
| `CIRQUE_PINNACLE_TAP_ENABLE` | (Optional) Enable tap to "left click". Works on both sides of a split keyboard. | _not defined_ |
|
| `CIRQUE_PINNACLE_TAP_ENABLE` | (Optional) Enable tap to "left click". Works on both sides of a split keyboard. | _not defined_ |
|
||||||
| `CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE` | (Optional) Tap in upper right corner (half of the finger needs to be outside of the trackpad) of the trackpad will result in "right click". `CIRQUE_PINNACLE_TAP_ENABLE` must be enabled. | _not defined_ |
|
| `CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE` | (Optional) Tap in upper right corner (half of the finger needs to be outside of the trackpad) of the trackpad will result in "right click". `CIRQUE_PINNACLE_TAP_ENABLE` must be enabled. | _not defined_ |
|
||||||
@ -172,8 +172,8 @@ POINTING_DEVICE_DRIVER = paw3204
|
|||||||
|
|
||||||
The paw 3204 sensor uses a serial type protocol for communication, and requires an additional light source.
|
The paw 3204 sensor uses a serial type protocol for communication, and requires an additional light source.
|
||||||
|
|
||||||
| Setting | Description | Default |
|
| Setting (`config.h`) | Description | Default |
|
||||||
| ------------------ |--------------------------------------------------------------- | -------------------------- |
|
| -------------------- |--------------------------------------------------------------- | -------------------------- |
|
||||||
| `PAW3204_SCLK_PIN` | (Required) The pin connected to the clock pin of the sensor. | `POINTING_DEVICE_SCLK_PIN` |
|
| `PAW3204_SCLK_PIN` | (Required) The pin connected to the clock pin of the sensor. | `POINTING_DEVICE_SCLK_PIN` |
|
||||||
| `PAW3204_SDIO_PIN` | (Required) The pin connected to the data pin of the sensor. | `POINTING_DEVICE_SDIO_PIN` |
|
| `PAW3204_SDIO_PIN` | (Required) The pin connected to the data pin of the sensor. | `POINTING_DEVICE_SDIO_PIN` |
|
||||||
|
|
||||||
@ -189,7 +189,7 @@ POINTING_DEVICE_DRIVER = pimoroni_trackball
|
|||||||
|
|
||||||
The Pimoroni Trackball module is a I2C based breakout board with an RGB enable trackball.
|
The Pimoroni Trackball module is a I2C based breakout board with an RGB enable trackball.
|
||||||
|
|
||||||
| Setting | Description | Default |
|
| Setting (`config.h`) | Description | Default |
|
||||||
| ------------------------------------ | ---------------------------------------------------------------------------------- | ------- |
|
| ------------------------------------ | ---------------------------------------------------------------------------------- | ------- |
|
||||||
| `PIMORONI_TRACKBALL_ADDRESS` | (Required) Sets the I2C Address for the Pimoroni Trackball. | `0x0A` |
|
| `PIMORONI_TRACKBALL_ADDRESS` | (Required) Sets the I2C Address for the Pimoroni Trackball. | `0x0A` |
|
||||||
| `PIMORONI_TRACKBALL_TIMEOUT` | (Optional) The timeout for i2c communication with the trackball in milliseconds. | `100` |
|
| `PIMORONI_TRACKBALL_TIMEOUT` | (Optional) The timeout for i2c communication with the trackball in milliseconds. | `100` |
|
||||||
@ -220,7 +220,7 @@ The CPI range is 50-16000, in increments of 50. Defaults to 2000 CPI.
|
|||||||
Both PMW 3360 and PMW 3389 are SPI driven optical sensors, that use a built in IR LED for surface tracking.
|
Both PMW 3360 and PMW 3389 are SPI driven optical sensors, that use a built in IR LED for surface tracking.
|
||||||
If you have different CS wiring on each half you can use `PMW33XX_CS_PIN_RIGHT` or `PMW33XX_CS_PINS_RIGHT` in combination with `PMW33XX_CS_PIN` or `PMW33XX_CS_PINS` to configure both sides independently. If `_RIGHT` values aren't provided, they default to be the same as the left ones.
|
If you have different CS wiring on each half you can use `PMW33XX_CS_PIN_RIGHT` or `PMW33XX_CS_PINS_RIGHT` in combination with `PMW33XX_CS_PIN` or `PMW33XX_CS_PINS` to configure both sides independently. If `_RIGHT` values aren't provided, they default to be the same as the left ones.
|
||||||
|
|
||||||
| Setting | Description | Default |
|
| Setting (`config.h`) | Description | Default |
|
||||||
| ---------------------------- | ------------------------------------------------------------------------------------------- | ------------------------ |
|
| ---------------------------- | ------------------------------------------------------------------------------------------- | ------------------------ |
|
||||||
| `PMW33XX_CS_PIN` | (Required) Sets the Chip Select pin connected to the sensor. | `POINTING_DEVICE_CS_PIN` |
|
| `PMW33XX_CS_PIN` | (Required) Sets the Chip Select pin connected to the sensor. | `POINTING_DEVICE_CS_PIN` |
|
||||||
| `PMW33XX_CS_PINS` | (Alternative) Sets the Chip Select pins connected to multiple sensors. | `{PMW33XX_CS_PIN}` |
|
| `PMW33XX_CS_PINS` | (Alternative) Sets the Chip Select pins connected to multiple sensors. | `{PMW33XX_CS_PIN}` |
|
||||||
|
@ -90,8 +90,10 @@ def find_layouts(file):
|
|||||||
cli.log.error('Invalid LAYOUT macro in %s: Empty parameter name in macro %s at pos %s.', file, macro_name, i)
|
cli.log.error('Invalid LAYOUT macro in %s: Empty parameter name in macro %s at pos %s.', file, macro_name, i)
|
||||||
elif key['label'] not in matrix_locations:
|
elif key['label'] not in matrix_locations:
|
||||||
cli.log.error('Invalid LAYOUT macro in %s: Key %s in macro %s has no matrix position!', file, key['label'], macro_name)
|
cli.log.error('Invalid LAYOUT macro in %s: Key %s in macro %s has no matrix position!', file, key['label'], macro_name)
|
||||||
|
elif len(matrix_locations.get(key['label'])) > 1:
|
||||||
|
cli.log.error('Invalid LAYOUT macro in %s: Key %s in macro %s has multiple matrix positions (%s)', file, key['label'], macro_name, ', '.join(str(x) for x in matrix_locations[key['label']]))
|
||||||
else:
|
else:
|
||||||
key['matrix'] = matrix_locations[key['label']]
|
key['matrix'] = matrix_locations[key['label']][0]
|
||||||
|
|
||||||
parsed_layouts[macro_name] = {
|
parsed_layouts[macro_name] = {
|
||||||
'layout': parsed_layout,
|
'layout': parsed_layout,
|
||||||
@ -186,7 +188,9 @@ def _parse_matrix_locations(matrix, file, macro_name):
|
|||||||
row = row.replace('{', '').replace('}', '')
|
row = row.replace('{', '').replace('}', '')
|
||||||
for col_num, identifier in enumerate(row.split(',')):
|
for col_num, identifier in enumerate(row.split(',')):
|
||||||
if identifier != 'KC_NO':
|
if identifier != 'KC_NO':
|
||||||
matrix_locations[identifier] = [row_num, col_num]
|
if identifier not in matrix_locations:
|
||||||
|
matrix_locations[identifier] = []
|
||||||
|
matrix_locations[identifier].append([row_num, col_num])
|
||||||
|
|
||||||
return matrix_locations
|
return matrix_locations
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user