Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
cf5e40c251
|
@ -3,8 +3,8 @@
|
|||
#include "quantum.h"
|
||||
|
||||
#define LAYOUT_ortho_2x4(\
|
||||
K00, K01, K02,K03, \
|
||||
K04, K05, K06,K07 \
|
||||
K00, K01, K02, K03, \
|
||||
K04, K05, K06, K07 \
|
||||
) \
|
||||
{ \
|
||||
{ K00,K01,K02,K03}, \
|
||||
|
|
|
@ -3,18 +3,21 @@
|
|||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0x7363
|
||||
#define PRODUCT_ID 0x3032
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER Kyle Hart
|
||||
#define PRODUCT Stream Cheap 2x4
|
||||
#define VENDOR_ID 0x7363 // Stream Cheap
|
||||
#define PRODUCT_ID 0x1214
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER Stream Cheap
|
||||
#define PRODUCT 2x4
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 2
|
||||
#define MATRIX_COLS 4
|
||||
|
||||
/* define direct pins used */
|
||||
#define DIRECT_PINS { { B5,D7,C6,D1}, { B4,E6,D4,D0} }
|
||||
#define DIRECT_PINS \
|
||||
{ \
|
||||
{D1, D0, D4, C6}, { D7, E6, B4, B5 } \
|
||||
}
|
||||
|
||||
/* Set 0 if debouncing isn't needed */
|
||||
#define DEBOUNCE 5
|
||||
|
|
|
@ -1,36 +1,21 @@
|
|||
/*
|
||||
Copyright 2021 Luigi311
|
||||
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/>.
|
||||
*/
|
||||
/* Copyright 2021 Matthias Liffers
|
||||
*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
enum layers { NORMAL_LAYER, SECOND_LAYER, THIRD_LAYER, FOURTH_LAYER };
|
||||
|
||||
// Default layer
|
||||
[0] = LAYOUT_ortho_2x4(
|
||||
KC_F13, KC_F14, KC_F15, KC_F16,
|
||||
KC_F17, KC_F18, KC_F19, KC_F20
|
||||
),
|
||||
[1] = LAYOUT_ortho_2x4(
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||
),
|
||||
[2] = LAYOUT_ortho_2x4(
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||
),
|
||||
[3] = LAYOUT_ortho_2x4(
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||
),
|
||||
};
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[NORMAL_LAYER] = LAYOUT_ortho_2x4(KC_A, KC_A, KC_A, TO(3), KC_A, KC_A, KC_A, TO(1)), [SECOND_LAYER] = LAYOUT_ortho_2x4(KC_B, KC_B, KC_B, TO(0), KC_B, KC_B, KC_B, TO(2)), [THIRD_LAYER] = LAYOUT_ortho_2x4(KC_C, KC_C, KC_C, TO(1), KC_C, KC_C, KC_C, TO(3)), [FOURTH_LAYER] = LAYOUT_ortho_2x4(KC_D, KC_D, KC_D, TO(2), KC_D, KC_D, KC_D, TO(0))};
|
||||
|
|
|
@ -1 +1 @@
|
|||
VIA_ENABLE = yes # Enable VIA
|
||||
VIA_ENABLE = yes
|
||||
|
|
Loading…
Reference in New Issue