mh
/
qmk_firmware
mirror of https://github.com/qmk/qmk_firmware/
1
0
Fork 0
Code Issues 0 Projects 0 Releases 1.6k Wiki Activity
Browse Source

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

pull/23472/head
Duncan Sutherland 2 weeks ago
parent
1c992e300f 1d5ee895ad
commit
f37710c175
125 changed files with 7 additions and 5 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -0
      keyboards/cablecardesigns/phoenix/keyboard.json
  2. +0
    -0
      keyboards/cannonkeys/aella/keyboard.json
  3. +0
    -0
      keyboards/cannonkeys/an_c/keyboard.json
  4. +0
    -0
      keyboards/cannonkeys/bakeneko60_iso_hs/keyboard.json
  5. +0
    -0
      keyboards/cannonkeys/bakeneko65_iso_hs/keyboard.json
  6. +0
    -0
      keyboards/cannonkeys/balance/keyboard.json
  7. +0
    -0
      keyboards/cannonkeys/brutalv2_65/keyboard.json
  8. +0
    -0
      keyboards/cannonkeys/chimera65_hs/keyboard.json
  9. +0
    -0
      keyboards/cannonkeys/cloudline/keyboard.json
  10. +0
    -0
      keyboards/cannonkeys/crin/keyboard.json
  11. +0
    -0
      keyboards/cannonkeys/devastatingtkl/keyboard.json
  12. +0
    -0
      keyboards/cannonkeys/ellipse/keyboard.json
  13. +0
    -0
      keyboards/cannonkeys/ellipse_hs/keyboard.json
  14. +0
    -0
      keyboards/cannonkeys/gentoo/keyboard.json
  15. +0
    -0
      keyboards/cannonkeys/gentoo_hs/keyboard.json
  16. +0
    -0
      keyboards/cannonkeys/instant60/keyboard.json
  17. +0
    -0
      keyboards/cannonkeys/instant65/keyboard.json
  18. +0
    -0
      keyboards/cannonkeys/is0gr/keyboard.json
  19. +0
    -0
      keyboards/cannonkeys/leviatan/keyboard.json
  20. +0
    -0
      keyboards/cannonkeys/malicious_ergo/keyboard.json
  21. +0
    -0
      keyboards/cannonkeys/meetuppad2023/keyboard.json
  22. +0
    -0
      keyboards/cannonkeys/moment/keyboard.json
  23. +0
    -0
      keyboards/cannonkeys/moment_hs/keyboard.json
  24. +0
    -0
      keyboards/cannonkeys/obliterated75/keyboard.json
  25. +0
    -0
      keyboards/cannonkeys/onyx/keyboard.json
  26. +0
    -0
      keyboards/cannonkeys/rekt1800/keyboard.json
  27. +0
    -0
      keyboards/cannonkeys/ripple/keyboard.json
  28. +0
    -0
      keyboards/cannonkeys/ripple_hs/keyboard.json
  29. +0
    -0
      keyboards/cannonkeys/sagittarius/keyboard.json
  30. +0
    -0
      keyboards/cannonkeys/satisfaction75_hs/keyboard.json
  31. +0
    -0
      keyboards/cannonkeys/savage65/keyboard.json
  32. +0
    -0
      keyboards/cannonkeys/serenity/keyboard.json
  33. +0
    -0
      keyboards/cannonkeys/tmov2/keyboard.json
  34. +0
    -0
      keyboards/cannonkeys/tsukuyomi/keyboard.json
  35. +0
    -0
      keyboards/cannonkeys/vector/keyboard.json
  36. +0
    -0
      keyboards/cannonkeys/vicious40/keyboard.json
  37. +0
    -0
      keyboards/cantor/keyboard.json
  38. +0
    -0
      keyboards/centromere/keyboard.json
  39. +0
    -0
      keyboards/checkerboards/phoenix45_ortho/keyboard.json
  40. +0
    -0
      keyboards/checkerboards/quark/keyboard.json
  41. +0
    -0
      keyboards/checkerboards/quark_squared/keyboard.json
  42. +0
    -0
      keyboards/cipulot/ec_23u/keyboard.json
  43. +0
    -0
      keyboards/cipulot/ec_60/keyboard.json
  44. +0
    -0
      keyboards/cipulot/ec_alveus/1_0_0/keyboard.json
  45. +0
    -0
      keyboards/cipulot/ec_alveus/1_2_0/keyboard.json
  46. +0
    -0
      keyboards/cipulot/ec_pro2/keyboard.json
  47. +0
    -0
      keyboards/cipulot/ec_prox/ansi_iso/keyboard.json
  48. +0
    -0
      keyboards/cipulot/ec_prox/jis/keyboard.json
  49. +0
    -0
      keyboards/cipulot/ec_theca/keyboard.json
  50. +0
    -0
      keyboards/cipulot/ec_typek/keyboard.json
  51. +0
    -0
      keyboards/cipulot/mnk_60_ec/keyboard.json
  52. +0
    -0
      keyboards/cipulot/mnk_65_ec/keyboard.json
  53. +0
    -0
      keyboards/cipulot/rf_r1_8_9xu/keyboard.json
  54. +0
    -0
      keyboards/clueboard/2x1800/2021/keyboard.json
  55. +0
    -0
      keyboards/clueboard/60/keyboard.json
  56. +0
    -0
      keyboards/controllerworks/city42/keyboard.json
  57. +0
    -0
      keyboards/controllerworks/mini36/keyboard.json
  58. +0
    -0
      keyboards/controllerworks/mini42/keyboard.json
  59. +0
    -0
      keyboards/converter/hp_46010a/keyboard.json
  60. +0
    -0
      keyboards/converter/ibm_terminal/keyboard.json
  61. +0
    -0
      keyboards/converter/m0110_usb/keyboard.json
  62. +0
    -0
      keyboards/converter/siemens_tastatur/keyboard.json
  63. +6
    -0
      keyboards/converter/usb_usb/ble/keyboard.json
  64. +0
    -4
      keyboards/converter/usb_usb/ble/rules.mk
  65. +0
    -0
      keyboards/converter/usb_usb/pro_micro/keyboard.json
  66. +0
    -0
      keyboards/converter/xmk/keyboard.json
  67. +0
    -0
      keyboards/converter/xt_usb/keyboard.json
  68. +0
    -0
      keyboards/coseyfannitutti/discipline/keyboard.json
  69. +0
    -0
      keyboards/coseyfannitutti/mysterium/keyboard.json
  70. +1
    -0
      keyboards/cozykeys/speedo/v3/keyboard.json
  71. +0
    -1
      keyboards/cozykeys/speedo/v3/rules.mk
  72. +0
    -0
      keyboards/crimsonkeyboards/resume1800/keyboard.json
  73. +0
    -0
      keyboards/crypt_macro/keyboard.json
  74. +0
    -0
      keyboards/custommk/cmk11/keyboard.json
  75. +0
    -0
      keyboards/custommk/ergostrafer/keyboard.json
  76. +0
    -0
      keyboards/custommk/evo70_r2/keyboard.json
  77. +0
    -0
      keyboards/fallacy/keyboard.json
  78. +0
    -0
      keyboards/fc660c/keyboard.json
  79. +0
    -0
      keyboards/fc980c/keyboard.json
  80. +0
    -0
      keyboards/ferris/0_1/keyboard.json
  81. +0
    -0
      keyboards/ferris/0_2/bling/keyboard.json
  82. +0
    -0
      keyboards/ferris/0_2/bling/rules.mk
  83. +0
    -0
      keyboards/fjlabs/7vhotswap/keyboard.json
  84. +0
    -0
      keyboards/fjlabs/ad65/keyboard.json
  85. +0
    -0
      keyboards/fjlabs/avalon/keyboard.json
  86. +0
    -0
      keyboards/fjlabs/bks65/keyboard.json
  87. +0
    -0
      keyboards/fjlabs/bks65solder/keyboard.json
  88. +0
    -0
      keyboards/fjlabs/bolsa65/keyboard.json
  89. +0
    -0
      keyboards/fjlabs/kf87/keyboard.json
  90. +0
    -0
      keyboards/fjlabs/kyuu/keyboard.json
  91. +0
    -0
      keyboards/fjlabs/ldk65/keyboard.json
  92. +0
    -0
      keyboards/fjlabs/midway60/keyboard.json
  93. +0
    -0
      keyboards/fjlabs/mk61rgbansi/keyboard.json
  94. +0
    -0
      keyboards/fjlabs/peaker/keyboard.json
  95. +0
    -0
      keyboards/fjlabs/polaris/keyboard.json
  96. +0
    -0
      keyboards/fjlabs/ready100/keyboard.json
  97. +0
    -0
      keyboards/fjlabs/sinanju/keyboard.json
  98. +0
    -0
      keyboards/fjlabs/sinanjuwk/keyboard.json
  99. +0
    -0
      keyboards/fjlabs/solanis/keyboard.json
  100. +0
    -0
      keyboards/fjlabs/swordfish/keyboard.json

keyboards/cablecardesigns/phoenix/info.json → keyboards/cablecardesigns/phoenix/keyboard.json View File


keyboards/cannonkeys/aella/info.json → keyboards/cannonkeys/aella/keyboard.json View File


keyboards/cannonkeys/an_c/info.json → keyboards/cannonkeys/an_c/keyboard.json View File


keyboards/cannonkeys/bakeneko60_iso_hs/info.json → keyboards/cannonkeys/bakeneko60_iso_hs/keyboard.json View File


keyboards/cannonkeys/bakeneko65_iso_hs/info.json → keyboards/cannonkeys/bakeneko65_iso_hs/keyboard.json View File


keyboards/cannonkeys/balance/info.json → keyboards/cannonkeys/balance/keyboard.json View File


keyboards/cannonkeys/brutalv2_65/info.json → keyboards/cannonkeys/brutalv2_65/keyboard.json View File


keyboards/cannonkeys/chimera65_hs/info.json → keyboards/cannonkeys/chimera65_hs/keyboard.json View File


keyboards/cannonkeys/cloudline/info.json → keyboards/cannonkeys/cloudline/keyboard.json View File


keyboards/cannonkeys/crin/info.json → keyboards/cannonkeys/crin/keyboard.json View File


keyboards/cannonkeys/devastatingtkl/info.json → keyboards/cannonkeys/devastatingtkl/keyboard.json View File


keyboards/cannonkeys/ellipse/info.json → keyboards/cannonkeys/ellipse/keyboard.json View File


keyboards/cannonkeys/ellipse_hs/info.json → keyboards/cannonkeys/ellipse_hs/keyboard.json View File


keyboards/cannonkeys/gentoo/info.json → keyboards/cannonkeys/gentoo/keyboard.json View File


keyboards/cannonkeys/gentoo_hs/info.json → keyboards/cannonkeys/gentoo_hs/keyboard.json View File


keyboards/cannonkeys/instant60/info.json → keyboards/cannonkeys/instant60/keyboard.json View File


keyboards/cannonkeys/instant65/info.json → keyboards/cannonkeys/instant65/keyboard.json View File


keyboards/cannonkeys/is0gr/info.json → keyboards/cannonkeys/is0gr/keyboard.json View File


keyboards/cannonkeys/leviatan/info.json → keyboards/cannonkeys/leviatan/keyboard.json View File


keyboards/cannonkeys/malicious_ergo/info.json → keyboards/cannonkeys/malicious_ergo/keyboard.json View File


keyboards/cannonkeys/meetuppad2023/info.json → keyboards/cannonkeys/meetuppad2023/keyboard.json View File


keyboards/cannonkeys/moment/info.json → keyboards/cannonkeys/moment/keyboard.json View File


keyboards/cannonkeys/moment_hs/info.json → keyboards/cannonkeys/moment_hs/keyboard.json View File


keyboards/cannonkeys/obliterated75/info.json → keyboards/cannonkeys/obliterated75/keyboard.json View File


keyboards/cannonkeys/onyx/info.json → keyboards/cannonkeys/onyx/keyboard.json View File


keyboards/cannonkeys/rekt1800/info.json → keyboards/cannonkeys/rekt1800/keyboard.json View File


keyboards/cannonkeys/ripple/info.json → keyboards/cannonkeys/ripple/keyboard.json View File


keyboards/cannonkeys/ripple_hs/info.json → keyboards/cannonkeys/ripple_hs/keyboard.json View File


keyboards/cannonkeys/sagittarius/info.json → keyboards/cannonkeys/sagittarius/keyboard.json View File


keyboards/cannonkeys/satisfaction75_hs/info.json → keyboards/cannonkeys/satisfaction75_hs/keyboard.json View File


keyboards/cannonkeys/savage65/info.json → keyboards/cannonkeys/savage65/keyboard.json View File


keyboards/cannonkeys/serenity/info.json → keyboards/cannonkeys/serenity/keyboard.json View File


keyboards/cannonkeys/tmov2/info.json → keyboards/cannonkeys/tmov2/keyboard.json View File


keyboards/cannonkeys/tsukuyomi/info.json → keyboards/cannonkeys/tsukuyomi/keyboard.json View File


keyboards/cannonkeys/vector/info.json → keyboards/cannonkeys/vector/keyboard.json View File


keyboards/cannonkeys/vicious40/info.json → keyboards/cannonkeys/vicious40/keyboard.json View File


keyboards/cantor/info.json → keyboards/cantor/keyboard.json View File


keyboards/centromere/info.json → keyboards/centromere/keyboard.json View File


keyboards/checkerboards/phoenix45_ortho/info.json → keyboards/checkerboards/phoenix45_ortho/keyboard.json View File


keyboards/checkerboards/quark/info.json → keyboards/checkerboards/quark/keyboard.json View File


keyboards/checkerboards/quark_squared/info.json → keyboards/checkerboards/quark_squared/keyboard.json View File


keyboards/cipulot/ec_23u/info.json → keyboards/cipulot/ec_23u/keyboard.json View File


keyboards/cipulot/ec_60/info.json → keyboards/cipulot/ec_60/keyboard.json View File


keyboards/cipulot/ec_alveus/1_0_0/info.json → keyboards/cipulot/ec_alveus/1_0_0/keyboard.json View File


keyboards/cipulot/ec_alveus/1_2_0/info.json → keyboards/cipulot/ec_alveus/1_2_0/keyboard.json View File


keyboards/cipulot/ec_pro2/info.json → keyboards/cipulot/ec_pro2/keyboard.json View File


keyboards/cipulot/ec_prox/ansi_iso/info.json → keyboards/cipulot/ec_prox/ansi_iso/keyboard.json View File


keyboards/cipulot/ec_prox/jis/info.json → keyboards/cipulot/ec_prox/jis/keyboard.json View File


keyboards/cipulot/ec_theca/info.json → keyboards/cipulot/ec_theca/keyboard.json View File


keyboards/cipulot/ec_typek/info.json → keyboards/cipulot/ec_typek/keyboard.json View File


keyboards/cipulot/mnk_60_ec/info.json → keyboards/cipulot/mnk_60_ec/keyboard.json View File


keyboards/cipulot/mnk_65_ec/info.json → keyboards/cipulot/mnk_65_ec/keyboard.json View File


keyboards/cipulot/rf_r1_8_9xu/info.json → keyboards/cipulot/rf_r1_8_9xu/keyboard.json View File


keyboards/clueboard/2x1800/2021/info.json → keyboards/clueboard/2x1800/2021/keyboard.json View File


keyboards/clueboard/60/info.json → keyboards/clueboard/60/keyboard.json View File


keyboards/controllerworks/city42/info.json → keyboards/controllerworks/city42/keyboard.json View File


keyboards/controllerworks/mini36/info.json → keyboards/controllerworks/mini36/keyboard.json View File


keyboards/controllerworks/mini42/info.json → keyboards/controllerworks/mini42/keyboard.json View File


keyboards/converter/hp_46010a/info.json → keyboards/converter/hp_46010a/keyboard.json View File


keyboards/converter/ibm_terminal/info.json → keyboards/converter/ibm_terminal/keyboard.json View File


keyboards/converter/m0110_usb/info.json → keyboards/converter/m0110_usb/keyboard.json View File


keyboards/converter/siemens_tastatur/info.json → keyboards/converter/siemens_tastatur/keyboard.json View File


keyboards/converter/usb_usb/ble/info.json → keyboards/converter/usb_usb/ble/keyboard.json View File

@ -2,5 +2,11 @@
"bootloader": "caterina",
"bluetooth": {
"driver": "bluefruit_le"
},
"build": {
"lto": true
},
"features":{
"bluetooth": true
}
}

+ 0
- 4
keyboards/converter/usb_usb/ble/rules.mk View File

@ -1,6 +1,2 @@
# Processor frequency
F_CPU = 8000000
EXTRAKEY_ENABLE = no
BLUETOOTH_ENABLE = yes
LTO_ENABLE = yes

keyboards/converter/usb_usb/pro_micro/info.json → keyboards/converter/usb_usb/pro_micro/keyboard.json View File


keyboards/converter/xmk/info.json → keyboards/converter/xmk/keyboard.json View File


keyboards/converter/xt_usb/info.json → keyboards/converter/xt_usb/keyboard.json View File


keyboards/coseyfannitutti/discipline/info.json → keyboards/coseyfannitutti/discipline/keyboard.json View File


keyboards/coseyfannitutti/mysterium/info.json → keyboards/coseyfannitutti/mysterium/keyboard.json View File


keyboards/cozykeys/speedo/v3/info.json → keyboards/cozykeys/speedo/v3/keyboard.json View File

@ -36,6 +36,7 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"pin_compatible": "elite_c",
"features": {
"bootmagic": false,
"mousekey": true,

+ 0
- 1
keyboards/cozykeys/speedo/v3/rules.mk View File

@ -1 +0,0 @@
PIN_COMPATIBLE = elite_c

keyboards/crimsonkeyboards/resume1800/info.json → keyboards/crimsonkeyboards/resume1800/keyboard.json View File


keyboards/crypt_macro/info.json → keyboards/crypt_macro/keyboard.json View File


keyboards/custommk/cmk11/info.json → keyboards/custommk/cmk11/keyboard.json View File


keyboards/custommk/ergostrafer/info.json → keyboards/custommk/ergostrafer/keyboard.json View File


keyboards/custommk/evo70_r2/info.json → keyboards/custommk/evo70_r2/keyboard.json View File


keyboards/fallacy/info.json → keyboards/fallacy/keyboard.json View File


keyboards/fc660c/info.json → keyboards/fc660c/keyboard.json View File


keyboards/fc980c/info.json → keyboards/fc980c/keyboard.json View File


keyboards/ferris/0_1/info.json → keyboards/ferris/0_1/keyboard.json View File


keyboards/ferris/0_2/bling/info.json → keyboards/ferris/0_2/bling/keyboard.json View File


+ 0
- 0
keyboards/ferris/0_2/bling/rules.mk View File


keyboards/fjlabs/7vhotswap/info.json → keyboards/fjlabs/7vhotswap/keyboard.json View File


keyboards/fjlabs/ad65/info.json → keyboards/fjlabs/ad65/keyboard.json View File


keyboards/fjlabs/avalon/info.json → keyboards/fjlabs/avalon/keyboard.json View File


keyboards/fjlabs/bks65/info.json → keyboards/fjlabs/bks65/keyboard.json View File


keyboards/fjlabs/bks65solder/info.json → keyboards/fjlabs/bks65solder/keyboard.json View File


keyboards/fjlabs/bolsa65/info.json → keyboards/fjlabs/bolsa65/keyboard.json View File


keyboards/fjlabs/kf87/info.json → keyboards/fjlabs/kf87/keyboard.json View File


keyboards/fjlabs/kyuu/info.json → keyboards/fjlabs/kyuu/keyboard.json View File


keyboards/fjlabs/ldk65/info.json → keyboards/fjlabs/ldk65/keyboard.json View File


keyboards/fjlabs/midway60/info.json → keyboards/fjlabs/midway60/keyboard.json View File


keyboards/fjlabs/mk61rgbansi/info.json → keyboards/fjlabs/mk61rgbansi/keyboard.json View File


keyboards/fjlabs/peaker/info.json → keyboards/fjlabs/peaker/keyboard.json View File


keyboards/fjlabs/polaris/info.json → keyboards/fjlabs/polaris/keyboard.json View File


keyboards/fjlabs/ready100/info.json → keyboards/fjlabs/ready100/keyboard.json View File


keyboards/fjlabs/sinanju/info.json → keyboards/fjlabs/sinanju/keyboard.json View File


keyboards/fjlabs/sinanjuwk/info.json → keyboards/fjlabs/sinanjuwk/keyboard.json View File


keyboards/fjlabs/solanis/info.json → keyboards/fjlabs/solanis/keyboard.json View File


keyboards/fjlabs/swordfish/info.json → keyboards/fjlabs/swordfish/keyboard.json View File


Some files were not shown because too many files changed in this diff

Write Preview
Loading…
Cancel
Save