Merge remote-tracking branch 'upstream/master'

* upstream/master: (110 commits) Drop V2 production updates (qmk#22147) Add support for YMD75 V4 - ISO (qmk#22128) Initial support for CSTM80 (qmk#22137) [Keyboard] Add spankbd, 3x5+3 split keyboard (qmk#22003) rastersoft/minitkl layout corrections (qmk#22130) Fix doc for programmable buttons. (qmk#22136) Fix entry into bootloader for STM32G431. (qmk#22138) Fix typo in oled_driver (qmk#22134) Added more rgb effects for rpk-001 keyboard (qmk#22120) Add zoom98 (qmk#22062) Add Palmetto PCB (qmk#21955) Bump tj-actions/changed-files from 38 to 39 (qmk#21923) Document the RP2040-specific PS/2 implementation (qmk#22079) Add is0gr to QMK (qmk#22024) amend 75_(ansi|iso) community_layouts in keyboards/ (qmk#21837) amend split_* community_layouts in keyboards (qmk#21847) Fix variable misspelling (qmk#21774) Fix combo_ref_from_layer respect different default layer [qmk#21780] (qmk#21781) Added Wyvern Hotswap by BredWorks (qmk#21141) included keyboard.h. To use is_keyboard_master with a split with an i… (qmk#21571) ...
sudish · Sep 27, 2023 · 98d9c3d · 98d9c3d
2 parents 17c261e + 0ecb03a
commit 98d9c3d
Show file tree

Hide file tree

Showing 462 changed files with 29,114 additions and 3,640 deletions.
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -35,7 +35,7 @@ jobs:
 
  - name: Get changed files
  id: file_changes
- uses: tj-actions/changed-files@v38
+ uses: tj-actions/changed-files@v39
 
  - name: Run qmk formatters
  shell: 'bash {0}'

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -27,7 +27,7 @@ jobs:
 
  - name: Get changed files
  id: file_changes
- uses: tj-actions/changed-files@v38
+ uses: tj-actions/changed-files@v39
 
  - name: Print info
  run: |

diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk
@@ -392,6 +392,8 @@ check-size:
  if [ $(MAX_SIZE) -gt 0 ] && [ $(CURRENT_SIZE) -gt 0 ]; then \
  $(SILENT) || printf "$(MSG_CHECK_FILESIZE)" | $(AWK_CMD); \
  if [ $(CURRENT_SIZE) -gt $(MAX_SIZE) ]; then \
+ $(REMOVE) $(TARGET).$(FIRMWARE_FORMAT); \
+ $(REMOVE) $(BUILD_DIR)/$(TARGET).{hex,bin,uf2}; \
  printf "\n * $(MSG_FILE_TOO_BIG)"; $(PRINT_ERROR_PLAIN); \
  else \
  if [ $(FREE_SIZE) -lt $(SIZE_MARGIN) ]; then \

diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
@@ -29,6 +29,10 @@
  "minLength": 1,
  "maxLength": 250
  },
+ "snake_case": {
+ "type": "string",
+ "pattern": "^[a-z][a-z0-9_]*$"
+ },
  "layout_macro": {
  "oneOf": [
  {

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
@@ -256,7 +256,11 @@
  "enabled": {"type": "boolean"}
  }
  },
- "features": {"$ref": "qmk.definitions.v1#/boolean_array"},
+ "features": {
+ "$ref": "qmk.definitions.v1#/boolean_array",
+ "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
+
+ },
  "indicators": {
  "type": "object",
  "properties": {
@@ -370,6 +374,7 @@
  "properties": {
  "animations": {
  "type": "object",
+ "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
  "additionalProperties": {
  "type": "boolean"
  }
@@ -419,6 +424,7 @@
  "properties": {
  "animations": {
  "type": "object",
+ "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
  "additionalProperties": {
  "type": "boolean"
  }
@@ -471,6 +477,7 @@
  "properties": {
  "animations": {
  "type": "object",
+ "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
  "additionalProperties": {
  "type": "boolean"
  }

diff --git a/docs/_summary.md b/docs/_summary.md
@@ -80,6 +80,7 @@
  * [Caps Word](feature_caps_word.md)
  * [Combos](feature_combo.md)
  * [Debounce API](feature_debounce_type.md)
+ * [Digitizer](feature_digitizer.md)
  * [EEPROM](feature_eeprom.md)
  * [Key Lock](feature_key_lock.md)
  * [Key Overrides](feature_key_overrides.md)
@@ -115,7 +116,6 @@
  * [Bootmagic Lite](feature_bootmagic.md)
  * [Converters](feature_converters.md)
  * [Custom Matrix](custom_matrix.md)
- * [Digitizer](feature_digitizer.md)
  * [DIP Switch](feature_dip_switch.md)
  * [Encoders](feature_encoders.md)
  * [Haptic Feedback](feature_haptic_feedback.md)

diff --git a/docs/feature_oled_driver.md b/docs/feature_oled_driver.md
@@ -10,6 +10,7 @@ Tested combinations:
 |SSD1306 |128x32 |AVR |Primary support |
 |SSD1306 |128x64 |AVR |Verified working |
 |SSD1306 |128x32 |Arm | |
+|SSD1306 |128x64 |Arm |Verified working |
 |SH1106 |128x64 |AVR |No scrolling |
 |SH1107 |64x128 |AVR |No scrolling |
 |SH1107 |64x128 |Arm |No scrolling |
@@ -398,7 +399,7 @@ void oled_scroll_set_area(uint8_t start_line, uint8_t end_line);
 // Sets scroll speed, 0-7, fastest to slowest. Default is three.
 // Does not take effect until scrolling is either started or restarted
 // the ssd1306 supports 8 speeds with the delay
-// listed below betwen each frame of the scrolling effect
+// listed below between each frame of the scrolling effect
 // 0=2, 1=3, 2=4, 3=5, 4=25, 5=64, 6=128, 7=256
 void oled_scroll_set_speed(uint8_t speed);
 

diff --git a/docs/feature_programmable_button.md b/docs/feature_programmable_button.md
@@ -2,7 +2,7 @@
 
 Programmable Buttons are keys that have no predefined meaning. This means they can be processed on the host side by custom software without the operating system trying to interpret them.
 
-The keycodes are emitted according to the HID Telephony Device page (`0x0B`), Programmable Button usage (`0x07`). On Linux (> 5.14) they are handled automatically and translated to `KEY_MACRO#` keycodes (up to `KEY_MACRO30`).
+The keycodes are emitted according to the HID Telephony Device page (`0x0B`), Programmable Button usage (`0x09`). On Linux (> 5.14) they are handled automatically and translated to `KEY_MACRO#` keycodes (up to `KEY_MACRO30`).
 
 ?> Currently there is no known support in Windows or macOS. It may be possible to write a custom HID driver to receive these usages, but this is out of the scope of the QMK documentation.
 

diff --git a/docs/feature_ps2_mouse.md b/docs/feature_ps2_mouse.md
@@ -155,6 +155,29 @@ In your keyboard config.h:
 #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
 
 ### PS/2 Mouse Features :id=ps2-mouse-features

diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
@@ -80,6 +80,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
  - Encoder Configuration
  - Bootmagic Configuration
  - LED Indicator Configuration
+ - Run `qmk format-json` on this file before submitting your PR. Be sure to append the `-i` flag to directly modify the file, or paste the outputted code into the file. 
 - `readme.md`
  - must follow the [template](https://github.com/qmk/qmk_firmware/blob/master/data/templates/keyboard/readme.md)
  - flash command is present, and has `:flash` at end

diff --git a/docs/qmk_custom_dark.css b/docs/qmk_custom_dark.css
@@ -2,9 +2,13 @@
  background-color: #555;
 }
 
-.markdown-section p.tip,
 .markdown-section tr:nth-child(2n) {
- background-color:#444;
+ background-color:#444;
+}
+
+.markdown-section p.tip {
+ background-color:#555;
+ color:#FFF;
 }
 
 .markdown-section tr {
@@ -16,7 +20,7 @@
 }
 
 .markdown-section p.tip code {
- background-color: #555;
+ background-color: #333;
  color: #fff;
 }
 

diff --git a/drivers/oled/oled_driver.c b/drivers/oled/oled_driver.c
@@ -19,6 +19,9 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 # include "spi_master.h"
 #elif defined(OLED_TRANSPORT_I2C)
 # include "i2c_master.h"
+# if defined(USE_I2C) && defined(SPLIT_KEYBOARD)
+# include "keyboard.h"
+# endif
 #endif
 #include "oled_driver.h"
 #include OLED_FONT_H

diff --git a/drivers/oled/oled_driver.h b/drivers/oled/oled_driver.h
@@ -454,7 +454,7 @@ void oled_scroll_set_area(uint8_t start_line, uint8_t end_line);
 // Sets scroll speed, 0-7, fastest to slowest. Default is three.
 // Does not take effect until scrolling is either started or restarted
 // the ssd1306 supports 8 speeds with the delay
-// listed below betwen each frame of the scrolling effect
+// listed below between each frame of the scrolling effect
 // 0=2, 1=3, 2=4, 3=5, 4=25, 5=64, 6=128, 7=256
 void oled_scroll_set_speed(uint8_t speed);