Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
Nick Brassel 2023-09-25 13:03:02 +10:00
commit c597731d1d
No known key found for this signature in database
4 changed files with 26 additions and 3 deletions

View file

@ -35,7 +35,7 @@ jobs:
- name: Get changed files - name: Get changed files
id: file_changes id: file_changes
uses: tj-actions/changed-files@v38 uses: tj-actions/changed-files@v39
- name: Run qmk formatters - name: Run qmk formatters
shell: 'bash {0}' shell: 'bash {0}'

View file

@ -27,7 +27,7 @@ jobs:
- name: Get changed files - name: Get changed files
id: file_changes id: file_changes
uses: tj-actions/changed-files@v38 uses: tj-actions/changed-files@v39
- name: Print info - name: Print info
run: | run: |

View file

@ -155,6 +155,29 @@ In your keyboard config.h:
#endif #endif
``` ```
### RP2040 PIO Version :id=rp2040-pio-version
The `PIO` subsystem is a Raspberry Pi RP2040 specific implementation, using the integrated PIO peripheral and is therefore only available on this MCU.
There are strict requirements for pin ordering but any pair of GPIO pins can be used. The GPIO used for clock must be directly after data, see the included info.json snippet for an example of correct order.
You may optionally switch the PIO peripheral used with the following define in config.h:
```c
#define PS2_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the PS2 implementation uses the PIO0 peripheral
```
Example info.json content:
```json
"ps2": {
"clock_pin": "GP1",
"data_pin": "GP0",
"driver": "vendor",
"enabled": true,
"mouse_enabled": true
}
```
## Additional Settings :id=additional-settings ## Additional Settings :id=additional-settings
### PS/2 Mouse Features :id=ps2-mouse-features ### PS/2 Mouse Features :id=ps2-mouse-features

View file

@ -22,7 +22,7 @@
#endif #endif
#if PS2_DATA_PIN + 1 != PS2_CLOCK_PIN #if PS2_DATA_PIN + 1 != PS2_CLOCK_PIN
# error PS/2 Clock pin must be followed by data pin! # error PS/2 clock pin must be data pin + 1!
#endif #endif
static inline void pio_serve_interrupt(void); static inline void pio_serve_interrupt(void);