Skip to content

Commit

Permalink
handwired/misterdeck refactor (#16572)
Browse files Browse the repository at this point in the history 
* handwired/misterdeck refactor

* Forgot to remove this
  • Loading branch information
@fauxpark
fauxpark authored Mar 8, 2022
1 parent d38696a commit 3347b63
Show file tree
Hide file tree
Showing 12 changed files with 89 additions and 80 deletions.
57 changes: 16 additions & 41 deletions keyboards/handwired/misterdeck/config.h
View file
Original file line number Diff line number Diff line change
@@ -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"
31 changes: 31 additions & 0 deletions keyboards/handwired/misterdeck/info.json
View file
Original file line number Diff line number Diff line change
@@ -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}
]
}
}
}
3 changes: 2 additions & 1 deletion keyboards/handwired/misterdeck/keymaps/default/config.h
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
13 changes: 7 additions & 6 deletions keyboards/handwired/misterdeck/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
1 change: 1 addition & 0 deletions keyboards/handwired/misterdeck/keymaps/default/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
JOYSTICK_ENABLE = yes
31 changes: 15 additions & 16 deletions keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
View file
Original file line number Diff line number Diff line change
@@ -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

Expand Down
13 changes: 7 additions & 6 deletions keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
1 change: 1 addition & 0 deletions keyboards/handwired/misterdeck/keymaps/nobuttons/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
JOYSTICK_ENABLE = yes
3 changes: 2 additions & 1 deletion keyboards/handwired/misterdeck/misterdeck.c
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 6 additions & 5 deletions keyboards/handwired/misterdeck/misterdeck.h
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 } \
}
2 changes: 1 addition & 1 deletion keyboards/handwired/misterdeck/readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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).
3 changes: 0 additions & 3 deletions keyboards/handwired/misterdeck/rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 3347b63

Please sign in to comment.