gitbot
/
qmk_firmware
mirror of https://github.com/qmk/qmk_firmware
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/16596/head
QMK Bot 2022-03-08 22:07:48 +00:00
parent d4bf9b1cc1 3347b63d83
commit 7f8f66512c
12 changed files with 89 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
keyboards/handwired/misterdeck/config.h
View File

@ -1,45 +1,20 @@
/* /*
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 * 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 * it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or * the Free Software Foundation, either version 2 of the License, or
(at your option) any later version. * (at your option) any later version.
*
This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. * GNU General Public License for more details.
*
You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once
/* USB Device descriptor parameter */ #include "config_common.h"
#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

31
keyboards/handwired/misterdeck/info.json
View File

@ -1,5 +1,36 @@
{ {
"keyboard_name": "MisteRdeck", "keyboard_name": "MisteRdeck",
"manufacturer": "broekema",
"url": "https://www.thingiverse.com/thing:4627779", "url": "https://www.thingiverse.com/thing:4627779",
"maintainer": "broekema", "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}
]
}
}
} }

3
keyboards/handwired/misterdeck/keymaps/default/config.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License as published by

11
keyboards/handwired/misterdeck/keymaps/default/keymap.c
View File

@ -15,20 +15,21 @@
*/ */
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include "joystick.h" #include "joystick.h"
enum layers { enum layer_names {
NORMAL_LAYER = 0 NORMAL_LAYER = 0
}; };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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)), [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_F5)), C(S(KC_F6)), C(S(KC_F7)), C(S(KC_F8)),
JS_BUTTON0, JS_BUTTON1, JS_BUTTON2, JS_BUTTON3 ), JS_BUTTON0, JS_BUTTON1, JS_BUTTON2, JS_BUTTON3
)
}; };
joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = { joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
[0] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023), [0] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023),
[1] = JOYSTICK_AXIS_IN(F5, 0, 512, 1023), [1] = JOYSTICK_AXIS_IN(F5, 0, 512, 1023),

1
keyboards/handwired/misterdeck/keymaps/default/rules.mk Normal file
View File

@ -0,0 +1 @@
JOYSTICK_ENABLE = yes

29
keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
View File

@ -1,21 +1,20 @@
/* /*
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 * 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 * it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or * the Free Software Foundation, either version 2 of the License, or
(at your option) any later version. * (at your option) any later version.
*
This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. * GNU General Public License for more details.
*
You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once
#define JOYSTICK_AXES_COUNT 4 #define JOYSTICK_AXES_COUNT 4

11
keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
View File

@ -15,20 +15,21 @@
*/ */
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include "joystick.h" #include "joystick.h"
enum layers { enum layer_names {
NORMAL_LAYER = 0 NORMAL_LAYER = 0
}; };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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)), [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_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))), C(S(KC_F9)), C(S(KC_F10)), C(S(KC_F11)), C(S(KC_F12))
),
}; };
joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = { joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
[0] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023), [0] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023),
[1] = JOYSTICK_AXIS_IN(F5, 0, 512, 1023), [1] = JOYSTICK_AXIS_IN(F5, 0, 512, 1023),

1
keyboards/handwired/misterdeck/keymaps/nobuttons/rules.mk Normal file
View File

@ -0,0 +1 @@
JOYSTICK_ENABLE = yes

3
keyboards/handwired/misterdeck/misterdeck.c
View File

@ -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 * 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 * it under the terms of the GNU General Public License as published by

3
keyboards/handwired/misterdeck/misterdeck.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License as published by

3
keyboards/handwired/misterdeck/rules.mk
View File

@ -16,6 +16,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
# use joystick feature for sliders
JOYSTICK_ENABLE = yes