Browse Source

Miscellaneous keyboard.json migrations (#23378)

Joel Challis 2 years ago
parent
commit
f29daff9b6
62 changed files with 57 additions and 185 deletions
  1. 0 0
      keyboards/canary/canary60rgb/v1/keyboard.json
  2. 0 1
      keyboards/canary/canary60rgb/v1/rules.mk
  3. 0 0
      keyboards/canary/canary60rgb/v1/v1.c
  4. 0 0
      keyboards/handwired/qc60/proto/keyboard.json
  5. 0 1
      keyboards/handwired/qc60/proto/rules.mk
  6. 0 0
      keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json
  7. 0 0
      keyboards/handwired/stef9998/split_5x7/rev1/rev1.c
  8. 4 0
      keyboards/junco/rev1/keyboard.json
  9. 1 0
      keyboards/junco/rev1/rules.mk
  10. 0 8
      keyboards/junco/rules.mk
  11. 0 0
      keyboards/keaboard/rev1/keyboard.json
  12. 0 1
      keyboards/keaboard/rev1/rules.mk
  13. 0 0
      keyboards/melgeek/mj65/rev3/config.h
  14. 7 0
      keyboards/melgeek/mj65/rev3/keyboard.json
  15. 0 13
      keyboards/melgeek/mj65/rev3/rules.mk
  16. 3 0
      keyboards/melgeek/mojo68/rev1/config.h
  17. 0 0
      keyboards/melgeek/mojo68/rev1/keyboard.json
  18. 0 1
      keyboards/melgeek/mojo68/rev1/rules.mk
  19. 0 0
      keyboards/melgeek/mojo75/rev1/config.h
  20. 0 0
      keyboards/melgeek/mojo75/rev1/keyboard.json
  21. 0 1
      keyboards/melgeek/mojo75/rev1/rules.mk
  22. 0 20
      keyboards/melgeek/tegic/config.h
  23. 0 0
      keyboards/melgeek/tegic/rev1/config.h
  24. 0 0
      keyboards/melgeek/tegic/rev1/keyboard.json
  25. 0 1
      keyboards/melgeek/tegic/rev1/rules.mk
  26. 0 0
      keyboards/melgeek/z70ultra/rev1/config.h
  27. 0 0
      keyboards/melgeek/z70ultra/rev1/keyboard.json
  28. 0 0
      keyboards/melgeek/z70ultra/rev1/rev1.c
  29. 0 1
      keyboards/melgeek/z70ultra/rev1/rules.mk
  30. 0 20
      keyboards/miiiw/blackio83/config.h
  31. 3 0
      keyboards/miiiw/blackio83/rev_0100/config.h
  32. 0 0
      keyboards/miiiw/blackio83/rev_0100/halconf.h
  33. 0 0
      keyboards/miiiw/blackio83/rev_0100/keyboard.json
  34. 0 0
      keyboards/miiiw/blackio83/rev_0100/matrix.c
  35. 0 0
      keyboards/miiiw/blackio83/rev_0100/mcuconf.h
  36. 1 1
      keyboards/miiiw/blackio83/rev_0100/rev_0100.c
  37. 0 0
      keyboards/miiiw/blackio83/rev_0100/rev_0100.h
  38. 0 2
      keyboards/miiiw/blackio83/rev_0100/rules.mk
  39. 0 0
      keyboards/murcielago/rev1/keyboard.json
  40. 0 1
      keyboards/murcielago/rev1/rules.mk
  41. 0 0
      keyboards/polilla/rev1/chconf.h
  42. 0 22
      keyboards/polilla/rev1/config.h
  43. 0 0
      keyboards/polilla/rev1/halconf.h
  44. 6 0
      keyboards/polilla/rev1/keyboard.json
  45. 0 0
      keyboards/polilla/rev1/mcuconf.h
  46. 0 1
      keyboards/polilla/rev1/rules.mk
  47. 0 5
      keyboards/qwertyydox/rev1/config.h
  48. 10 0
      keyboards/qwertyydox/rev1/keyboard.json
  49. 0 0
      keyboards/qwertyydox/rev1/rules.mk
  50. 0 15
      keyboards/qwertyydox/rules.mk
  51. 0 39
      keyboards/spacetime/config.h
  52. 6 0
      keyboards/spacetime/info.json
  53. 1 0
      keyboards/spacetime/rev1/keyboard.json
  54. 0 1
      keyboards/spacetime/rev1/rules.mk
  55. 0 0
      keyboards/splitty/rev1/config.h
  56. 7 0
      keyboards/splitty/rev1/keyboard.json
  57. 0 0
      keyboards/splitty/rev1/rules.mk
  58. 0 15
      keyboards/splitty/rules.mk
  59. 2 0
      keyboards/woodkeys/meira/featherble/keyboard.json
  60. 3 2
      keyboards/woodkeys/meira/info.json
  61. 3 0
      keyboards/woodkeys/meira/promicro/keyboard.json
  62. 0 13
      keyboards/woodkeys/meira/rules.mk

+ 0 - 0
keyboards/canary/canary60rgb/info.json → keyboards/canary/canary60rgb/v1/keyboard.json


+ 0 - 1
keyboards/canary/canary60rgb/v1/rules.mk

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

+ 0 - 0
keyboards/canary/canary60rgb/canary60rgb.c → keyboards/canary/canary60rgb/v1/v1.c


+ 0 - 0
keyboards/handwired/qc60/info.json → keyboards/handwired/qc60/proto/keyboard.json


+ 0 - 1
keyboards/handwired/qc60/proto/rules.mk

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

+ 0 - 0
keyboards/handwired/stef9998/split_5x7/info.json → keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json


+ 0 - 0
keyboards/handwired/stef9998/split_5x7/split_5x7.c → keyboards/handwired/stef9998/split_5x7/rev1/rev1.c


+ 4 - 0
keyboards/junco/info.json → keyboards/junco/rev1/keyboard.json

@@ -8,6 +8,9 @@
         "pid": "0x4A13",
         "device_version": "1.0.0"
     },
+    "features": {
+        "bootmagic": true
+    },
     "matrix_pins": {
         "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7"],
         "rows": ["GP8", "GP9", "GP10", "GP11", "GP12"]
@@ -28,6 +31,7 @@
         ]
     },
     "split": {
+        "enabled": true,
         "encoder": {
             "right": {
                 "rotary": [

+ 1 - 0
keyboards/junco/rev1/rules.mk

@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor

+ 0 - 8
keyboards/junco/rules.mk

@@ -1,9 +1 @@
-# Split Keyboard Stuff
-SPLIT_KEYBOARD = yes
-SERIAL_DRIVER = vendor
-
-# Enable Bootmagic Lite
-BOOTMAGIC_ENABLE = yes
-
-# Default Folder
 DEFAULT_FOLDER = junco/rev1

+ 0 - 0
keyboards/keaboard/info.json → keyboards/keaboard/rev1/keyboard.json


+ 0 - 1
keyboards/keaboard/rev1/rules.mk

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

+ 0 - 0
keyboards/melgeek/mj65/config.h → keyboards/melgeek/mj65/rev3/config.h


+ 7 - 0
keyboards/melgeek/mj65/info.json → keyboards/melgeek/mj65/rev3/keyboard.json

@@ -8,6 +8,13 @@
         "pid": "0x0065",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "animations": {
             "alphas_mods": true,

+ 0 - 13
keyboards/melgeek/mj65/rev3/rules.mk

@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes          # Mouse keys
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-CONSOLE_ENABLE = no            # Console for debug
-COMMAND_ENABLE = no            # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-
 RGB_MATRIX_SUPPORTED = yes
 RGBLIGHT_SUPPORTED   = no
 BACKLIGHT_SUPPORTED  = no

+ 3 - 0
keyboards/melgeek/mojo68/rev1/config.h

@@ -16,4 +16,7 @@
 
 #pragma once
 
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_SDB_PIN B7
+
 #define DRIVER_INDICATOR_LED_TOTAL 3

+ 0 - 0
keyboards/melgeek/mojo68/info.json → keyboards/melgeek/mojo68/rev1/keyboard.json


+ 0 - 1
keyboards/melgeek/mojo68/rev1/rules.mk

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

+ 0 - 0
keyboards/melgeek/mojo75/config.h → keyboards/melgeek/mojo75/rev1/config.h


+ 0 - 0
keyboards/melgeek/mojo75/info.json → keyboards/melgeek/mojo75/rev1/keyboard.json


+ 0 - 1
keyboards/melgeek/mojo75/rev1/rules.mk

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

+ 0 - 20
keyboards/melgeek/tegic/config.h

@@ -1,20 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#define IS31FL3741_SDB_PIN B7

+ 0 - 0
keyboards/melgeek/mojo68/config.h → keyboards/melgeek/tegic/rev1/config.h


+ 0 - 0
keyboards/melgeek/tegic/info.json → keyboards/melgeek/tegic/rev1/keyboard.json


+ 0 - 1
keyboards/melgeek/tegic/rev1/rules.mk

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

+ 0 - 0
keyboards/melgeek/z70ultra/config.h → keyboards/melgeek/z70ultra/rev1/config.h


+ 0 - 0
keyboards/melgeek/z70ultra/info.json → keyboards/melgeek/z70ultra/rev1/keyboard.json


+ 0 - 0
keyboards/melgeek/z70ultra/z70ultra.c → keyboards/melgeek/z70ultra/rev1/rev1.c


+ 0 - 1
keyboards/melgeek/z70ultra/rev1/rules.mk

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

+ 0 - 20
keyboards/miiiw/blackio83/config.h

@@ -1,20 +0,0 @@
-/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// EEPROM i2c chip
-#define EEPROM_I2C_24LC256

+ 3 - 0
keyboards/miiiw/blackio83/rev_0100/config.h

@@ -16,6 +16,9 @@
 
 #pragma once
 
+// EEPROM i2c chip
+#define EEPROM_I2C_24LC256
+
 #define POWER_SWITCH_PIN B0
 
 /* 16 with dummy columns for shift registers */

+ 0 - 0
keyboards/miiiw/blackio83/halconf.h → keyboards/miiiw/blackio83/rev_0100/halconf.h


+ 0 - 0
keyboards/miiiw/blackio83/info.json → keyboards/miiiw/blackio83/rev_0100/keyboard.json


+ 0 - 0
keyboards/miiiw/blackio83/matrix.c → keyboards/miiiw/blackio83/rev_0100/matrix.c


+ 0 - 0
keyboards/miiiw/blackio83/mcuconf.h → keyboards/miiiw/blackio83/rev_0100/mcuconf.h


+ 1 - 1
keyboards/miiiw/blackio83/blackio83.c → keyboards/miiiw/blackio83/rev_0100/rev_0100.c

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "blackio83.h"
+#include "rev_0100.h"
 #include "usb_main.h"
 #include "usb_util.h"
 

+ 0 - 0
keyboards/miiiw/blackio83/blackio83.h → keyboards/miiiw/blackio83/rev_0100/rev_0100.h


+ 0 - 2
keyboards/miiiw/blackio83/rev_0100/rules.mk

@@ -1,7 +1,5 @@
 CUSTOM_MATRIX = lite
 
-WS2812_DRIVER_REQUIRED := yes
-
 # Project specific files
 SRC += matrix.c \
 	   common/shift_register.c

+ 0 - 0
keyboards/murcielago/info.json → keyboards/murcielago/rev1/keyboard.json


+ 0 - 1
keyboards/murcielago/rev1/rules.mk

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

+ 0 - 0
keyboards/polilla/chconf.h → keyboards/polilla/rev1/chconf.h


+ 0 - 22
keyboards/polilla/rev1/config.h

@@ -16,26 +16,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

+ 0 - 0
keyboards/polilla/halconf.h → keyboards/polilla/rev1/halconf.h


+ 6 - 0
keyboards/polilla/info.json → keyboards/polilla/rev1/keyboard.json

@@ -23,6 +23,12 @@
     "diode_direction": "ROW2COL",
     "processor": "STM32F042",
     "bootloader": "stm32-dfu",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

+ 0 - 0
keyboards/polilla/mcuconf.h → keyboards/polilla/rev1/mcuconf.h


+ 0 - 1
keyboards/polilla/rev1/rules.mk

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

+ 0 - 5
keyboards/qwertyydox/config.h → keyboards/qwertyydox/rev1/config.h

@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define MOUSEKEY_DELAY             150
 #define MOUSEKEY_INTERVAL          20
 #define MOUSEKEY_MAX_SPEED         10

+ 10 - 0
keyboards/qwertyydox/info.json → keyboards/qwertyydox/rev1/keyboard.json

@@ -9,6 +9,9 @@
     "pid": "0x1256",
     "device_version": "1.0.0"
   },
+  "features": {
+    "mousekey": true
+  },
   "matrix_pins": {
     "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"],
     "rows": ["B6", "B2", "B3", "B1"]
@@ -36,8 +39,15 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D0"
   },
+  "qmk": {
+    "locking": {
+        "enabled": true,
+        "resync": true
+    }
+  },
   "bootloader": "caterina",
   "processor": "atmega32u4",
   "layouts": {

+ 0 - 0
keyboards/qwertyydox/rev1/rules.mk


+ 0 - 15
keyboards/qwertyydox/rules.mk

@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = qwertyydox/rev1

+ 0 - 39
keyboards/spacetime/config.h

@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Kyle Terry
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

+ 6 - 0
keyboards/spacetime/info.json

@@ -16,6 +16,12 @@
     "mousekey": true,
     "nkro": false
   },
+  "qmk": {
+    "locking": {
+        "enabled": true,
+        "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
     "rows": ["D4", "C6", "D7", "E6"]

+ 1 - 0
keyboards/spacetime/rev1/keyboard.json

@@ -0,0 +1 @@
+{}

+ 0 - 1
keyboards/spacetime/rev1/rules.mk

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

+ 0 - 0
keyboards/splitty/config.h → keyboards/splitty/rev1/config.h


+ 7 - 0
keyboards/splitty/info.json → keyboards/splitty/rev1/keyboard.json

@@ -8,6 +8,13 @@
     "pid": "0x6052",
     "device_version": "0.0.1"
   },
+  "features": {
+    "mousekey": true,
+    "extrakey": true
+  },
+  "split": {
+    "enabled": true
+  },
   "matrix_pins": {
     "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"],
     "rows": ["F0", "F1", "D4", "D5", "D6"]

+ 0 - 0
keyboards/splitty/rev1/rules.mk


+ 0 - 15
keyboards/splitty/rules.mk

@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = splitty/rev1

+ 2 - 0
keyboards/woodkeys/meira/featherble/info.json → keyboards/woodkeys/meira/featherble/keyboard.json

@@ -1,4 +1,6 @@
 {
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "bluetooth": {
         "driver": "bluefruit_le"
     }

+ 3 - 2
keyboards/woodkeys/meira/info.json

@@ -8,8 +8,9 @@
         "pid": "0x6061",
         "device_version": "0.0.1"
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "features": {
+        "extrakey": true
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_ortho_4x12"
     },

+ 3 - 0
keyboards/woodkeys/meira/promicro/keyboard.json

@@ -0,0 +1,3 @@
+{
+    "development_board": "promicro"
+}

+ 0 - 13
keyboards/woodkeys/meira/rules.mk

@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = yes
 SRC += matrix.c