From 271c7d4923f58d6e4548ff2124de2c6af11e6fb6 Mon Sep 17 00:00:00 2001 From: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> Date: Tue, 20 Apr 2021 19:23:00 +0200 Subject: [PATCH] [Keyboard] Added support for the older no_led revision (#12563) --- keyboards/infinity60/config.h | 14 -------------- keyboards/infinity60/led/config.h | 23 +++++++++++++++++++++++ keyboards/infinity60/led/readme.md | 3 +++ keyboards/infinity60/led/rules.mk | 3 +++ keyboards/infinity60/rev1/config.h | 25 +++++++++++++++++++++++++ keyboards/infinity60/rev1/readme.md | 2 ++ keyboards/infinity60/rev1/rules.mk | 0 keyboards/infinity60/rules.mk | 4 +--- 8 files changed, 57 insertions(+), 17 deletions(-) create mode 100644 keyboards/infinity60/led/config.h create mode 100644 keyboards/infinity60/led/readme.md create mode 100644 keyboards/infinity60/led/rules.mk create mode 100644 keyboards/infinity60/rev1/config.h create mode 100644 keyboards/infinity60/rev1/readme.md create mode 100644 keyboards/infinity60/rev1/rules.mk diff --git a/keyboards/infinity60/config.h b/keyboards/infinity60/config.h index 7cc5b3f91b0..e73a663b39e 100644 --- a/keyboards/infinity60/config.h +++ b/keyboards/infinity60/config.h @@ -28,20 +28,6 @@ along with this program. If not, see . #define MATRIX_ROWS 7 #define MATRIX_COLS 9 -/* - * 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 { D1, D2, D3, D4, D5, D6, D7 } -#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0 } -#define UNUSED_PINS - /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/infinity60/led/config.h b/keyboards/infinity60/led/config.h new file mode 100644 index 00000000000..5bd3b590b91 --- /dev/null +++ b/keyboards/infinity60/led/config.h @@ -0,0 +1,23 @@ +/* +Copyright 2015 Jun Wako + +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 . +*/ + +#pragma once + +// Keyboard Matrix Assignments +#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 } +#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0 } +#define UNUSED_PINS diff --git a/keyboards/infinity60/led/readme.md b/keyboards/infinity60/led/readme.md new file mode 100644 index 00000000000..d31335031fa --- /dev/null +++ b/keyboards/infinity60/led/readme.md @@ -0,0 +1,3 @@ +## Infinity 60% LED + +This revision is for the version of the infinity 60 with LEDs (rev 1.1a) diff --git a/keyboards/infinity60/led/rules.mk b/keyboards/infinity60/led/rules.mk new file mode 100644 index 00000000000..d48f3b73a59 --- /dev/null +++ b/keyboards/infinity60/led/rules.mk @@ -0,0 +1,3 @@ +# project specific files +SRC += led.c \ + led_controller.c \ No newline at end of file diff --git a/keyboards/infinity60/rev1/config.h b/keyboards/infinity60/rev1/config.h new file mode 100644 index 00000000000..d4ab34bccce --- /dev/null +++ b/keyboards/infinity60/rev1/config.h @@ -0,0 +1,25 @@ +/* +Copyright 2015 Jun Wako + +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 . +*/ + +#pragma once + +// Keyboard Matrix Assignments +#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 } +#define MATRIX_COL_PINS { B0, B1, B2, B3, B16, B17, C4, C5, D0 } +#define UNUSED_PINS + + diff --git a/keyboards/infinity60/rev1/readme.md b/keyboards/infinity60/rev1/readme.md new file mode 100644 index 00000000000..5df5cf5336b --- /dev/null +++ b/keyboards/infinity60/rev1/readme.md @@ -0,0 +1,2 @@ +## Infinity 60, initial massdrop release +This is for the initial massdrop PCBs that don't support LEDs (rev 1.03a) diff --git a/keyboards/infinity60/rev1/rules.mk b/keyboards/infinity60/rev1/rules.mk new file mode 100644 index 00000000000..e69de29bb2d diff --git a/keyboards/infinity60/rules.mk b/keyboards/infinity60/rules.mk index 595b7bfb92c..f4100174daf 100644 --- a/keyboards/infinity60/rules.mk +++ b/keyboards/infinity60/rules.mk @@ -30,9 +30,7 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output -# project specific files -SRC += led.c \ - led_controller.c +DEFAULT_FOLDER = infinity60/led LAYOUTS = 60_ansi_split_bs_rshift