Главная Обзор Помощь
Вход
logic855
/
qmk_firmware
зеркало из https://github.com/qmk/qmk_firmware.git
1
0
Ответвить 1
Файлы Задачи 0 Вики
Просмотр исходного кода

Merge remote-tracking branch 'origin/develop' into xap

QMK Bot 2 лет назад
Родитель
cbe2cfea8f e69b638756
Сommit
a8bea90c71
67 измененных файлов с 11 добавлено и 13 удалено
Разделённый вид Показать статистику Diff
  1. 0 0
      keyboards/jacky_studio/piggy60/rev2/keyboard.json
  2. 0 0
      keyboards/janus/keyboard.json
  3. 0 0
      keyboards/jaykeeb/joker/keyboard.json
  4. 0 1
      keyboards/jaykeeb/joker/rules.mk
  5. 0 0
      keyboards/jaykeeb/kamigakushi/keyboard.json
  6. 0 0
      keyboards/jones/v03/keyboard.json
  7. 0 0
      keyboards/jones/v03_1/keyboard.json
  8. 0 0
      keyboards/joshajohnson/hub16/keyboard.json
  9. 0 0
      keyboards/jpe230/big_knob/keyboard.json
  10. 0 0
      keyboards/kagizaraya/chidori/keyboard.json
  11. 0 0
      keyboards/kagizaraya/scythe/keyboard.json
  12. 0 0
      keyboards/kakunpc/choc_taro/keyboard.json
  13. 0 0
      keyboards/kakunpc/thedogkeyboard/keyboard.json
  14. 0 0
      keyboards/kaly/kaly42/keyboard.json
  15. 0 0
      keyboards/karn/keyboard.json
  16. 0 0
      keyboards/kb_elmo/aek2_usb/keyboard.json
  17. 0 0
      keyboards/kb_elmo/elmopad/keyboard.json
  18. 0 0
      keyboards/kb_elmo/isolation/keyboard.json
  19. 0 0
      keyboards/kb_elmo/m0110a_usb/keyboard.json
  20. 0 0
      keyboards/kb_elmo/m0116_usb/keyboard.json
  21. 0 0
      keyboards/kb_elmo/sesame/keyboard.json
  22. 0 0
      keyboards/kb_elmo/twelvekey/keyboard.json
  23. 2 0
      keyboards/kbdfans/jm60/keyboard.json
  24. 1 6
      keyboards/kbdfans/jm60/rules.mk
  25. 0 0
      keyboards/kbdfans/kbd4x/keyboard.json
  26. 0 0
      keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json
  27. 0 0
      keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json
  28. 0 0
      keyboards/kbdfans/niu_mini/keyboard.json
  29. 0 0
      keyboards/kbdfans/odin75/keyboard.json
  30. 0 0
      keyboards/kbdmania/kmac/keyboard.json
  31. 0 0
      keyboards/kbdmania/kmac_pad/keyboard.json
  32. 0 0
      keyboards/kbnordic/nordic65/rev_a/keyboard.json
  33. 0 0
      keyboards/keebio/cepstrum/rev1/keyboard.json
  34. 0 0
      keyboards/keebio/foldkb/rev1/keyboard.json
  35. 0 0
      keyboards/keebio/foldkb/rev1/rules.mk
  36. 0 0
      keyboards/keebio/iris/rev8/keyboard.json
  37. 0 0
      keyboards/keebio/iris_ce/rev1/keyboard.json
  38. 0 0
      keyboards/keebio/levinson/rev3/keyboard.json
  39. 0 0
      keyboards/keebio/nyquist/rev4/keyboard.json
  40. 0 0
      keyboards/keebio/sinc/rev3/keyboard.json
  41. 0 0
      keyboards/keebio/sinc/rev4/keyboard.json
  42. 0 0
      keyboards/keebio/wavelet/keyboard.json
  43. 0 0
      keyboards/keebwerk/mega/ansi/keyboard.json
  44. 0 0
      keyboards/keebwerk/nano_slider/keyboard.json
  45. 0 0
      keyboards/keyboardio/model01/keyboard.json
  46. 0 0
      keyboards/keycapsss/3w6_2040/keyboard.json
  47. 0 0
      keyboards/keycult/keycult65/keyboard.json
  48. 0 0
      keyboards/keygem/kg60ansi/keyboard.json
  49. 0 0
      keyboards/keygem/kg65rgbv2/keyboard.json
  50. 0 0
      keyboards/keyhive/honeycomb/keyboard.json
  51. 0 0
      keyboards/keyhive/lattice60/keyboard.json
  52. 4 1
      keyboards/kin80/blackpill401/keyboard.json
  53. 0 1
      keyboards/kin80/blackpill401/rules.mk
  54. 4 1
      keyboards/kin80/blackpill411/keyboard.json
  55. 0 1
      keyboards/kin80/blackpill411/rules.mk
  56. 0 0
      keyboards/kinesis/alvicstep/keyboard.json
  57. 0 0
      keyboards/kinesis/kint41/keyboard.json
  58. 0 0
      keyboards/kinesis/kintlc/keyboard.json
  59. 0 0
      keyboards/kinesis/nguyenvietyen/keyboard.json
  60. 0 0
      keyboards/kmini/keyboard.json
  61. 0 0
      keyboards/kopibeng/mnk65_stm32/keyboard.json
  62. 0 0
      keyboards/kopibeng/xt87/keyboard.json
  63. 0 2
      keyboards/kopibeng/xt87/rules.mk
  64. 0 0
      keyboards/kprepublic/bm60hsrgb/rev2/keyboard.json
  65. 0 0
      keyboards/kprepublic/bm60hsrgb_iso/rev2/keyboard.json
  66. 0 0
      keyboards/kprepublic/bm60hsrgb_poker/rev2/keyboard.json
  67. 0 0
      keyboards/ktec/ergodone/keyboard.json

+ 0 - 0
keyboards/jacky_studio/piggy60/rev2/info.json → keyboards/jacky_studio/piggy60/rev2/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/janus/info.json → keyboards/janus/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/jaykeeb/joker/info.json → keyboards/jaykeeb/joker/keyboard.json
Просмотреть файл


+ 0 - 1
keyboards/jaykeeb/joker/rules.mk
Просмотреть файл 

@@ -1 +0,0 @@
 
-# This file intentionally left blank

+ 0 - 0
keyboards/jaykeeb/kamigakushi/info.json → keyboards/jaykeeb/kamigakushi/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/jones/v03/info.json → keyboards/jones/v03/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/jones/v03_1/info.json → keyboards/jones/v03_1/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/joshajohnson/hub16/info.json → keyboards/joshajohnson/hub16/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/jpe230/big_knob/info.json → keyboards/jpe230/big_knob/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kagizaraya/chidori/info.json → keyboards/kagizaraya/chidori/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kagizaraya/scythe/info.json → keyboards/kagizaraya/scythe/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kakunpc/choc_taro/info.json → keyboards/kakunpc/choc_taro/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kakunpc/thedogkeyboard/info.json → keyboards/kakunpc/thedogkeyboard/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kaly/kaly42/info.json → keyboards/kaly/kaly42/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/karn/info.json → keyboards/karn/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kb_elmo/aek2_usb/info.json → keyboards/kb_elmo/aek2_usb/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kb_elmo/elmopad/info.json → keyboards/kb_elmo/elmopad/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kb_elmo/isolation/info.json → keyboards/kb_elmo/isolation/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kb_elmo/m0110a_usb/info.json → keyboards/kb_elmo/m0110a_usb/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kb_elmo/m0116_usb/info.json → keyboards/kb_elmo/m0116_usb/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kb_elmo/sesame/info.json → keyboards/kb_elmo/sesame/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kb_elmo/twelvekey/info.json → keyboards/kb_elmo/twelvekey/keyboard.json
Просмотреть файл


+ 2 - 0
keyboards/kbdfans/jm60/info.json → keyboards/kbdfans/jm60/keyboard.json
Просмотреть файл 

@@ -19,6 +19,8 @@
 
         "extrakey": true,
 
         "nkro": true
 
     },
 
+    "bootloader": "custom",
 
+    "processor": "STM32F103",
 
     "community_layouts": ["60_ansi"],
 
     "layouts": {
 
         "LAYOUT_60_ansi": {

+ 1 - 6
keyboards/kbdfans/jm60/rules.mk
Просмотреть файл 

@@ -1,8 +1,3 @@
 
-# MCU name
 
-MCU = STM32F103
 
-
 
+# custom bootloader
 
 MCU_LDSCRIPT = jm60_bootloader
 
 BOARD = ST_NUCLEO64_F103RB
 
-
 
-# Bootloader selection
 
-BOOTLOADER = custom

+ 0 - 0
keyboards/kbdfans/kbd4x/info.json → keyboards/kbdfans/kbd4x/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kbdfans/kbd67/mkiirgb/v3/info.json → keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kbdfans/kbd67/mkiirgb_iso/info.json → keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kbdfans/niu_mini/info.json → keyboards/kbdfans/niu_mini/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kbdfans/odin75/info.json → keyboards/kbdfans/odin75/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kbdmania/kmac/info.json → keyboards/kbdmania/kmac/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kbdmania/kmac_pad/info.json → keyboards/kbdmania/kmac_pad/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kbnordic/nordic65/rev_a/info.json → keyboards/kbnordic/nordic65/rev_a/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keebio/cepstrum/rev1/info.json → keyboards/keebio/cepstrum/rev1/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keebio/foldkb/rev1/info.json → keyboards/keebio/foldkb/rev1/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keebio/foldkb/rev1/rules.mk
Просмотреть файл


+ 0 - 0
keyboards/keebio/iris/rev8/info.json → keyboards/keebio/iris/rev8/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keebio/iris_ce/rev1/info.json → keyboards/keebio/iris_ce/rev1/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keebio/levinson/rev3/info.json → keyboards/keebio/levinson/rev3/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keebio/nyquist/rev4/info.json → keyboards/keebio/nyquist/rev4/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keebio/sinc/rev3/info.json → keyboards/keebio/sinc/rev3/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keebio/sinc/rev4/info.json → keyboards/keebio/sinc/rev4/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keebio/wavelet/info.json → keyboards/keebio/wavelet/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keebwerk/mega/ansi/info.json → keyboards/keebwerk/mega/ansi/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keebwerk/nano_slider/info.json → keyboards/keebwerk/nano_slider/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keyboardio/model01/info.json → keyboards/keyboardio/model01/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keycapsss/3w6_2040/info.json → keyboards/keycapsss/3w6_2040/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keycult/keycult65/info.json → keyboards/keycult/keycult65/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keygem/kg60ansi/info.json → keyboards/keygem/kg60ansi/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keygem/kg65rgbv2/info.json → keyboards/keygem/kg65rgbv2/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keyhive/honeycomb/info.json → keyboards/keyhive/honeycomb/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/keyhive/lattice60/info.json → keyboards/keyhive/lattice60/keyboard.json
Просмотреть файл


+ 4 - 1
keyboards/kin80/blackpill401/info.json → keyboards/kin80/blackpill401/keyboard.json
Просмотреть файл 

@@ -1,6 +1,9 @@
 
 {
 
     "usb": {
 
-        "device_version": "0.0.3"
 
+        "device_version": "0.0.3",
 
+        "shared_endpoint": {
 
+            "keyboard": true
 
+        }
 
     },
 
     "matrix_pins": {
 
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"],

+ 0 - 1
keyboards/kin80/blackpill401/rules.mk
Просмотреть файл 

@@ -1 +0,0 @@
 
-KEYBOARD_SHARED_EP = yes

+ 4 - 1
keyboards/kin80/blackpill411/info.json → keyboards/kin80/blackpill411/keyboard.json
Просмотреть файл 

@@ -1,6 +1,9 @@
 
 {
 
     "usb": {
 
-        "device_version": "0.0.3"
 
+        "device_version": "0.0.3",
 
+        "shared_endpoint": {
 
+            "keyboard": true
 
+        }
 
     },
 
     "matrix_pins": {
 
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"],

+ 0 - 1
keyboards/kin80/blackpill411/rules.mk
Просмотреть файл 

@@ -1 +0,0 @@
 
-KEYBOARD_SHARED_EP = yes

+ 0 - 0
keyboards/kinesis/alvicstep/info.json → keyboards/kinesis/alvicstep/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kinesis/kint41/info.json → keyboards/kinesis/kint41/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kinesis/kintlc/info.json → keyboards/kinesis/kintlc/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kinesis/nguyenvietyen/info.json → keyboards/kinesis/nguyenvietyen/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kmini/info.json → keyboards/kmini/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kopibeng/mnk65_stm32/info.json → keyboards/kopibeng/mnk65_stm32/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kopibeng/xt87/info.json → keyboards/kopibeng/xt87/keyboard.json
Просмотреть файл


+ 0 - 2
keyboards/kopibeng/xt87/rules.mk
Просмотреть файл 

@@ -1,2 +0,0 @@
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
 
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

+ 0 - 0
keyboards/kprepublic/bm60hsrgb/rev2/info.json → keyboards/kprepublic/bm60hsrgb/rev2/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json → keyboards/kprepublic/bm60hsrgb_iso/rev2/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json → keyboards/kprepublic/bm60hsrgb_poker/rev2/keyboard.json
Просмотреть файл


+ 0 - 0
keyboards/ktec/ergodone/info.json → keyboards/ktec/ergodone/keyboard.json
Просмотреть файл