gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-11 20:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2022-08-07 12:58:16 +00:00
commit fad4c6cf4c
10 changed files with 31 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
keyboards/rgbkb/zen/config.h
View File

@ -1,20 +0,0 @@
/*
Copyright 2017 Danny Nguyen <danny@hexwire.com>
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"

15
keyboards/rgbkb/zen/post_rules.mk
View File

@ -1,14 +1,3 @@
ifeq ($(strip $(CTPC)), yes) ifeq ($(strip $(CONVERT_TO)), proton_c)
CONVERT_TO_PROTON_C=yes RGBLIGHT_ENABLE = no # OOB incompatible with split on ARM
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.
endif endif

4
keyboards/rgbkb/zen/readme.md
View File

@ -20,8 +20,6 @@ Make example for this keyboard (after setting up your build environment):
To build for a Proton-C: To build for a Proton-C:
make rgbkb/zen/rev2:default CTPC=yes make rgbkb/zen/rev2:default CONVERT_TO=proton_c
**Note:** The Proton-C does not have split keyboard, or encoder support. Also OLED driver support is untested. Will update as status changes.
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. 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.

2
keyboards/rgbkb/zen/rev1/config.h
View File

@ -17,6 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#include "config_common.h"
/* USB Device descriptor parameter */ /* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED #define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x3060 #define PRODUCT_ID 0x3060

10
keyboards/rgbkb/zen/rev1/rev1.h
View File

@ -1,17 +1,7 @@
#pragma once #pragma once
#include "zen.h"
#include "quantum.h" #include "quantum.h"
#ifdef USE_I2C
#include <stddef.h>
#ifdef __AVR__
#include <avr/io.h>
#include <avr/interrupt.h>
#endif
#endif
#define LAYOUT( \ #define LAYOUT( \
k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \
k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \ k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \

11
keyboards/rgbkb/zen/rev2/config.h
View File

@ -17,6 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#include "config_common.h"
/* USB Device descriptor parameter */ /* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED #define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x3061 #define PRODUCT_ID 0x3061
@ -28,13 +30,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Rows are doubled-up // Rows are doubled-up
// wiring of each half // wiring of each half
#ifdef CONVERT_TO_PROTON_C #define MATRIX_ROWS 10
#define MATRIX_ROWS 5 #define MATRIX_COLS 7
#define MATRIX_COLS 7
#else
#define MATRIX_ROWS 10
#define MATRIX_COLS 7
#endif
// Proton-C does pin conversion // Proton-C does pin conversion
#define MATRIX_ROW_PINS { C6, E6, B5, D7, B4 } #define MATRIX_ROW_PINS { C6, E6, B5, D7, B4 }

68
keyboards/rgbkb/zen/rev2/rev2.h
View File

@ -1,52 +1,24 @@
#pragma once #pragma once
#include "zen.h"
#include "quantum.h" #include "quantum.h"
#ifdef USE_I2C #define LAYOUT( \
#include <stddef.h> k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \
#ifdef __AVR__ k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \
#include <avr/io.h> k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \
#include <avr/interrupt.h> k30, k31, k32, k33, k34, k35, k16, k66, k85, k84, k83, k82, k81, k80, \
#endif k40, k41, k42, k43, k44, k36, k26, k76, k86, k94, k93, k92, k91, k90, \
#endif k45, k46, k96, k95 \
) \
#ifdef CONVERT_TO_PROTON_C { \
#define LAYOUT( \ { k00, k01, k02, k03, k04, k05, KC_NO }, \
k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ { k10, k11, k12, k13, k14, k15, k16 }, \
k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \ { k20, k21, k22, k23, k24, k25, k26 }, \
k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \ { k30, k31, k32, k33, k34, k35, k36 }, \
k30, k31, k32, k33, k34, k35, k16, k66, k85, k84, k83, k82, k81, k80, \ { k40, k41, k42, k43, k44, k45, k46 }, \
k40, k41, k42, k43, k44, k36, k26, k76, k86, k94, k93, k92, k91, k90, \ { k50, k51, k52, k53, k54, k55, KC_NO }, \
k45, k46, k96, k95 \ { k60, k61, k62, k63, k64, k65, k66 }, \
) \ { k70, k71, k72, k73, k74, k75, k76 }, \
{ \ { k80, k81, k82, k83, k84, k85, k86 }, \
{ k00, k01, k02, k03, k04, k05, KC_NO }, \ { k90, k91, k92, k93, k94, k95, k96 } \
{ 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

2
keyboards/rgbkb/zen/rules.mk
View File

@ -14,5 +14,7 @@ CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover NKRO_ENABLE = no # Enable N-Key Rollover
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
SPLIT_KEYBOARD = yes
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight
DEFAULT_FOLDER = rgbkb/zen/rev2 DEFAULT_FOLDER = rgbkb/zen/rev2

1
keyboards/rgbkb/zen/zen.c
View File

@ -1 +0,0 @@
#include "zen.h"

8
keyboards/rgbkb/zen/zen.h
View File

@ -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"