diff options
| -rw-r--r-- | keyboards/rgbkb/zen/config.h | 20 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/post_rules.mk | 15 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/readme.md | 4 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/config.h | 2 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/rev1.h | 10 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev2/config.h | 11 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev2/rev2.h | 68 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/zen.c | 1 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/zen.h | 8 | 
10 files changed, 31 insertions, 110 deletions
| diff --git a/keyboards/rgbkb/zen/config.h b/keyboards/rgbkb/zen/config.h deleted file mode 100644 index 6868dc1354..0000000000 --- a/keyboards/rgbkb/zen/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2017 Danny Nguyen <[email protected]> - -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 - -#include "config_common.h" diff --git a/keyboards/rgbkb/zen/post_rules.mk b/keyboards/rgbkb/zen/post_rules.mk index 3ddb449efa..212d9e8693 100644 --- a/keyboards/rgbkb/zen/post_rules.mk +++ b/keyboards/rgbkb/zen/post_rules.mk @@ -1,14 +1,3 @@ -ifeq ($(strip $(CTPC)), yes) -  CONVERT_TO_PROTON_C=yes -endif - -ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes) -  SPLIT_KEYBOARD = no       # currently unsupported on ARM -  RGBLIGHT_ENABLE = no      # currently unsupported on ARM - -  EXTRAFLAGS += -DUSE_PROTON_C -else -  # Currently moved to Pro Micro only section because of lack of Proton-C support -  SPLIT_KEYBOARD = yes -  RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. +ifeq ($(strip $(CONVERT_TO)), proton_c) +  RGBLIGHT_ENABLE = no  # OOB incompatible with split on ARM  endif diff --git a/keyboards/rgbkb/zen/readme.md b/keyboards/rgbkb/zen/readme.md index 0a2f9e3edf..04d8a73c7a 100644 --- a/keyboards/rgbkb/zen/readme.md +++ b/keyboards/rgbkb/zen/readme.md @@ -20,8 +20,6 @@ Make example for this keyboard (after setting up your build environment):  To build for a Proton-C: -    make rgbkb/zen/rev2:default CTPC=yes - -**Note:** The Proton-C does not have split keyboard, or encoder support. Also OLED driver support is untested. Will update as status changes. +    make rgbkb/zen/rev2:default CONVERT_TO=proton_c  See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. diff --git a/keyboards/rgbkb/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h index d41ffa477d..31bfe2bcbe 100644 --- a/keyboards/rgbkb/zen/rev1/config.h +++ b/keyboards/rgbkb/zen/rev1/config.h @@ -17,6 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #pragma once +#include "config_common.h" +  /* USB Device descriptor parameter */  #define VENDOR_ID       0xFEED  #define PRODUCT_ID      0x3060 diff --git a/keyboards/rgbkb/zen/rev1/rev1.h b/keyboards/rgbkb/zen/rev1/rev1.h index 470a26a43f..3b437c459c 100644 --- a/keyboards/rgbkb/zen/rev1/rev1.h +++ b/keyboards/rgbkb/zen/rev1/rev1.h @@ -1,17 +1,7 @@  #pragma once -#include "zen.h" -  #include "quantum.h" -#ifdef USE_I2C -#include <stddef.h> -#ifdef __AVR__ -    #include <avr/io.h> -    #include <avr/interrupt.h> -#endif -#endif -  #define LAYOUT( \      k00, k01, k02, k03, k04, k05,               k55, k54, k53, k52, k51, k50, \      k10, k11, k12, k13, k14, k15,               k65, k64, k63, k62, k61, k60, \ diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h index e37bd7a168..93c1b3f200 100644 --- a/keyboards/rgbkb/zen/rev2/config.h +++ b/keyboards/rgbkb/zen/rev2/config.h @@ -17,6 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #pragma once +#include "config_common.h" +  /* USB Device descriptor parameter */  #define VENDOR_ID       0xFEED  #define PRODUCT_ID      0x3061 @@ -28,13 +30,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  // Rows are doubled-up  // wiring of each half -#ifdef CONVERT_TO_PROTON_C -  #define MATRIX_ROWS 5 -  #define MATRIX_COLS 7 -#else -  #define MATRIX_ROWS 10 -  #define MATRIX_COLS 7 -#endif +#define MATRIX_ROWS 10 +#define MATRIX_COLS 7  // Proton-C does pin conversion  #define MATRIX_ROW_PINS { C6, E6, B5, D7, B4 } diff --git a/keyboards/rgbkb/zen/rev2/rev2.h b/keyboards/rgbkb/zen/rev2/rev2.h index c545710abb..c7a06d1767 100644 --- a/keyboards/rgbkb/zen/rev2/rev2.h +++ b/keyboards/rgbkb/zen/rev2/rev2.h @@ -1,52 +1,24 @@  #pragma once -#include "zen.h" -  #include "quantum.h" -#ifdef USE_I2C -#include <stddef.h> -#ifdef __AVR__ -    #include <avr/io.h> -    #include <avr/interrupt.h> -#endif -#endif - -#ifdef CONVERT_TO_PROTON_C -  #define LAYOUT( \ -      k00, k01, k02, k03, k04, k05,             k55, k54, k53, k52, k51, k50, \ -      k10, k11, k12, k13, k14, k15,             k65, k64, k63, k62, k61, k60, \ -      k20, k21, k22, k23, k24, k25,             k75, k74, k73, k72, k71, k70, \ -      k30, k31, k32, k33, k34, k35, k16,   k66, k85, k84, k83, k82, k81, k80, \ -      k40, k41, k42, k43, k44, k36, k26,   k76, k86, k94, k93, k92, k91, k90, \ -                               k45, k46,   k96, k95 \ -      ) \ -      { \ -          { k00, k01, k02, k03, k04, k05, KC_NO }, \ -          { k10, k11, k12, k13, k14, k15, k16 }, \ -          { k20, k21, k22, k23, k24, k25, k26 }, \ -          { k30, k31, k32, k33, k34, k35, k36 }, \ -          { k40, k41, k42, k43, k44, k45, k46 } \ -      } -#else -  #define LAYOUT( \ -      k00, k01, k02, k03, k04, k05,             k55, k54, k53, k52, k51, k50, \ -      k10, k11, k12, k13, k14, k15,             k65, k64, k63, k62, k61, k60, \ -      k20, k21, k22, k23, k24, k25,             k75, k74, k73, k72, k71, k70, \ -      k30, k31, k32, k33, k34, k35, k16,   k66, k85, k84, k83, k82, k81, k80, \ -      k40, k41, k42, k43, k44, k36, k26,   k76, k86, k94, k93, k92, k91, k90, \ -                               k45, k46,   k96, k95 \ -      ) \ -      { \ -          { k00, k01, k02, k03, k04, k05, KC_NO }, \ -          { k10, k11, k12, k13, k14, k15, k16 }, \ -          { k20, k21, k22, k23, k24, k25, k26 }, \ -          { k30, k31, k32, k33, k34, k35, k36 }, \ -          { k40, k41, k42, k43, k44, k45, k46 }, \ -          { k50, k51, k52, k53, k54, k55, KC_NO }, \ -          { k60, k61, k62, k63, k64, k65, k66 }, \ -          { k70, k71, k72, k73, k74, k75, k76 }, \ -          { k80, k81, k82, k83, k84, k85, k86 }, \ -          { k90, k91, k92, k93, k94, k95, k96 } \ -      } -#endif +#define LAYOUT( \ +    k00, k01, k02, k03, k04, k05,             k55, k54, k53, k52, k51, k50, \ +    k10, k11, k12, k13, k14, k15,             k65, k64, k63, k62, k61, k60, \ +    k20, k21, k22, k23, k24, k25,             k75, k74, k73, k72, k71, k70, \ +    k30, k31, k32, k33, k34, k35, k16,   k66, k85, k84, k83, k82, k81, k80, \ +    k40, k41, k42, k43, k44, k36, k26,   k76, k86, k94, k93, k92, k91, k90, \ +                             k45, k46,   k96, k95 \ +    ) \ +    { \ +        { k00, k01, k02, k03, k04, k05, KC_NO }, \ +        { k10, k11, k12, k13, k14, k15, k16 }, \ +        { k20, k21, k22, k23, k24, k25, k26 }, \ +        { k30, k31, k32, k33, k34, k35, k36 }, \ +        { k40, k41, k42, k43, k44, k45, k46 }, \ +        { k50, k51, k52, k53, k54, k55, KC_NO }, \ +        { k60, k61, k62, k63, k64, k65, k66 }, \ +        { k70, k71, k72, k73, k74, k75, k76 }, \ +        { k80, k81, k82, k83, k84, k85, k86 }, \ +        { k90, k91, k92, k93, k94, k95, k96 } \ +    } diff --git a/keyboards/rgbkb/zen/rules.mk b/keyboards/rgbkb/zen/rules.mk index 5a3ac77e74..84a2d08ff0 100644 --- a/keyboards/rgbkb/zen/rules.mk +++ b/keyboards/rgbkb/zen/rules.mk @@ -14,5 +14,7 @@ CONSOLE_ENABLE = no         # Console for debug  COMMAND_ENABLE = yes        # Commands for debug and configuration  NKRO_ENABLE = no            # Enable N-Key Rollover  AUDIO_ENABLE = no           # Audio output +SPLIT_KEYBOARD = yes +RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight  DEFAULT_FOLDER = rgbkb/zen/rev2 diff --git a/keyboards/rgbkb/zen/zen.c b/keyboards/rgbkb/zen/zen.c deleted file mode 100644 index 22131ef5c7..0000000000 --- a/keyboards/rgbkb/zen/zen.c +++ /dev/null @@ -1 +0,0 @@ -#include "zen.h" diff --git a/keyboards/rgbkb/zen/zen.h b/keyboards/rgbkb/zen/zen.h deleted file mode 100644 index e51c3c831f..0000000000 --- a/keyboards/rgbkb/zen/zen.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -#if KEYBOARD_rgbkb_zen_rev1 -    #include "rev1.h" -#elif KEYBOARD_rgbkb_zen_rev2 -    #include "rev2.h" -#endif -#include "quantum.h" | 
