Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add DSP40 #11579

Merged
merged 10 commits into from
Feb 7, 2021
Merged

Add DSP40 #11579

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4ca7a3b
Initial commit of DSP40
nooges Jan 1, 2021
34ced37
Add VIA keymap
nooges Jan 7, 2021
61c84d4
Update default
nooges Jan 16, 2021
f75c5b0
Update info.json
nooges Jan 16, 2021
7e918c1
Apply suggestions from code review
nooges Jan 21, 2021
5fe2cfd
Add GPL2 headers
nooges Jan 21, 2021
7e471fe
Add tap code delay for encoder support
nooges Jan 21, 2021
84e9e4f
Add Rev. 1 readme
nooges Feb 1, 2021
c285aed
Apply suggestions from code review
nooges Feb 7, 2021
e59b38f
Apply suggestions from code review
nooges Feb 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions keyboards/keebio/dsp40/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#pragma once
nooges marked this conversation as resolved.
Show resolved Hide resolved

#include "config_common.h"
1 change: 1 addition & 0 deletions keyboards/keebio/dsp40/dsp40.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "dsp40.h"
nooges marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 5 additions & 0 deletions keyboards/keebio/dsp40/dsp40.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#pragma once
nooges marked this conversation as resolved.
Show resolved Hide resolved

#ifdef KEYBOARD_keebio_dsp40_rev1
#include "rev1.h"
#endif
107 changes: 107 additions & 0 deletions keyboards/keebio/dsp40/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
{
"keyboard_name": "DSP40",
"url": "https://keeb.io",
"maintainer": "nooges",
"width": 12,
"height": 4,
"layouts": {
"LAYOUT": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "Q", "x": 1, "y": 0 },
{ "label": "W", "x": 2, "y": 0 },
{ "label": "E", "x": 3, "y": 0 },
{ "label": "R", "x": 4, "y": 0 },
{ "label": "T", "x": 5, "y": 0 },
{ "label": "Y", "x": 6, "y": 0 },
{ "label": "U", "x": 7, "y": 0 },
{ "label": "I", "x": 8, "y": 0 },
{ "label": "O", "x": 9, "y": 0 },
{ "label": "P", "x": 10, "y": 0 },
{ "label": "Back<br>Space", "x": 11, "y": 0 },
{ "label": "Tab", "x": 0, "y": 1, "w": 1.25 },
{ "label": "A", "x": 1.25, "y": 1 },
{ "label": "S", "x": 2.25, "y": 1 },
{ "label": "D", "x": 3.25, "y": 1 },
{ "label": "F", "x": 4.25, "y": 1 },
{ "label": "G", "x": 5.25, "y": 1 },
{ "label": "H", "x": 6.25, "y": 1 },
{ "label": "J", "x": 7.25, "y": 1 },
{ "label": "K", "x": 8.25, "y": 1 },
{ "label": "L", "x": 9.25, "y": 1 },
{ "label": "Enter", "x": 10.25, "y": 1, "w": 1.75 },
{ "label": "Shift", "x": 0, "y": 2, "w": 1.75 },
{ "label": "Z", "x": 1.75, "y": 2 },
{ "label": "X", "x": 2.75, "y": 2 },
{ "label": "C", "x": 3.75, "y": 2 },
{ "label": "V", "x": 4.75, "y": 2 },
{ "label": "B", "x": 5.75, "y": 2 },
{ "label": "N", "x": 6.75, "y": 2 },
{ "label": "M", "x": 7.75, "y": 2 },
{ "label": "<", "x": 8.75, "y": 2 },
{ "label": "Shift", "x": 9.75, "y": 2, "w": 1.25 },
{ "label": "Fn", "x": 11, "y": 2 },
{ "label": "Hyper", "x": 0, "y": 3, "w": 1.25 },
{ "label": "Super", "x": 1.25, "y": 3 },
{ "label": "Meta", "x": 2.25, "y": 3, "w": 1.25 },
{ "x": 3.5, "y": 3, "w": 2.25 },
{ "x": 5.75, "y": 3, "w": 2.75 },
{ "label": "Super", "x": 8.5, "y": 3, "w": 1.25 },
{ "label": "Meta", "x": 9.75, "y": 3 },
{ "label": "Super", "x": 10.75, "y": 3, "w": 1.25 }
]
},
"LAYOUT_ortho_4x12": {
"layout": [
{ "label": "Tab", "x": 0, "y": 0 },
{ "label": "Q", "x": 1, "y": 0 },
{ "label": "W", "x": 2, "y": 0 },
{ "label": "E", "x": 3, "y": 0 },
{ "label": "R", "x": 4, "y": 0 },
{ "label": "T", "x": 5, "y": 0 },
{ "label": "Y", "x": 6, "y": 0 },
{ "label": "U", "x": 7, "y": 0 },
{ "label": "I", "x": 8, "y": 0 },
{ "label": "O", "x": 9, "y": 0 },
{ "label": "P", "x": 10, "y": 0 },
{ "label": "Back Space", "x": 11, "y": 0 },
{ "label": "Esc", "x": 0, "y": 1 },
{ "label": "A", "x": 1, "y": 1 },
{ "label": "S", "x": 2, "y": 1 },
{ "label": "D", "x": 3, "y": 1 },
{ "label": "F", "x": 4, "y": 1 },
{ "label": "G", "x": 5, "y": 1 },
{ "label": "H", "x": 6, "y": 1 },
{ "label": "J", "x": 7, "y": 1 },
{ "label": "K", "x": 8, "y": 1 },
{ "label": "L", "x": 9, "y": 1 },
{ "label": ";", "x": 10, "y": 1 },
{ "label": "'", "x": 11, "y": 1 },
{ "label": "Shift", "x": 0, "y": 2 },
{ "label": "Z", "x": 1, "y": 2 },
{ "label": "X", "x": 2, "y": 2 },
{ "label": "C", "x": 3, "y": 2 },
{ "label": "V", "x": 4, "y": 2 },
{ "label": "B", "x": 5, "y": 2 },
{ "label": "N", "x": 6, "y": 2 },
{ "label": "M", "x": 7, "y": 2 },
{ "label": ",", "x": 8, "y": 2 },
{ "label": ".", "x": 9, "y": 2 },
{ "label": "/", "x": 10, "y": 2 },
{ "label": "Enter", "x": 11, "y": 2 },
{ "x": 0, "y": 3 },
{ "label": "Ctrl", "x": 1, "y": 3 },
{ "label": "Alt", "x": 2, "y": 3 },
{ "label": "Super", "x": 3, "y": 3 },
{ "label": "Lower", "x": 4, "y": 3 },
{ "label": "Space", "x": 5, "y": 3 },
{ "label": "Space", "x": 6, "y": 3 },
{ "label": "Raise", "x": 7, "y": 3 },
{ "label": "Left", "x": 8, "y": 3 },
{ "label": "Down", "x": 9, "y": 3 },
{ "label": "Up", "x": 10, "y": 3 },
{ "label": "Right", "x": 11, "y": 3 }
]
}
}
}
3 changes: 3 additions & 0 deletions keyboards/keebio/dsp40/keymaps/bakingpy/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#pragma once
nooges marked this conversation as resolved.
Show resolved Hide resolved

#define TAPPING_TERM 150
200 changes: 200 additions & 0 deletions keyboards/keebio/dsp40/keymaps/bakingpy/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
#include QMK_KEYBOARD_H
drashna marked this conversation as resolved.
Show resolved Hide resolved

extern keymap_config_t keymap_config;
nooges marked this conversation as resolved.
Show resolved Hide resolved

enum layer_names {
_MAC,
_WINDOWS,
_TESTMODE,
_LOWER,
_RAISE,
_FKEYS,
_ADJUST,
};

enum custom_keycodes {
MAC = SAFE_RANGE,
WINDOWS,
TESTMODE,
LOWER,
RAISE,
ADJUST,
};

#define KC_ KC_TRNS

#define KC_CAPW LGUI(LSFT(KC_3)) // Capture whole screen
#define KC_CPYW LGUI(LSFT(LCTL(KC_3))) // Copy whole screen
#define KC_CAPP LGUI(LSFT(KC_4)) // Capture portion of screen
#define KC_CPYP LGUI(LSFT(LCTL(KC_4))) // Copy portion of screen
#define KC_ESCC MT(MOD_LCTL, KC_ESC)
#define KC_LOWR LOWER
#define KC_RASE RAISE
#define KC_GRVF LT(_FKEYS, KC_GRV)
#define KC_ENTS MT(MOD_LSFT, KC_ENT)
#define KC_BL_S BL_STEP
#define KC_BL_T BL_TOGG
#define KC_RMOD RGB_MOD

#ifndef LAYOUT_kc_ortho_4x12
#define LAYOUT_kc_ortho_4x12( \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/cries

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, one day I'll kill this all off

L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
) \
LAYOUT_ortho_4x12( \
KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
)

#endif

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[_MAC] = LAYOUT_kc_ortho_4x12(
//┌────┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┬────┐
TAB , Q , W , E , R , T , Y , U , I , O , P ,MINS,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
ESCC, A , S , D , F , G , H , J , K , L ,SCLN,QUOT,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
LSFT, Z , X , C , V , B , N , M ,COMM,DOT ,SLSH,ENTS,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
GRVF,LCTL,LALT,LGUI,LOWR,SPC , BSPC,RASE,LEFT,DOWN, UP ,RGHT
//└────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
),

[_WINDOWS] = LAYOUT_kc_ortho_4x12(
//┌────┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┬────┐
TAB , Q , W , E , R , T , Y , U , I , O , P ,MINS,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
ESCC, A , S , D , F , G , H , J , K , L ,SCLN,QUOT,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
LSFT, Z , X , C , V , B , N , M ,COMM,DOT ,SLSH,ENTS,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
GRVF,LALT,LGUI,LCTL,LOWR,SPC , BSPC,RASE,LEFT,DOWN, UP ,RGHT
//└────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
),

[_TESTMODE] = LAYOUT_kc_ortho_4x12(
//┌────┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┬────┐
TAB , Q , W , E , R , T , Y , U , I , O , P ,MINS,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
RMOD,BL_S, S , D , F , G , RMOD,BL_S, K , L ,SCLN,QUOT,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
LSFT, Z , X , C , V , B , N , M ,COMM,DOT ,SLSH,ENTS,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
GRVF,LALT,LGUI,LCTL,LOWR,SPC , BSPC,RASE,LEFT,DOWN, UP ,RGHT
//└────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
),

[_LOWER] = LAYOUT_kc_ortho_4x12(
//┌────┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┬────┐
, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , ,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
DEL ,CAPP,LEFT,RGHT, UP ,LBRC, RBRC, P4 , P5 , P6 ,PLUS,PIPE,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
,CPYP, , ,DOWN,LCBR, RCBR, P1 , P2 , P3 ,MINS, ,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
BL_S,BL_T, , , ,DEL , DEL , , P0 ,PDOT, ,
//└────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
),

[_RAISE] = LAYOUT_kc_ortho_4x12(
//┌────┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┬────┐
,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN, ,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
DEL ,MPRV,MNXT,VOLU,PGUP,UNDS, EQL ,HOME, , , ,BSLS,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
MUTE,MSTP,MPLY,VOLD,PGDN,MINS, PLUS,END , , , , ,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
, , , , , , , , , , ,
//└────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
),

[_FKEYS] = LAYOUT_kc_ortho_4x12(
//┌────┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┬────┐
F12 , F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 ,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
, , , , , , , , , , , ,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
, , , , , , , , , , , ,
//├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
, , , , , , , , , , ,
//└────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
),

/* Adjust (Lower + Raise)
* ,-----------------------------------------------------------------------------------.
* | | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn| | |
* |------+------+------+------+------+-------------+------+------+------+------+------|
* | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | |
* |------+------+------+------+------+------|------+------+------+------+------+------|
* | | | | | | | | | | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = LAYOUT_ortho_4x12( \
_______, RESET , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, \
_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, MAC, WINDOWS, TESTMODE,_______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
nooges marked this conversation as resolved.
Show resolved Hide resolved
)


};

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case MAC:
if (record->event.pressed) {
set_single_persistent_default_layer(_MAC);
}
return false;
break;
case WINDOWS:
if (record->event.pressed) {
set_single_persistent_default_layer(_WINDOWS);
}
return false;
break;
case TESTMODE:
if (record->event.pressed) {
set_single_persistent_default_layer(_TESTMODE);
}
return false;
break;
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
update_tri_layer(_LOWER, _RAISE, _ADJUST);
} else {
layer_off(_LOWER);
update_tri_layer(_LOWER, _RAISE, _ADJUST);
}
return false;
break;
case RAISE:
if (record->event.pressed) {
layer_on(_RAISE);
update_tri_layer(_LOWER, _RAISE, _ADJUST);
} else {
layer_off(_RAISE);
update_tri_layer(_LOWER, _RAISE, _ADJUST);
}
return false;
break;
case ADJUST:
if (record->event.pressed) {
layer_on(_ADJUST);
} else {
layer_off(_ADJUST);
}
return false;
break;
}
return true;
}
Loading