summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-03-08 22:07:48 +0000
committerQMK Bot <hello@qmk.fm>2022-03-08 22:07:48 +0000
commit7f8f66512cea637a7b62f027ef332f774cfc64ad (patch)
tree83b437b43f0fa51a8a254c4f989149742ceb139e /keyboards
parentd4bf9b1cc1e49f4bed4fa55883aabcb21cad0218 (diff)
parent3347b63d83d019219770f55627f3d5136806bb5c (diff)
downloadqmk_firmware-7f8f66512cea637a7b62f027ef332f774cfc64ad.tar.gz
qmk_firmware-7f8f66512cea637a7b62f027ef332f774cfc64ad.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/handwired/misterdeck/config.h57
-rw-r--r--keyboards/handwired/misterdeck/info.json31
-rw-r--r--keyboards/handwired/misterdeck/keymaps/default/config.h3
-rw-r--r--keyboards/handwired/misterdeck/keymaps/default/keymap.c13
-rw-r--r--keyboards/handwired/misterdeck/keymaps/default/rules.mk1
-rw-r--r--keyboards/handwired/misterdeck/keymaps/nobuttons/config.h31
-rw-r--r--keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c13
-rw-r--r--keyboards/handwired/misterdeck/keymaps/nobuttons/rules.mk1
-rw-r--r--keyboards/handwired/misterdeck/misterdeck.c3
-rw-r--r--keyboards/handwired/misterdeck/misterdeck.h11
-rw-r--r--keyboards/handwired/misterdeck/readme.md2
-rw-r--r--keyboards/handwired/misterdeck/rules.mk3
12 files changed, 89 insertions, 80 deletions
diff --git a/keyboards/handwired/misterdeck/config.h b/keyboards/handwired/misterdeck/config.h
index 3aaef79d0a..085142d2d5 100644
--- a/keyboards/handwired/misterdeck/config.h
+++ b/keyboards/handwired/misterdeck/config.h
@@ -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"
diff --git a/keyboards/handwired/misterdeck/info.json b/keyboards/handwired/misterdeck/info.json
index 84c3863107..20d74d8e3c 100644
--- a/keyboards/handwired/misterdeck/info.json
+++ b/keyboards/handwired/misterdeck/info.json
@@ -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}
+ ]
+ }
+ }
}
diff --git a/keyboards/handwired/misterdeck/keymaps/default/config.h b/keyboards/handwired/misterdeck/keymaps/default/config.h
index c21c29910b..92157a0938 100644
--- a/keyboards/handwired/misterdeck/keymaps/default/config.h
+++ b/keyboards/handwired/misterdeck/keymaps/default/config.h
@@ -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
diff --git a/keyboards/handwired/misterdeck/keymaps/default/keymap.c b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
index a6b6ee467e..217d25551c 100644
--- a/keyboards/handwired/misterdeck/keymaps/default/keymap.c
+++ b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
@@ -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),
diff --git a/keyboards/handwired/misterdeck/keymaps/default/rules.mk b/keyboards/handwired/misterdeck/keymaps/default/rules.mk
new file mode 100644
index 0000000000..9e44c470f2
--- /dev/null
+++ b/keyboards/handwired/misterdeck/keymaps/default/rules.mk
@@ -0,0 +1 @@
+JOYSTICK_ENABLE = yes
diff --git a/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h b/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
index bd150139c1..f609bf2962 100644
--- a/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
+++ b/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
@@ -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
diff --git a/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c b/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
index fbeb636cf2..d4c52be35d 100644
--- a/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
+++ b/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
@@ -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),
diff --git a/keyboards/handwired/misterdeck/keymaps/nobuttons/rules.mk b/keyboards/handwired/misterdeck/keymaps/nobuttons/rules.mk
new file mode 100644
index 0000000000..9e44c470f2
--- /dev/null
+++ b/keyboards/handwired/misterdeck/keymaps/nobuttons/rules.mk
@@ -0,0 +1 @@
+JOYSTICK_ENABLE = yes
diff --git a/keyboards/handwired/misterdeck/misterdeck.c b/keyboards/handwired/misterdeck/misterdeck.c
index a096e9ce95..ee9cc93b3a 100644
--- a/keyboards/handwired/misterdeck/misterdeck.c
+++ b/keyboards/handwired/misterdeck/misterdeck.c
@@ -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
diff --git a/keyboards/handwired/misterdeck/misterdeck.h b/keyboards/handwired/misterdeck/misterdeck.h
index a86ca2c2c9..324ccb755f 100644
--- a/keyboards/handwired/misterdeck/misterdeck.h
+++ b/keyboards/handwired/misterdeck/misterdeck.h
@@ -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 } \
}
diff --git a/keyboards/handwired/misterdeck/readme.md b/keyboards/handwired/misterdeck/readme.md
index b9d472319a..dd592e646a 100644
--- a/keyboards/handwired/misterdeck/readme.md
+++ b/keyboards/handwired/misterdeck/readme.md
@@ -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). \ No newline at end of file
+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).
diff --git a/keyboards/handwired/misterdeck/rules.mk b/keyboards/handwired/misterdeck/rules.mk
index c19a30931a..7479d0121f 100644
--- a/keyboards/handwired/misterdeck/rules.mk
+++ b/keyboards/handwired/misterdeck/rules.mk
@@ -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