From 2a8ccafe6e704eced2d383810e1061613871433e Mon Sep 17 00:00:00 2001 From: Wilba Date: Wed, 11 Mar 2020 05:34:19 +1100 Subject: [PATCH] Refactor Equinox PCB revisions (#8266) * Refactor Equinox PCB revisions * typo --- .../ai03/equinox/keymaps/proto_via/keymap.c | 49 ------------------- .../ai03/equinox/keymaps/proto_via/readme.md | 4 -- .../ai03/equinox/keymaps/proto_via/rules.mk | 5 -- .../{keymaps/proto_via => rev0}/config.h | 4 ++ keyboards/ai03/equinox/rev0/rules.mk | 1 + keyboards/ai03/equinox/rev1/config.h | 18 +++++++ keyboards/ai03/equinox/rev1/rules.mk | 1 + 7 files changed, 24 insertions(+), 58 deletions(-) delete mode 100644 keyboards/ai03/equinox/keymaps/proto_via/keymap.c delete mode 100644 keyboards/ai03/equinox/keymaps/proto_via/readme.md delete mode 100644 keyboards/ai03/equinox/keymaps/proto_via/rules.mk rename keyboards/ai03/equinox/{keymaps/proto_via => rev0}/config.h (80%) create mode 100644 keyboards/ai03/equinox/rev0/rules.mk create mode 100644 keyboards/ai03/equinox/rev1/config.h create mode 100644 keyboards/ai03/equinox/rev1/rules.mk diff --git a/keyboards/ai03/equinox/keymaps/proto_via/keymap.c b/keyboards/ai03/equinox/keymaps/proto_via/keymap.c deleted file mode 100644 index ff88c354120..00000000000 --- a/keyboards/ai03/equinox/keymaps/proto_via/keymap.c +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2019 Ryota Goto - * - * 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 . - */ -#include QMK_KEYBOARD_H -/* - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K301, K302, K304, K306, K308, K309, K310, K311 \ -*/ - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( /* Base */ - MO(2), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, - KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_GRV, KC_RGUI, KC_DEL - ), - [1] = LAYOUT_all( /* Extra Keys */ - _______, _______, KC_PGUP, _______, _______, KC_LBRC, KC_RBRC, _______, KC_UP, _______, _______, _______, - _______, KC_HOME, KC_PGDN, KC_END, _______, KC_BSLS, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, - _______, _______, _______, _______, _______, KC_PSCR, KC_ESC, KC_QUOT, _______, KC_DOT, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT_all( /* Num and FN */ - _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, _______, _______, - _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT_all( /* Other */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/ai03/equinox/keymaps/proto_via/readme.md b/keyboards/ai03/equinox/keymaps/proto_via/readme.md deleted file mode 100644 index 07ef0f533cd..00000000000 --- a/keyboards/ai03/equinox/keymaps/proto_via/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# The proto via keymap for equinox - -Has the necessary tweaks to run on early prototype PCBs. -Not to be used for production run PCBs. \ No newline at end of file diff --git a/keyboards/ai03/equinox/keymaps/proto_via/rules.mk b/keyboards/ai03/equinox/keymaps/proto_via/rules.mk deleted file mode 100644 index 9aa34bbdad8..00000000000 --- a/keyboards/ai03/equinox/keymaps/proto_via/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -VIA_ENABLE = yes - -# Fix for prototype missing COL0, COL1, using backlight and RGB underglow I/O pins -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow diff --git a/keyboards/ai03/equinox/keymaps/proto_via/config.h b/keyboards/ai03/equinox/rev0/config.h similarity index 80% rename from keyboards/ai03/equinox/keymaps/proto_via/config.h rename to keyboards/ai03/equinox/rev0/config.h index 4637a3748c1..be599c12258 100644 --- a/keyboards/ai03/equinox/keymaps/proto_via/config.h +++ b/keyboards/ai03/equinox/rev0/config.h @@ -21,3 +21,7 @@ along with this program. If not, see . #undef MATRIX_COL_PINS #define MATRIX_COL_PINS { C4, B7, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 } +// This directs backlight code to use a disconnected pin, so the firwmare still has +// backlight code and VIA support even though it doesn't do anything. +#undef BACKLIGHT_PIN +#define BACKLIGHT_PIN D1 \ No newline at end of file diff --git a/keyboards/ai03/equinox/rev0/rules.mk b/keyboards/ai03/equinox/rev0/rules.mk new file mode 100644 index 00000000000..1408fb702b3 --- /dev/null +++ b/keyboards/ai03/equinox/rev0/rules.mk @@ -0,0 +1 @@ +# Dummy rules.mk, rev0 uses parent rules.mk as is \ No newline at end of file diff --git a/keyboards/ai03/equinox/rev1/config.h b/keyboards/ai03/equinox/rev1/config.h new file mode 100644 index 00000000000..dfaa2d36897 --- /dev/null +++ b/keyboards/ai03/equinox/rev1/config.h @@ -0,0 +1,18 @@ +/* +Copyright 2019 Ryota Goto + +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 diff --git a/keyboards/ai03/equinox/rev1/rules.mk b/keyboards/ai03/equinox/rev1/rules.mk new file mode 100644 index 00000000000..5e226fb5090 --- /dev/null +++ b/keyboards/ai03/equinox/rev1/rules.mk @@ -0,0 +1 @@ +# Dummy rules.mk, rev1 uses parent rules.mk as is \ No newline at end of file