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

Fix a handful of CLI errors #20321

Merged
merged 1 commit into from
Apr 3, 2023
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 46 additions & 46 deletions keyboards/frobiac/redtilt/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,59 +34,59 @@
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "label":"", "x":0, "y":2},
{"matrix": [0, 1], "label":"K", "x":1, "y":2},
{"matrix": [0, 2], "label":"U", "x":2, "y":1.5},
{"matrix": [0, 3], "label":"Q", "x":3, "y":1},
{"matrix": [0, 4], "label":".", "x":4, "y":1},
{"matrix": [0, 5], "label":"J", "x":5, "y":1},
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0.5},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},

{"matrix": [4, 0], "label":"P", "x":8, "y":1},
{"matrix": [4, 1], "label":"C", "x":9, "y":1},
{"matrix": [4, 2], "label":"L", "x":10, "y":1},
{"matrix": [4, 3], "label":"M", "x":11, "y":1.5},
{"matrix": [4, 4], "label":"F", "x":12, "y":2},
{"matrix": [4, 5], "label":"", "x":13, "y":2},
{"matrix": [4, 0], "x": 7, "y": 0},
{"matrix": [4, 1], "x": 8, "y": 0},
{"matrix": [4, 2], "x": 9, "y": 0},
{"matrix": [4, 3], "x": 10, "y": 0.5},
{"matrix": [4, 4], "x": 11, "y": 0},
{"matrix": [4, 5], "x": 12, "y": 0},

{"matrix": [1, 0], "label":" ", "x":0, "y":3},
{"matrix": [1, 1], "label":"H", "x":1, "y":3},
{"matrix": [1, 2], "label":"I", "x":2, "y":2.5},
{"matrix": [1, 3], "label":"E", "x":3, "y":2},
{"matrix": [1, 4], "label":"A", "x":4, "y":2},
{"matrix": [1, 5], "label":"O", "x":5, "y":2},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1.5},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [1, 5], "x": 5, "y": 1},

{"matrix": [5, 0], "label":"D", "x":8, "y":2},
{"matrix": [5, 1], "label":"T", "x":9, "y":2},
{"matrix": [5, 2], "label":"R", "x":10, "y":2},
{"matrix": [5, 3], "label":"N", "x":11, "y":2.5},
{"matrix": [5, 4], "label":"S", "x":12, "y":3},
{"matrix": [5, 5], "label":"", "x":13, "y":3},
{"matrix": [5, 0], "x": 7, "y": 1},
{"matrix": [5, 1], "x": 8, "y": 1},
{"matrix": [5, 2], "x": 9, "y": 1},
{"matrix": [5, 3], "x": 10, "y": 1.5},
{"matrix": [5, 4], "x": 11, "y": 1},
{"matrix": [5, 5], "x": 12, "y": 1},

{"matrix": [2, 0], "label":"", "x":0, "y":4},
{"matrix": [2, 1], "label":"X", "x":1, "y":4},
{"matrix": [2, 2], "label":"Y", "x":2, "y":3.5},
{"matrix": [2, 3], "label":"-", "x":3, "y":3},
{"matrix": [2, 4], "label":",", "x":4, "y":3},
{"matrix": [2, 5], "label":"/", "x":5, "y":3},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2.5},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [2, 5], "x": 5, "y": 2},

{"matrix": [6, 0], "label":"B", "x":8, "y":3},
{"matrix": [6, 1], "label":"G", "x":9, "y":3},
{"matrix": [6, 2], "label":"W", "x":10, "y":3},
{"matrix": [6, 3], "label":"V", "x":11, "y":3.5},
{"matrix": [6, 4], "label":"Z", "x":12, "y":4},
{"matrix": [6, 5], "label":"", "x":13, "y":4},
{"matrix": [6, 0], "x": 7, "y": 2},
{"matrix": [6, 1], "x": 8, "y": 2},
{"matrix": [6, 2], "x": 9, "y": 2},
{"matrix": [6, 3], "x": 10, "y": 2.5},
{"matrix": [6, 4], "x": 11, "y": 2},
{"matrix": [6, 5], "x": 12, "y": 2},

{"matrix": [3, 0], "label":"", "x":0, "y":1},
{"matrix": [3, 1], "label":"", "x":1, "y":1},
{"matrix": [3, 3], "label":"Gui", "x":3, "y":4},
{"matrix": [3, 4], "label":"Tab", "x":4, "y":4},
{"matrix": [3, 5], "label":"Spc", "x":5, "y":4},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [3, 4], "x": 4, "y": 3},
{"matrix": [3, 5], "x": 5, "y": 3},

{"matrix": [7, 0], "label":"L2", "x":8, "y":4},
{"matrix": [7, 1], "label":"Sh", "x":9, "y":4},
{"matrix": [7, 2], "label":"L3", "x":10, "y":4},
{"matrix": [7, 4], "label":"Fx", "x":12, "y":1},
{"matrix": [7, 5], "label":"", "x":13, "y":1}
{"matrix": [7, 0], "x": 7, "y": 3},
{"matrix": [7, 1], "x": 8, "y": 3},
{"matrix": [7, 2], "x": 9, "y": 3},
{"matrix": [7, 4], "x": 11, "y": 3},
{"matrix": [7, 5], "x": 12, "y": 3}
]
}
}
Expand Down
3 changes: 0 additions & 3 deletions keyboards/handwired/tractyl_manuform/5x6_right/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once


#define DIODE_DIRECTION COL2ROW

#define ROTATIONAL_TRANSFORM_ANGLE -25
#define POINTING_DEVICE_INVERT_X

Expand Down
13 changes: 0 additions & 13 deletions keyboards/lfkeyboards/lfk78/revj/config.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
#pragma once

/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { D2, D3, D4, D5, D6 }
#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, E6, E7, F0, F1, F2, F3, C0, C1, C2, C3 }

#define RGBLED_NUM 27
6 changes: 6 additions & 0 deletions keyboards/lily58/glow_enc/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x0059",
"device_version": "1.0.0"
},
"features": {
"encoder": true,
"oled": true,
"rgblight": true
},
"matrix_pins": {
"cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["C6", "D7", "E6", "B4", "B5"]
Expand All @@ -19,6 +24,7 @@
]
},
"split": {
"enabled": true,
"soft_serial_pin": "D2",
"encoder": {
"right": {
Expand Down
9 changes: 1 addition & 8 deletions keyboards/lily58/glow_enc/rules.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
ENCODER_ENABLE = yes # ENables the use of one or more encoders
RGBLIGHT_ENABLE = yes # Enable keyboard RGB light
LTO_ENABLE = yes # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features
BOOTMAGIC_ENABLE = no
RGB_MATRIX_ENABLE = no # Per key rgb leds

# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
LTO_ENABLE = yes
7 changes: 7 additions & 0 deletions keyboards/lily58/light/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
"pid": "0x4C4C",
"device_version": "1.0.0"
},
"features": {
"bootmagic": true,
"encoder": true,
"oled": true,
"rgblight": true
},
"matrix_pins": {
"cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["C6", "D7", "E6", "B4", "B5"]
Expand All @@ -19,6 +25,7 @@
]
},
"split": {
"enabled": true,
"soft_serial_pin": "D2",
"encoder": {
"right": {
Expand Down
4 changes: 1 addition & 3 deletions keyboards/lily58/light/rules.mk
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
ENCODER_ENABLE = yes # ENables the use of one or more encoders
RGBLIGHT_ENABLE = yes # Enable keyboard RGB light
LTO_ENABLE = yes # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features
LTO_ENABLE = yes
4 changes: 4 additions & 0 deletions keyboards/lily58/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@
"pid": "0xEB2D",
"device_version": "1.0.0"
},
"features": {
"oled": true
},
"matrix_pins": {
"cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["C6", "D7", "E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
Expand Down
16 changes: 1 addition & 15 deletions keyboards/lily58/rules.mk
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # 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.
OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # OLED display
SPLIT_KEYBOARD = yes
OLED_DRIVER = SSD1306

DEFAULT_FOLDER = lily58/rev1
4 changes: 0 additions & 4 deletions keyboards/maple_computing/ivy/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once


/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
Expand Down
8 changes: 0 additions & 8 deletions keyboards/maple_computing/launchpad/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once


/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
Expand All @@ -41,7 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

#ifdef SUBPROJECT_rev1
#include "rev1/config.h"
#endif
3 changes: 0 additions & 3 deletions keyboards/nightly_boards/n40_o/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

#define RGB_DI_PIN B4
#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
Expand Down
Loading