mirror of
https://github.com/openstenoproject/qmk
synced 2024-11-13 20:14:40 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
7f8f66512c
12 changed files with 89 additions and 80 deletions
|
@ -1,45 +1,20 @@
|
|||
/*
|
||||
Copyright 2021 Chris Broekema (broekema@gmail.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/>.
|
||||
*/
|
||||
|
||||
* Copyright 2021 Chris Broekema (broekema@gmail.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
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0xBEEF
|
||||
#define PRODUCT_ID 0x6969
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER QMK
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 3
|
||||
#define MATRIX_COLS 4
|
||||
|
||||
#define MATRIX_ROW_PINS { D1, D0, D4 }
|
||||
#define MATRIX_COL_PINS { D7, E6, B4, B5 }
|
||||
|
||||
/* COL2ROW, ROW2COL */
|
||||
#define DIODE_DIRECTION ROW2COL
|
||||
|
||||
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
|
||||
#define DEBOUNCE 5
|
||||
|
||||
/* disable these deprecated features by default */
|
||||
#define NO_ACTION_MACRO
|
||||
#define NO_ACTION_FUNCTION
|
||||
|
||||
//#define JOYSTICK_AXES_COUNT 4
|
||||
//#define JOYSTICK_BUTTON_COUNT 8
|
||||
#include "config_common.h"
|
||||
|
|
|
@ -1,5 +1,36 @@
|
|||
{
|
||||
"keyboard_name": "MisteRdeck",
|
||||
"manufacturer": "broekema",
|
||||
"url": "https://www.thingiverse.com/thing:4627779",
|
||||
"maintainer": "broekema",
|
||||
"usb": {
|
||||
"vid": "0xBEEF",
|
||||
"pid": "0x6969",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"diode_direction": "ROW2COL",
|
||||
"matrix_pins": {
|
||||
"cols": ["D7", "E6", "B4", "B5"],
|
||||
"rows": ["D1", "D0", "D4"]
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"x": 0, "y": 0},
|
||||
{"x": 1, "y": 0},
|
||||
{"x": 2, "y": 0},
|
||||
{"x": 3, "y": 0},
|
||||
|
||||
{"x": 0, "y": 1},
|
||||
{"x": 1, "y": 1},
|
||||
{"x": 2, "y": 1},
|
||||
{"x": 3, "y": 1},
|
||||
|
||||
{"x": 0, "y": 2},
|
||||
{"x": 1, "y": 2},
|
||||
{"x": 2, "y": 2},
|
||||
{"x": 3, "y": 2}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright 2021 Chris Broekema (broekema@gmail.com)
|
||||
/*
|
||||
* Copyright 2021 Chris Broekema (broekema@gmail.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
|
||||
|
|
|
@ -15,20 +15,21 @@
|
|||
*/
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
#include "joystick.h"
|
||||
|
||||
enum layers {
|
||||
enum layer_names {
|
||||
NORMAL_LAYER = 0
|
||||
};
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[NORMAL_LAYER] = LAYOUT( C(S(KC_F1)), C(S(KC_F2)), C(S(KC_F3)), C(S(KC_F4)),
|
||||
C(S(KC_F5)), C(S(KC_F6)), C(S(KC_F7)), C(S(KC_F8)),
|
||||
JS_BUTTON0, JS_BUTTON1, JS_BUTTON2, JS_BUTTON3 ),
|
||||
[NORMAL_LAYER] = LAYOUT(
|
||||
C(S(KC_F1)), C(S(KC_F2)), C(S(KC_F3)), C(S(KC_F4)),
|
||||
C(S(KC_F5)), C(S(KC_F6)), C(S(KC_F7)), C(S(KC_F8)),
|
||||
JS_BUTTON0, JS_BUTTON1, JS_BUTTON2, JS_BUTTON3
|
||||
)
|
||||
};
|
||||
|
||||
|
||||
|
||||
joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
|
||||
[0] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023),
|
||||
[1] = JOYSTICK_AXIS_IN(F5, 0, 512, 1023),
|
||||
|
|
1
keyboards/handwired/misterdeck/keymaps/default/rules.mk
Normal file
1
keyboards/handwired/misterdeck/keymaps/default/rules.mk
Normal file
|
@ -0,0 +1 @@
|
|||
JOYSTICK_ENABLE = yes
|
|
@ -1,20 +1,19 @@
|
|||
/*
|
||||
Copyright 2021 Chris Broekema (broekema@gmail.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/>.
|
||||
*/
|
||||
|
||||
* Copyright 2021 Chris Broekema (broekema@gmail.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
|
||||
|
||||
|
|
|
@ -15,20 +15,21 @@
|
|||
*/
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
#include "joystick.h"
|
||||
|
||||
enum layers {
|
||||
enum layer_names {
|
||||
NORMAL_LAYER = 0
|
||||
};
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[NORMAL_LAYER] = LAYOUT( C(S(KC_F1)), C(S(KC_F2)), C(S(KC_F3)), C(S(KC_F4)),
|
||||
C(S(KC_F5)), C(S(KC_F6)), C(S(KC_F7)), C(S(KC_F8)),
|
||||
C(S(KC_F9)), C(S(KC_F10)), C(S(KC_F11)), C(S(KC_F12))),
|
||||
[NORMAL_LAYER] = LAYOUT(
|
||||
C(S(KC_F1)), C(S(KC_F2)), C(S(KC_F3)), C(S(KC_F4)),
|
||||
C(S(KC_F5)), C(S(KC_F6)), C(S(KC_F7)), C(S(KC_F8)),
|
||||
C(S(KC_F9)), C(S(KC_F10)), C(S(KC_F11)), C(S(KC_F12))
|
||||
),
|
||||
};
|
||||
|
||||
|
||||
|
||||
joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
|
||||
[0] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023),
|
||||
[1] = JOYSTICK_AXIS_IN(F5, 0, 512, 1023),
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
JOYSTICK_ENABLE = yes
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright 2021 Chris Broekema (broekema@gmail.com)
|
||||
/*
|
||||
* Copyright 2021 Chris Broekema (broekema@gmail.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
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright 2021 Chris Broekema (broekema@gmail.com)
|
||||
/*
|
||||
* Copyright 2021 Chris Broekema (broekema@gmail.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
|
||||
|
@ -19,11 +20,11 @@
|
|||
#include "quantum.h"
|
||||
|
||||
#define LAYOUT( \
|
||||
k00, k01, k02, k03, \
|
||||
k10, k11, k12, k13, \
|
||||
k20, k21, k22, k23 \
|
||||
k00, k01, k02, k03, \
|
||||
k10, k11, k12, k13, \
|
||||
k20, k21, k22, k23 \
|
||||
) { \
|
||||
{ k00, k01, k02, k03 }, \
|
||||
{ k10, k11, k12, k13 }, \
|
||||
{ k20, k21, k22, k23 } \
|
||||
{ k20, k21, k22, k23 } \
|
||||
}
|
||||
|
|
|
@ -18,4 +18,4 @@ Flashing example for this keyboard:
|
|||
|
||||
Connect a momentary switch to RST and GND, hit twice in succession to reset the board into bootloader mode.
|
||||
|
||||
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
|
||||
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
|
||||
|
|
|
@ -16,6 +16,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
|
|||
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||
AUDIO_ENABLE = no # Audio output
|
||||
|
||||
# use joystick feature for sliders
|
||||
JOYSTICK_ENABLE = yes
|
||||
|
|
Loading…
Reference in a new issue