Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove converter assumption that everything is a promicro #20330

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions builddefs/converters.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ ifneq ($(findstring yes, $(CTPC)$(CONVERT_TO_PROTON_C)),)
$(call CATASTROPHIC_ERROR,The `CONVERT_TO_PROTON_C` and `CTPC` options are now deprecated. `CONVERT_TO=proton_c` should be used instead.)
endif

# TODO: opt in rather than assume everything uses a pro micro
PIN_COMPATIBLE ?= promicro

# Remove whitespace from any rule.mk provided vars
# - env cannot be overwritten but cannot have whitespace anyway
CONVERT_TO:=$(strip $(CONVERT_TO))
Expand Down
3 changes: 1 addition & 2 deletions keyboards/0_sixty/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"build": {
"lto": true
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT_1x2uC": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/0xcb/tutelpad/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"matrix_pins": {
"direct": [
["E6", "D7", "B1", "B3"],
Expand Down
3 changes: 1 addition & 2 deletions keyboards/10bleoledhub/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
{"pin_a": "C7", "pin_b": "F7"}
]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/1upkeyboards/super16/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"rows": ["D1", "D0", "F4", "F5"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"community_layouts": ["ortho_4x4", "numpad_4x4"],
"layouts": {
"LAYOUT_ortho_4x4": {
Expand Down
3 changes: 1 addition & 2 deletions keyboards/1upkeyboards/sweet16/v1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@
"rows": ["F4", "F5", "F6", "F7"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina"
"development_board": "promicro",
}
3 changes: 1 addition & 2 deletions keyboards/25keys/cassette42/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"matrix_pins": {
"direct": [
["B4", "F6", "F5", "F4", "B5", "F7"]
Expand Down
3 changes: 1 addition & 2 deletions keyboards/25keys/zinc/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@
"rgb_matrix": {
"driver": "WS2812"
},
"processor": "atmega32u4",
"bootloader": "caterina"
"development_board": "promicro",
}
3 changes: 1 addition & 2 deletions keyboards/30wer/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"rows": ["E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/3keyecosystem/2key2/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
"ws2812": {
"pin": "B2"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/25/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
"split": {
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"community_layouts": ["ortho_5x5", "ortho_5x10"],
"layout_aliases": {
"LAYOUT_macro": "LAYOUT_ortho_5x5",
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/4pack/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"backlight": {
"pins": ["F6", "F7"]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"matrix_pins": {
"direct": [
["E6", "D7", "C6", "D4"]
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/4x4/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"rows": ["B2", "D1", "D0", "D4"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"community_layouts": ["ortho_4x4", "ortho_4x12"],
"layouts": {
"LAYOUT_ortho_4x4": {
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/5x5/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"rows": ["B2", "D1", "D0", "D4", "C6"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"community_layouts": ["ortho_5x5", "ortho_5x10", "ortho_5x15"],
"layouts": {
"LAYOUT_ortho_5x5": {
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/6lit/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
"split": {
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"community_layouts": ["ortho_2x3", "ortho_2x6"],
"layout_aliases": {
"LAYOUT_macro": "LAYOUT_ortho_2x3",
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/foobar/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
"split": {
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"community_layouts": ["ortho_3x10"],
"layout_aliases": {
"LAYOUT_macro": "LAYOUT_ortho_3x5",
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/gherkin/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
"backlight": {
"pin": "B5"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"community_layouts": ["ortho_3x10"],
"layouts": {
"LAYOUT_ortho_3x10": {
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/half_n_half/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
"split": {
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/i75/promicro/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"rows": ["B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"community_layouts": ["ortho_5x15"],
"layouts": {
"LAYOUT_ortho_5x15": {
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/luddite/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"ws2812": {
"pin": "B4"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT_60_ansi": {
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/mf68/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
"pin": "B5",
"breathing": true
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"community_layouts": ["68_ansi"],
"layouts": {
"LAYOUT_68_ansi": {
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/nano/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"matrix_pins": {
"direct": [
["F4", "F5", "F6", "F7"],
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/nein/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"pid": "0x9999",
"device_version": "99.9.9"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"matrix_pins": {
"direct": [
["F4", "F5", "F6"],
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/nori/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"ws2812": {
"pin": "B4"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"community_layouts": ["ortho_4x4", "ortho_4x12"],
"layouts": {
"LAYOUT_ortho_4x4": {
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/polyandry/promicro/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"rows": ["D7"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT_ortho_4x3": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/sixpack/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"num_lock": "D5",
"on_state": 0
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"matrix_pins": {
"direct": [
["D4", "C6", "D7"],
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/tomato/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
"rows": ["F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"community_layouts": ["ortho_3x10"],
"layouts": {
"LAYOUT_ortho_3x10": {
Expand Down
3 changes: 1 addition & 2 deletions keyboards/40percentclub/ut47/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"pid": "0x7574",
"device_version": "0.0.1"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/4by3/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"rows": ["D1", "D0", "D4"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layout_aliases": {
"LAYOUT": "LAYOUT_horizontal"
},
Expand Down
3 changes: 1 addition & 2 deletions keyboards/8pack/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"ws2812": {
"pin": "D2"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"matrix_pins": {
"direct": [
["F4", "F5", "F6", "F7"],
Expand Down
3 changes: 1 addition & 2 deletions keyboards/9key/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
"rows": ["D1", "D0", "D4"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/adkb96/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
"split": {
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_6x16"
},
Expand Down
3 changes: 1 addition & 2 deletions keyboards/adpenrose/akemipad/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
{"pin_a": "B1", "pin_b": "B3"}
]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT_all": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/adpenrose/obi/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
{"pin_a": "F1", "pin_b": "F0"}
]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT_all": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/afternoonlabs/breeze/rev0/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"bootmagic": {
"matrix": [0, 5]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/afternoonlabs/breeze/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"bootmagic": {
"matrix": [0, 5]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/afternoonlabs/gust/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"rows": ["F5", "F4", "D0"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/afternoonlabs/oceanbreeze/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"bootmagic": {
"matrix": [0, 5]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/afternoonlabs/southern_breeze/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"bootmagic": {
"matrix": [0, 5]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
3 changes: 1 addition & 2 deletions keyboards/afternoonlabs/summer_breeze/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"bootmagic": {
"matrix": [0, 5]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
Loading