summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-01-29 07:05:20 +0000
committerQMK Bot <hello@qmk.fm>2022-01-29 07:05:20 +0000
commit20fac523c74dc75dc68cba0cee217cb60aaa5aa2 (patch)
tree938a8a8b707f131606152909341f2dfb1bc69832 /keyboards
parent1f59fe6d1b1da209fa4475f10d082455ee1381eb (diff)
parent002a1add8b68ca8b1c7c2c21f75dca88df15ad2e (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/handwired/misterdeck/config.h45
-rw-r--r--keyboards/handwired/misterdeck/info.json5
-rw-r--r--keyboards/handwired/misterdeck/keymaps/default/config.h20
-rw-r--r--keyboards/handwired/misterdeck/keymaps/default/keymap.c37
-rw-r--r--keyboards/handwired/misterdeck/keymaps/nobuttons/config.h22
-rw-r--r--keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c37
-rw-r--r--keyboards/handwired/misterdeck/misterdeck.c17
-rw-r--r--keyboards/handwired/misterdeck/misterdeck.h29
-rw-r--r--keyboards/handwired/misterdeck/readme.md21
-rw-r--r--keyboards/handwired/misterdeck/rules.mk21
10 files changed, 254 insertions, 0 deletions
diff --git a/keyboards/handwired/misterdeck/config.h b/keyboards/handwired/misterdeck/config.h
new file mode 100644
index 0000000000..3aaef79d0a
--- /dev/null
+++ b/keyboards/handwired/misterdeck/config.h
@@ -0,0 +1,45 @@
+/*
+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
diff --git a/keyboards/handwired/misterdeck/info.json b/keyboards/handwired/misterdeck/info.json
new file mode 100644
index 0000000000..84c3863107
--- /dev/null
+++ b/keyboards/handwired/misterdeck/info.json
@@ -0,0 +1,5 @@
+{
+ "keyboard_name": "MisteRdeck",
+ "url": "https://www.thingiverse.com/thing:4627779",
+ "maintainer": "broekema",
+}
diff --git a/keyboards/handwired/misterdeck/keymaps/default/config.h b/keyboards/handwired/misterdeck/keymaps/default/config.h
new file mode 100644
index 0000000000..c21c29910b
--- /dev/null
+++ b/keyboards/handwired/misterdeck/keymaps/default/config.h
@@ -0,0 +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/>.
+ */
+
+#pragma once
+
+#define JOYSTICK_AXES_COUNT 4
+#define JOYSTICK_BUTTON_COUNT 4
diff --git a/keyboards/handwired/misterdeck/keymaps/default/keymap.c b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a6b6ee467e
--- /dev/null
+++ b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "joystick.h"
+
+enum layers {
+ 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 ),
+};
+
+
+
+joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
+ [0] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023),
+ [1] = JOYSTICK_AXIS_IN(F5, 0, 512, 1023),
+ [2] = JOYSTICK_AXIS_IN(F6, 0, 512, 1023),
+ [3] = JOYSTICK_AXIS_IN(F7, 0, 512, 1023)
+};
diff --git a/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h b/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
new file mode 100644
index 0000000000..bd150139c1
--- /dev/null
+++ b/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
@@ -0,0 +1,22 @@
+/*
+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
+
+#define JOYSTICK_AXES_COUNT 4
+#define JOYSTICK_BUTTON_COUNT 0
diff --git a/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c b/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
new file mode 100644
index 0000000000..fbeb636cf2
--- /dev/null
+++ b/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
@@ -0,0 +1,37 @@
+/* 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "joystick.h"
+
+enum layers {
+ 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))),
+};
+
+
+
+joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
+ [0] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023),
+ [1] = JOYSTICK_AXIS_IN(F5, 0, 512, 1023),
+ [2] = JOYSTICK_AXIS_IN(F6, 0, 512, 1023),
+ [3] = JOYSTICK_AXIS_IN(F7, 0, 512, 1023)
+};
diff --git a/keyboards/handwired/misterdeck/misterdeck.c b/keyboards/handwired/misterdeck/misterdeck.c
new file mode 100644
index 0000000000..a096e9ce95
--- /dev/null
+++ b/keyboards/handwired/misterdeck/misterdeck.c
@@ -0,0 +1,17 @@
+/* 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/>.
+ */
+
+#include "misterdeck.h"
diff --git a/keyboards/handwired/misterdeck/misterdeck.h b/keyboards/handwired/misterdeck/misterdeck.h
new file mode 100644
index 0000000000..a86ca2c2c9
--- /dev/null
+++ b/keyboards/handwired/misterdeck/misterdeck.h
@@ -0,0 +1,29 @@
+/* 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
+
+#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 } \
+}
diff --git a/keyboards/handwired/misterdeck/readme.md b/keyboards/handwired/misterdeck/readme.md
new file mode 100644
index 0000000000..b9d472319a
--- /dev/null
+++ b/keyboards/handwired/misterdeck/readme.md
@@ -0,0 +1,21 @@
+# MisterDeck
+
+![MisteRdeck](https://i.imgur.com/FTPWqkXh.jpeg)
+
+A 3D-printed streamdeck like keyboard featuring 12 keys and 4 sliders
+
+* Keyboard Maintainer: [Chris Broekema](https://github.com/broekema)
+* Hardware Supported: MisteRdeck by MisteR_ofcl
+* Hardware Availability: [Thingiverse](https://www.thingiverse.com/thing:4627779)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make handwired/misterdeck:default
+
+Flashing example for this keyboard:
+
+ make handwired/misterdeck:default:flash
+
+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). \ No newline at end of file
diff --git a/keyboards/handwired/misterdeck/rules.mk b/keyboards/handwired/misterdeck/rules.mk
new file mode 100644
index 0000000000..c19a30931a
--- /dev/null
+++ b/keyboards/handwired/misterdeck/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = yes # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+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