Merge branch 'qmk:master' into vr-binepad-bnk9-1

qmk · Dec 16, 2023 · ed6e30a · ed6e30a
2 parents 148568d + 9874d78
commit ed6e30a
Show file tree

Hide file tree

Showing 224 changed files with 14,981 additions and 179 deletions.
diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml
@@ -53,7 +53,7 @@ jobs:
  [ ! -f .failed ] || exit 1
 
  - name: 'Upload artifacts'
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  if: always()
  with:
  name: artifacts-${{ github.event.inputs.branch || github.ref_name }}-${{ matrix.keymap }}

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@v39
+ uses: tj-actions/changed-files@v40
 
  - 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@v39
+ uses: tj-actions/changed-files@v40
 
  - name: Print info
  run: |

diff --git a/builddefs/converters.mk b/builddefs/converters.mk
@@ -25,7 +25,9 @@ ifneq ($(CONVERT_TO),)
  -include $(CONVERTER)/pre_converter.mk
 
  PLATFORM_KEY = $(shell echo $(CONVERTER) | cut -d "/" -f2)
- TARGET := $(TARGET)_$(CONVERT_TO)
+
+ # force setting as value can be from environment
+ override TARGET := $(TARGET)_$(CONVERT_TO)
 
  # Configure any defaults
  OPT_DEFS += -DCONVERT_TO_$(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]')

diff --git a/docs/cli.md b/docs/cli.md
@@ -2,7 +2,7 @@
 
 ## Overview :id=overview
 
-The QMK CLI makes building and working with QMK keyboards easier. We have provided a number of commands to simplify and streamline tasks such as obtaining and compiling the QMK firmware, creating keymaps, and more.
+The QMK CLI (command line interface) makes building and working with QMK keyboards easier. We have provided a number of commands to simplify and streamline tasks such as obtaining and compiling the QMK firmware, creating keymaps, and more.
 
 ### Requirements :id=requirements
 

diff --git a/docs/cli_commands.md b/docs/cli_commands.md
@@ -362,6 +362,16 @@ This command is directory aware. It will automatically fill in KEYBOARD if you a
 qmk list-keymaps -kb planck/ez
 ```
 
+## `qmk migrate`
+
+This command searches for legacy code that can be converted to the new `info.json` format and adds it to the specified keyboard's `info.json`.
+
+**Usage**:
+
+```
+qmk migrate [-h] -kb KEYBOARD [-f FILTER]
+```
+
 ## `qmk new-keyboard`
 
 This command creates a new keyboard based on available templates.

diff --git a/docs/ja/contributing.md b/docs/ja/contributing.md
@@ -110,11 +110,11 @@ enum my_keycodes {
 
 開発環境をセットアップした場合は、プルリクエストを開く前に以下のコマンドを `qmk_firmware/` フォルダから実行することで、あなたの変更をプレビューすることができます:
 
- ./bin/qmk docs
+ qmk docs
 
 または、Python 3 のみがインストールされている場合:
 
- python3 -m http.server 8936
+ python3 -m http.server 8936 --directory docs
 
 その後、ウェブブラウザで、`https://localhost:8936/` を表示します。
 

diff --git a/docs/ja/tap_hold.md b/docs/ja/tap_hold.md
@@ -160,7 +160,7 @@ bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) {
 
 「キー別」の関数全てにキーレコードを含んでいることに気付いたかもしれません。そしてなぜそうしたのか不思議に思っているかもしれません。
 
-まぁ、それは単純に本当にカスタマイズのためです。ただし、具体的には、それはキーボードの配線方法によって異なります。例えば、各行が実際にキーボードのマトリックスの1行を使っている場合、キーコード全体をチェックする代わりに、`if (record->event.row == 3)` を使うほうが簡単かもしれません。これは、ホームキー行でタップホールドタイプのキーを使っている人にとって特に便利です。そのため、通常のタイピングを妨げないように微調整することができるのではないでしょうか。
+まぁ、それは単純に本当にカスタマイズのためです。ただし、具体的には、それはキーボードの配線方法によって異なります。例えば、各行が実際にキーボードのマトリックスの1行を使っている場合、キーコード全体をチェックする代わりに、`if (record->event.key.row == 3)` を使うほうが簡単かもしれません。これは、ホームキー行でタップホールドタイプのキーを使っている人にとって特に便利です。そのため、通常のタイピングを妨げないように微調整することができるのではないでしょうか。
 
 ## `*_kb` や `*_user` 関数が無いのはなぜですか？
 

diff --git a/docs/tap_hold.md b/docs/tap_hold.md
@@ -493,7 +493,7 @@ Examples:
 
 One thing that you may notice is that we include the key record for all of the "per key" functions, and may be wondering why we do that.
 
-Well, it's simple really: customization. But specifically, it depends on how your keyboard is wired up. For instance, if each row is actually using a row in the keyboard's matrix, then it may be simpler to use `if (record->event.row == 3)` instead of checking a whole bunch of keycodes. Which is especially good for those people using the Tap Hold type keys on the home row. So you could fine-tune those to not interfere with your normal typing.
+Well, it's simple really: customization. But specifically, it depends on how your keyboard is wired up. For instance, if each row is actually using a row in the keyboard's matrix, then it may be simpler to use `if (record->event.key.row == 3)` instead of checking a whole bunch of keycodes. Which is especially good for those people using the Tap Hold type keys on the home row. So you could fine-tune those to not interfere with your normal typing.
 
 ## Why are there no `*_kb` or `*_user` functions?!
 

diff --git a/keyboards/anavi/macropad8/keymaps/vlc/keymap.c b/keyboards/anavi/macropad8/keymaps/vlc/keymap.c
@@ -56,7 +56,7 @@ const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {20, 10, 4};
  * Alt + left arrow - Jump 10 seconds back
  * Control + left arrow - Jump 1 minute back
  *
-  * - Layer for VLC DVD hotkeys:
+ * - Layer for VLC DVD hotkeys:
  * Shift + M - Disc menu
  * Arrow up - Navigate menu (up)
  * Enter - Select menu entry
@@ -93,7 +93,7 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
  return OLED_ROTATION_180; // flips the display 180 degrees if offhand
 }
 
-void oled_task_user(void) {
+bool oled_task_user(void) {
  // Host Keyboard Layer Status
  oled_write_ln_P(PSTR("ANAVI Macro Pad 8"), false);
  oled_write_P(PSTR("Layer: "), false);
@@ -134,5 +134,6 @@ void oled_task_user(void) {
  snprintf(rgbStatusLine2, sizeof(rgbStatusLine2), "h:%d s:%d v:%d", rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val());
  oled_write_ln(rgbStatusLine2, false);
 #endif
+ return false;
 }
 #endif