Compare commits
7 Commits
0.5.142
...
matrix_upd
| Author | SHA1 | Date | |
|---|---|---|---|
|
8c63a02483 | ||
|
|
486a483222 | ||
|
|
a4601e0f77 | ||
|
|
b653791d21 | ||
|
|
7dbe94d4ac | ||
|
|
f6ca092f0b | ||
|
|
133af22a70 |
@@ -1,48 +0,0 @@
|
||||
#include "tada68.h"
|
||||
|
||||
#define _BL 0
|
||||
#define _FL 1
|
||||
|
||||
#define _______ KC_TRNS
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
/* Keymap _BL: (Base Layer) Default Layer
|
||||
* ,----------------------------------------------------------------.
|
||||
* |Esc | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp |~ ` |
|
||||
* |----------------------------------------------------------------|
|
||||
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ |Del |
|
||||
* |----------------------------------------------------------------|
|
||||
* |CAPS | A| S| D| F| G| H| J| K| L| ;| '|Return |PgUp|
|
||||
* |----------------------------------------------------------------|
|
||||
* |Shift | Z| X| C| V| B| N| M| ,| .| /| <> | Up|PgDn|
|
||||
* |----------------------------------------------------------------|
|
||||
* |Ctrl|Win |Alt | Space |Alt| FN| APP|Lef|Dow|Rig |
|
||||
* `----------------------------------------------------------------'
|
||||
*/
|
||||
[_BL] = KEYMAP_ISO(
|
||||
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,KC_GRV, \
|
||||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,KC_BSLS,KC_DEL, \
|
||||
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_BSLS, KC_ENT,KC_PGUP, \
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_NONUS_BSLASH,KC_UP,KC_PGDN, \
|
||||
KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,MO(_FL),KC_APPLICATION, KC_LEFT,KC_DOWN,KC_RGHT),
|
||||
|
||||
/* Keymap _FL1: Function Layer 1
|
||||
* ,----------------------------------------------------------------.
|
||||
* | | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| RESET|PSCR|
|
||||
* |----------------------------------------------------------------|
|
||||
* | | | | | | | | | | | |BL-|BL+|BL | INS|
|
||||
* |----------------------------------------------------------------|
|
||||
* | | | | | | | | | | PP|PLA| PN| |HOME|
|
||||
* |----------------------------------------------------------------|
|
||||
* | | | | | | | | | V-| MV| V+| | | END|
|
||||
* |----------------------------------------------------------------|
|
||||
* | | | | | | | | | | |
|
||||
* `----------------------------------------------------------------'
|
||||
*/
|
||||
[_FL] = KEYMAP_ISO(
|
||||
_______, KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,RESET,KC_PSCR, \
|
||||
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DEC,BL_INC, BL_TOGG,KC_INS, \
|
||||
_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,KC_HOME, \
|
||||
_______,_______,_______,_______,_______,_______,_______,_______,KC_VOLD,KC_MUTE,KC_VOLU,_______,_______,KC_END, \
|
||||
_______,_______,_______, _______, _______,_______,_______,_______,_______, _______),
|
||||
};
|
||||
@@ -1,3 +0,0 @@
|
||||
# ISO(ish) - Basic ISO format layout for TADA68 #
|
||||
|
||||
Basic layout with some edits to work better with ISO (nordic) layout. Due to the wide left shift it isn't quite Nordic iso though.
|
||||
@@ -1,21 +0,0 @@
|
||||
# Build Options
|
||||
# change to "no" to disable the options, or define them in the Makefile in
|
||||
# the appropriate keymap folder that will get included automatically
|
||||
#
|
||||
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
|
||||
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
|
||||
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
|
||||
CONSOLE_ENABLE = no # Console for debug(+400)
|
||||
COMMAND_ENABLE = yes # Commands for debug and configuration
|
||||
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
||||
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||
MIDI_ENABLE = no # MIDI controls
|
||||
AUDIO_ENABLE = no # Audio output on port C6
|
||||
UNICODE_ENABLE = no # Unicode
|
||||
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
||||
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
|
||||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||
|
||||
ifndef QUANTUM_DIR
|
||||
include ../../../../Makefile
|
||||
endif
|
||||
@@ -37,38 +37,7 @@
|
||||
{k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e} \
|
||||
}
|
||||
|
||||
/* TADA68 ISO layout
|
||||
* ,----------------------------------------------------------------.
|
||||
* | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d | 0e |
|
||||
* |----------------------------------------------------------------|
|
||||
* | 10 | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c| 1d | 1e |
|
||||
* |----------------------------------------------------------------|
|
||||
* | 20 | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2c| 2d| 2e |
|
||||
* |----------------------------------------------------------------|
|
||||
* | 30 | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b| 3c| 3d| 3e |
|
||||
* |----------------------------------------------------------------|
|
||||
* | 40 | 41 | 42 | 45 | 49| 4a| 4b| 4c| 4d| 4e |
|
||||
* `----------------------------------------------------------------'
|
||||
*/
|
||||
// The first section contains all of the arguments
|
||||
// The second converts the arguments into a two-dimensional array
|
||||
|
||||
#define KEYMAP_ISO( \
|
||||
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
|
||||
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
|
||||
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
|
||||
k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
|
||||
k40, k41, k42, k45, k49, k4a, k4b, k4c, k4d, k4e \
|
||||
) \
|
||||
{ \
|
||||
{k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
|
||||
{k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
|
||||
{k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e}, \
|
||||
{k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
|
||||
{k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e} \
|
||||
}
|
||||
|
||||
void matrix_init_user(void);
|
||||
void matrix_scan_user(void);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -11,20 +11,11 @@
|
||||
// #define CFQ_USE_MOMENTARY_LAYER_KEYS
|
||||
// #define CFQ_USE_EXPEREMENTAL_LAYER
|
||||
|
||||
// keep enabled for now
|
||||
#define CFQ_USE_DYNAMIC_MACRO
|
||||
|
||||
#if !defined(CFQ_USER_KEY1)
|
||||
#define CFQ_USER_KEY1 KC_SPC
|
||||
#define CFQ_USER_KEY1 KC_F13
|
||||
#endif
|
||||
#if !defined(CFQ_USER_KEY2)
|
||||
#define CFQ_USER_KEY2 KC_ENT
|
||||
#endif
|
||||
#if !defined(CFQ_USER_KEY3)
|
||||
#define CFQ_USER_KEY3 CFQ_KC_FN3
|
||||
#endif
|
||||
#if !defined(CFQ_USER_KEY4)
|
||||
#define CFQ_USER_KEY4 KC_APP
|
||||
#define CFQ_USER_KEY2 KC_APP
|
||||
#endif
|
||||
|
||||
#define BASE 0 // default layer
|
||||
@@ -38,16 +29,9 @@ enum custom_keycodes {
|
||||
PLACEHOLDER = SAFE_RANGE, // can always be here
|
||||
EPRM,
|
||||
VRSN,
|
||||
RGB_SLD,
|
||||
#ifdef CFQ_USE_DYNAMIC_MACRO
|
||||
DYNAMIC_MACRO_RANGE,
|
||||
#endif
|
||||
RGB_SLD
|
||||
};
|
||||
|
||||
#ifdef CFQ_USE_DYNAMIC_MACRO
|
||||
#include "dynamic_macro.h"
|
||||
#endif
|
||||
|
||||
// macros
|
||||
#ifdef CFQ_USE_EXPEREMENTAL_LAYER
|
||||
#define M_SPACES_1 2
|
||||
@@ -93,13 +77,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------|
|
||||
* | LShift | Z | X | C | V | B | | | | N | M | , | . | / | RShift |
|
||||
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
|
||||
* | LCtl |Super | Alt | USR4 |Space | | Left | Down | Up |Right | Del |
|
||||
* | LCtl |Super | Alt | USR2 |Space | | Left | Down | Up |Right | Del |
|
||||
* `----------------------------------' `----------------------------------'
|
||||
* ,-------------. ,-------------.
|
||||
* | Ins | USR3 | | Home | End |
|
||||
* | Ins | ~L3 | | Home | End |
|
||||
* ,------|------|------| |------+------+------.
|
||||
* | | | ~L2 | | PgUp | | |
|
||||
* | USR1 | USR2 |------| |------|Enter |Space |
|
||||
* |Space | USR1 |------| |------|Enter |Space |
|
||||
* | | | ~L1 | | PgDn | | |
|
||||
* `--------------------' `--------------------'
|
||||
*/
|
||||
@@ -111,10 +95,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LPRN,
|
||||
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC,
|
||||
KC_LCTL, KC_LGUI, KC_LALT, CFQ_USER_KEY4, KC_SPC,
|
||||
KC_INS, CFQ_USER_KEY3,
|
||||
KC_LCTL, KC_LGUI, KC_LALT, CFQ_USER_KEY2, KC_SPC,
|
||||
KC_INS, CFQ_KC_FN3,
|
||||
CFQ_KC_FN2,
|
||||
CFQ_USER_KEY1, CFQ_USER_KEY2, CFQ_KC_FN1,
|
||||
KC_SPC, CFQ_USER_KEY1, CFQ_KC_FN1,
|
||||
// right hand
|
||||
KC_RCBR, KC_CIRC, KC_AMPR, KC_ASTR,KC_MINS, KC_EQL, KC_BSPC,
|
||||
KC_RPRN, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
|
||||
@@ -143,10 +127,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* | | | | | | | 0 | | . | + | |
|
||||
* `----------------------------------' `----------------------------------'
|
||||
* ,-------------. ,---------------.
|
||||
* |Start1|Start2| | | |
|
||||
* | | | | | |
|
||||
* ,------|------|------| |------+--------+------.
|
||||
* | | | Stop | | | | |
|
||||
* |Play1 |Play2 |------| |------| | |
|
||||
* | | | | | | | |
|
||||
* | | |------| |------| | |
|
||||
* | | | | | | | |
|
||||
* `--------------------' `----------------------'
|
||||
*/
|
||||
@@ -158,15 +142,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M(M_ARROW_RMINUS),
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M(M_BRACKET_IN_ANG), M(M_BRACKET_IN_BRC),
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
#ifdef CFQ_USE_DYNAMIC_MACRO
|
||||
DYN_REC_START1, DYN_REC_START2,
|
||||
DYN_REC_STOP,
|
||||
DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, KC_TRNS,
|
||||
#else
|
||||
KC_TRNS, KC_TRNS,
|
||||
KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
#endif
|
||||
// right hand
|
||||
M(M_BRACKET_OUT_CBR), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
|
||||
M(M_BRACKET_OUT_PRN), M(M_ARROW_LEQL), KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_SLASH, KC_F11,
|
||||
@@ -223,13 +201,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
/* Keymap 3: My own testing keys!
|
||||
*
|
||||
* ,--------------------------------------------------. ,--------------------------------------------------.
|
||||
* | | | | { | } | | } | | | | | | | | |
|
||||
* | | Spc1 | Spc2 | Spc3 | Spc4 | Spc5 | | | | Spc6 | Spc7 | Spc8 | | | |
|
||||
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
|
||||
* | | | | ( | ) | | ) | | | Spc7 | Spc8 | | | | |
|
||||
* | | | | | | | | | | | | | | | |
|
||||
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
|
||||
* | | | | [ | ] | |------| |------| Spc4 | Spc5 | Spc6 | | | |
|
||||
* |--------+------+------+------+------+------| ] | | |------+------+------+------+------+--------|
|
||||
* | | | | < | > | | | | | Spc1 | Spc2 | Spc3 | | | |
|
||||
* | | | | | | |------| |------| | | | | | |
|
||||
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
|
||||
* | | | | | | | | | | | | | | | |
|
||||
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
|
||||
* | | | | | | | | | | | |
|
||||
* `----------------------------------' `----------------------------------'
|
||||
@@ -242,23 +220,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* `--------------------' `--------------------'
|
||||
*/
|
||||
|
||||
// EXPERIMENT
|
||||
// EXPEREMENT
|
||||
[EXPR] = LAYOUT_ergodox(
|
||||
// left hand
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_TRNS, KC_RCBR,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_TRNS, KC_RPRN,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, S(KC_COMM), S(KC_DOT), KC_TRNS, KC_RBRC,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS,
|
||||
KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, M(M_SPACES_1), M(M_SPACES_2), M(M_SPACES_3), M(M_SPACES_4), M(M_SPACES_5), KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS,
|
||||
KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
// right hand
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, M(M_SPACES_7), M(M_SPACES_8), KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, M(M_SPACES_4), M(M_SPACES_5), M(M_SPACES_6), KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, M(M_SPACES_1), M(M_SPACES_2), M(M_SPACES_3), KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, M(M_SPACES_6), M(M_SPACES_7), M(M_SPACES_8), KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS,
|
||||
KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS
|
||||
@@ -336,11 +314,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
|
||||
};
|
||||
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
#ifdef CFQ_USE_DYNAMIC_MACRO
|
||||
if (!process_record_dynamic_macro(keycode, record)) {
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
switch (keycode) {
|
||||
// dynamically generate these.
|
||||
case EPRM:
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
Some optional behavior is configurable without editing the code
|
||||
using `CFQ_` prefixed defines which can be set by passing `EXTRAFLAGS` to make.
|
||||
|
||||
- `CFQ_USER_KEY1` (1..4) are used for custom-keys
|
||||
- `CFQ_USER_KEY1`, `CFQ_USER_KEY2` are used for custom-keys
|
||||
- `CFQ_USE_MOMENTARY_LAYER_KEYS` is used to prevent layer keys from toggling when tapped.
|
||||
- `CFQ_USE_SWAP_RIGHT_SPACE_ENTER` swap Enter and Space on the right hand thumb cluster.
|
||||
While asymmetric, it makes Enter more easily accessible.
|
||||
@@ -40,10 +40,8 @@ using `CFQ_` prefixed defines which can be set by passing `EXTRAFLAGS` to make.
|
||||
|
||||
When undefined:
|
||||
|
||||
- `USR1` defaults to `KC_SPC`, otherwise use `CFQ_USER_KEY1`.
|
||||
- `USR2` defaults to `KC_ENT`, otherwise use `CFQ_USER_KEY2`.
|
||||
- `USR3` defaults to `KC_FN3`, otherwise use `CFQ_USER_KEY3`.
|
||||
- `USR4` defaults to `APP`, otherwise use `CFQ_USER_KEY4`.
|
||||
- `USR1` defaults to `F13`, otherwise use `CFQ_USER_KEY1`.
|
||||
- `USR2` defaults to `APP`, otherwise use `CFQ_USER_KEY2`.
|
||||
|
||||
```
|
||||
,--------------------------------------------------. ,--------------------------------------------------.
|
||||
@@ -55,23 +53,21 @@ When undefined:
|
||||
|--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------|
|
||||
| LShift | Z | X | C | V | B | | | | N | M | , | . | / | RShift |
|
||||
`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
|
||||
| LCtl |Super | Alt | USR4 |Space | | Left | Down | Up |Right | Del |
|
||||
| LCtl |Super | Alt | USR2 |Space | | Left | Down | Up |Right | Del |
|
||||
`----------------------------------' `----------------------------------'
|
||||
,-------------. ,-------------.
|
||||
| Ins | USR3 | | Home | End |
|
||||
| Ins | ~L3 | | Home | End |
|
||||
,------|------|------| |------+------+------.
|
||||
| | | ~L2 | | PgUp | | |
|
||||
| USR1 | USR2 |------| |------|Enter |Space |
|
||||
|Space | USR1 |------| |------|Enter |Space |
|
||||
| | | ~L1 | | PgDn | | |
|
||||
`--------------------' `--------------------'
|
||||
|
||||
```
|
||||
|
||||
## Keymap 1: Symbol layer
|
||||
|
||||
Notes:
|
||||
|
||||
- The double bracket keys on this layer press left to position the cursor between them.
|
||||
- The left thumb cluster is used for macro record/replay.
|
||||
Note the double bracket keys on this layer press left to position the cursor between them.
|
||||
|
||||
```
|
||||
,--------------------------------------------------. ,--------------------------------------------------.
|
||||
@@ -86,10 +82,10 @@ Notes:
|
||||
| | | | | | | 0 | | . | + | |
|
||||
`----------------------------------' `----------------------------------'
|
||||
,-------------. ,---------------.
|
||||
|Start1|Start2| | | |
|
||||
| | | | | |
|
||||
,------|------|------| |------+--------+------.
|
||||
| | | Stop | | | | |
|
||||
|Play1 |Play2 |------| |------| | |
|
||||
| | | | | | | |
|
||||
| | |------| |------| | |
|
||||
| | | | | | | |
|
||||
`--------------------' `----------------------'
|
||||
```
|
||||
@@ -119,10 +115,6 @@ Notes:
|
||||
|
||||
## Changelog
|
||||
|
||||
- 2017/10/28
|
||||
Make more keys user defined on the left thumb cluster.
|
||||
Add macro record/replay keys.
|
||||
|
||||
- 2017/10/4
|
||||
Move Insert key to the left thumb cluster (away from the modifier keys).
|
||||
Replace with `USR2` which defaults to `APP`.
|
||||
|
||||
@@ -22,58 +22,177 @@
|
||||
#define ROW2COL 1
|
||||
#define CUSTOM_MATRIX 2 /* Disables built-in matrix scanning code */
|
||||
|
||||
/* I/O pins */
|
||||
#ifndef F0
|
||||
#define B0 0x30
|
||||
#define B1 0x31
|
||||
#define B2 0x32
|
||||
#define B3 0x33
|
||||
#define B4 0x34
|
||||
#define B5 0x35
|
||||
#define B6 0x36
|
||||
#define B7 0x37
|
||||
#define C0 0x60
|
||||
#define C1 0x61
|
||||
#define C2 0x62
|
||||
#define C3 0x63
|
||||
#define C4 0x64
|
||||
#define C5 0x65
|
||||
#define C6 0x66
|
||||
#define C7 0x67
|
||||
#define D0 0x90
|
||||
#define D1 0x91
|
||||
#define D2 0x92
|
||||
#define D3 0x93
|
||||
#define D4 0x94
|
||||
#define D5 0x95
|
||||
#define D6 0x96
|
||||
#define D7 0x97
|
||||
#define E0 0xC0
|
||||
#define E1 0xC1
|
||||
#define E2 0xC2
|
||||
#define E3 0xC3
|
||||
#define E4 0xC4
|
||||
#define E5 0xC5
|
||||
#define E6 0xC6
|
||||
#define E7 0xC7
|
||||
#define F0 0xF0
|
||||
#define F1 0xF1
|
||||
#define F2 0xF2
|
||||
#define F3 0xF3
|
||||
#define F4 0xF4
|
||||
#define F5 0xF5
|
||||
#define F6 0xF6
|
||||
#define F7 0xF7
|
||||
#define A0 0x00
|
||||
#define A1 0x01
|
||||
#define A2 0x02
|
||||
#define A3 0x03
|
||||
#define A4 0x04
|
||||
#define A5 0x05
|
||||
#define A6 0x06
|
||||
#define A7 0x07
|
||||
#if defined(__AVR__)
|
||||
#include <avr/io.h>
|
||||
|
||||
#define PORT_SHIFTER 4
|
||||
|
||||
#if defined(__AVR_ATmega32U4__)
|
||||
#define pin_t uint8_t
|
||||
#define ADDRESS_BASE 0x00
|
||||
#define PINB_ADDRESS 0x3
|
||||
#define PINC_ADDRESS 0x6
|
||||
#define PIND_ADDRESS 0x9
|
||||
#define PINE_ADDRESS 0xC
|
||||
#define PINF_ADDRESS 0xF
|
||||
#elif defined(__AVR_ATmega32U2__)
|
||||
#define pin_t uint8_t
|
||||
#define ADDRESS_BASE 0x00
|
||||
#define PINB_ADDRESS 0x3
|
||||
#define PINC_ADDRESS 0x6
|
||||
#define PIND_ADDRESS 0x9
|
||||
#elif defined(__AVR_AT90USB1286__)
|
||||
#define pin_t uint8_t
|
||||
#define ADDRESS_BASE 0x00
|
||||
#define PINA_ADDRESS 0x0
|
||||
#define PINB_ADDRESS 0x3
|
||||
#define PINC_ADDRESS 0x6
|
||||
#define PIND_ADDRESS 0x9
|
||||
#define PINE_ADDRESS 0xC
|
||||
#define PINF_ADDRESS 0xF
|
||||
#elif defined(__AVR_ATmega32a__)
|
||||
#define pin_t uint8_t
|
||||
#define ADDRESS_BASE 0x10
|
||||
#define PIND_ADDRESS 0x0
|
||||
#define PINC_ADDRESS 0x3
|
||||
#define PINB_ADDRESS 0x6
|
||||
#define PINA_ADDRESS 0x9
|
||||
#else
|
||||
#define pin_t uint16_t
|
||||
#define ADDRESS_BASE 0x0
|
||||
#endif
|
||||
|
||||
/* I/O pins */
|
||||
// #define PINDEF(port, pin) (uint8_t)((((uint16_t)&PIN##port) << 4) + PIN##port##pin)
|
||||
//#define PINDEF(port, pin) ((pin_t)(((((uint16_t)&PIN##port) - __SFR_OFFSET)<< 4) + PIN##port##pin))
|
||||
#define PINDEF(port, pin) ((PIN##port##_ADDRESS << PORT_SHIFTER) | pin)
|
||||
|
||||
#ifdef PORTA
|
||||
#define A0 PINDEF(A, 0)
|
||||
#define A1 PINDEF(A, 1)
|
||||
#define A2 PINDEF(A, 1)
|
||||
#define A3 PINDEF(A, 3)
|
||||
#define A4 PINDEF(A, 4)
|
||||
#define A5 PINDEF(A, 5)
|
||||
#define A6 PINDEF(A, 6)
|
||||
#define A7 PINDEF(A, 7)
|
||||
#endif
|
||||
#ifdef PORTB
|
||||
#define B0 PINDEF(B, 0)
|
||||
#define B1 PINDEF(B, 1)
|
||||
#define B2 PINDEF(B, 2)
|
||||
#define B3 PINDEF(B, 3)
|
||||
#define B4 PINDEF(B, 4)
|
||||
#define B5 PINDEF(B, 5)
|
||||
#define B6 PINDEF(B, 6)
|
||||
#define B7 PINDEF(B, 7)
|
||||
#endif
|
||||
#ifdef PORTC
|
||||
#define C0 PINDEF(C, 0)
|
||||
#define C1 PINDEF(C, 1)
|
||||
#define C2 PINDEF(C, 2)
|
||||
#define C3 PINDEF(C, 3)
|
||||
#define C4 PINDEF(C, 4)
|
||||
#define C5 PINDEF(C, 5)
|
||||
#define C6 PINDEF(C, 6)
|
||||
#define C7 PINDEF(C, 7)
|
||||
#endif
|
||||
#ifdef PORTD
|
||||
#define D0 PINDEF(D, 0)
|
||||
#define D1 PINDEF(D, 1)
|
||||
#define D2 PINDEF(D, 2)
|
||||
#define D3 PINDEF(D, 3)
|
||||
#define D4 PINDEF(D, 4)
|
||||
#define D5 PINDEF(D, 5)
|
||||
#define D6 PINDEF(D, 6)
|
||||
#define D7 PINDEF(D, 7)
|
||||
#endif
|
||||
#ifdef PORTE
|
||||
#define E0 PINDEF(E, 0)
|
||||
#define E1 PINDEF(E, 1)
|
||||
#define E2 PINDEF(E, 2)
|
||||
#define E3 PINDEF(E, 3)
|
||||
#define E4 PINDEF(E, 4)
|
||||
#define E5 PINDEF(E, 5)
|
||||
#define E6 PINDEF(E, 6)
|
||||
#define E7 PINDEF(E, 7)
|
||||
#endif
|
||||
#ifdef PORTF
|
||||
#define F0 PINDEF(F, 0)
|
||||
#define F1 PINDEF(F, 1)
|
||||
#define F2 PINDEF(F, 2)
|
||||
#define F3 PINDEF(F, 3)
|
||||
#define F4 PINDEF(F, 4)
|
||||
#define F5 PINDEF(F, 5)
|
||||
#define F6 PINDEF(F, 6)
|
||||
#define F7 PINDEF(F, 7)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(PROTOCOL_CHIBIOS)
|
||||
#include "hal.h"
|
||||
#define pin_t uint64_t
|
||||
|
||||
#ifdef GPIOA
|
||||
#define A0 (GPIOA + 0)
|
||||
#define A1 (GPIOA + 1)
|
||||
#define A2 (GPIOA + 2)
|
||||
#define A3 (GPIOA + 3)
|
||||
#define A4 (GPIOA + 4)
|
||||
#define A5 (GPIOA + 5)
|
||||
#define A6 (GPIOA + 6)
|
||||
#define A7 (GPIOA + 7)
|
||||
#define A8 (GPIOA + 8)
|
||||
#define A9 (GPIOA + 9)
|
||||
#define A10 (GPIOA + 10)
|
||||
#define A11 (GPIOA + 11)
|
||||
#define A12 (GPIOA + 12)
|
||||
#define A13 (GPIOA + 13)
|
||||
#define A14 (GPIOA + 14)
|
||||
#define A15 (GPIOA + 15)
|
||||
#endif
|
||||
|
||||
#ifdef GPIOB
|
||||
#define B0 (GPIOB + 0)
|
||||
#define B1 (GPIOB + 1)
|
||||
#define B2 (GPIOB + 2)
|
||||
#define B3 (GPIOB + 3)
|
||||
#define B4 (GPIOB + 4)
|
||||
#define B5 (GPIOB + 5)
|
||||
#define B6 (GPIOB + 6)
|
||||
#define B7 (GPIOB + 7)
|
||||
#define B8 (GPIOB + 8)
|
||||
#define B9 (GPIOB + 9)
|
||||
#define B10 (GPIOB + 10)
|
||||
#define B11 (GPIOB + 11)
|
||||
#define B12 (GPIOB + 12)
|
||||
#define B13 (GPIOB + 13)
|
||||
#define B14 (GPIOB + 14)
|
||||
#define B15 (GPIOB + 15)
|
||||
#endif
|
||||
|
||||
#ifdef GPIOC
|
||||
#define C0 (GPIOC + 0)
|
||||
#define C1 (GPIOC + 1)
|
||||
#define C2 (GPIOC + 2)
|
||||
#define C3 (GPIOC + 3)
|
||||
#define C4 (GPIOC + 4)
|
||||
#define C5 (GPIOC + 5)
|
||||
#define C6 (GPIOC + 6)
|
||||
#define C7 (GPIOC + 7)
|
||||
#define C8 (GPIOC + 8)
|
||||
#define C9 (GPIOC + 9)
|
||||
#define C10 (GPIOC + 10)
|
||||
#define C11 (GPIOC + 11)
|
||||
#define C12 (GPIOC + 12)
|
||||
#define C13 (GPIOC + 13)
|
||||
#define C14 (GPIOC + 14)
|
||||
#define C15 (GPIOC + 15)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
/* USART configuration */
|
||||
#ifdef BLUETOOTH_ENABLE
|
||||
# ifdef __AVR_ATmega32U4__
|
||||
|
||||
@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include "util.h"
|
||||
#include "matrix.h"
|
||||
#include "timer.h"
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
/* Set 0 if debouncing isn't needed */
|
||||
|
||||
@@ -60,8 +60,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#endif
|
||||
|
||||
#if (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
|
||||
static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
|
||||
static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
|
||||
static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
|
||||
static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
|
||||
#endif
|
||||
|
||||
/* matrix state(1:on, 0:off) */
|
||||
@@ -220,7 +220,10 @@ uint8_t matrix_scan(void)
|
||||
}
|
||||
# endif
|
||||
|
||||
|
||||
dprintf("%x\n", B0);
|
||||
matrix_scan_quantum();
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -271,15 +274,14 @@ uint8_t matrix_key_count(void)
|
||||
}
|
||||
|
||||
|
||||
|
||||
#if (DIODE_DIRECTION == COL2ROW)
|
||||
|
||||
static void init_cols(void)
|
||||
{
|
||||
for(uint8_t x = 0; x < MATRIX_COLS; x++) {
|
||||
uint8_t pin = col_pins[x];
|
||||
_SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN
|
||||
_SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI
|
||||
DDR_INPUT(pin); // IN
|
||||
PORT_HIGH(pin); // HI
|
||||
}
|
||||
}
|
||||
|
||||
@@ -300,7 +302,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
|
||||
|
||||
// Select the col pin to read (active low)
|
||||
uint8_t pin = col_pins[col_index];
|
||||
uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF));
|
||||
uint8_t pin_state = PIN_VALUE(pin);
|
||||
|
||||
// Populate the matrix row with the state of the col pin
|
||||
current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index);
|
||||
@@ -315,23 +317,23 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
|
||||
static void select_row(uint8_t row)
|
||||
{
|
||||
uint8_t pin = row_pins[row];
|
||||
_SFR_IO8((pin >> 4) + 1) |= _BV(pin & 0xF); // OUT
|
||||
_SFR_IO8((pin >> 4) + 2) &= ~_BV(pin & 0xF); // LOW
|
||||
DDR_OUTPUT(pin); // OUT
|
||||
PORT_LOW(pin); // LOW
|
||||
}
|
||||
|
||||
static void unselect_row(uint8_t row)
|
||||
{
|
||||
uint8_t pin = row_pins[row];
|
||||
_SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN
|
||||
_SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI
|
||||
DDR_INPUT(pin); // IN
|
||||
PORT_HIGH(pin); // HI
|
||||
}
|
||||
|
||||
static void unselect_rows(void)
|
||||
{
|
||||
for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
|
||||
uint8_t pin = row_pins[x];
|
||||
_SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN
|
||||
_SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI
|
||||
DDR_INPUT(pin); // IN
|
||||
PORT_HIGH(pin); // HI
|
||||
}
|
||||
}
|
||||
|
||||
@@ -341,8 +343,8 @@ static void init_rows(void)
|
||||
{
|
||||
for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
|
||||
uint8_t pin = row_pins[x];
|
||||
_SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN
|
||||
_SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI
|
||||
DDR_INPUT(pin); // IN
|
||||
PORT_HIGH(pin); // HI
|
||||
}
|
||||
}
|
||||
|
||||
@@ -362,7 +364,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
|
||||
matrix_row_t last_row_value = current_matrix[row_index];
|
||||
|
||||
// Check row pin state
|
||||
if ((_SFR_IO8(row_pins[row_index] >> 4) & _BV(row_pins[row_index] & 0xF)) == 0)
|
||||
if (PIN_VALUE(row_pins[row_index]) == 0)
|
||||
{
|
||||
// Pin LO, set col bit
|
||||
current_matrix[row_index] |= (ROW_SHIFTER << current_col);
|
||||
@@ -389,23 +391,23 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
|
||||
static void select_col(uint8_t col)
|
||||
{
|
||||
uint8_t pin = col_pins[col];
|
||||
_SFR_IO8((pin >> 4) + 1) |= _BV(pin & 0xF); // OUT
|
||||
_SFR_IO8((pin >> 4) + 2) &= ~_BV(pin & 0xF); // LOW
|
||||
DDR_OUTPUT(pin); // OUT
|
||||
PORT_LOW(pin); // LOW
|
||||
}
|
||||
|
||||
static void unselect_col(uint8_t col)
|
||||
{
|
||||
uint8_t pin = col_pins[col];
|
||||
_SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN
|
||||
_SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI
|
||||
DDR_INPUT(pin); // IN
|
||||
PORT_HIGH(pin); // HI
|
||||
}
|
||||
|
||||
static void unselect_cols(void)
|
||||
{
|
||||
for(uint8_t x = 0; x < MATRIX_COLS; x++) {
|
||||
uint8_t pin = col_pins[x];
|
||||
_SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN
|
||||
_SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI
|
||||
DDR_INPUT(pin); // IN
|
||||
PORT_HIGH(pin); // HI
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* Copyright 2016 Wez Furlong
|
||||
* 2017 Jack Humbert
|
||||
*
|
||||
* 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
|
||||
@@ -14,39 +15,72 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
// Some helpers for controlling gpio pins
|
||||
#include <avr/io.h>
|
||||
|
||||
enum {
|
||||
PinDirectionInput = 0,
|
||||
PinDirectionOutput = 1,
|
||||
PinLevelHigh = 1,
|
||||
PinLevelLow = 0,
|
||||
};
|
||||
#if defined(PROTOCOL_CHIBIOS)
|
||||
#include "hal.h"
|
||||
|
||||
// ex: pinMode(B0, PinDirectionOutput);
|
||||
static inline void pinMode(uint8_t pin, int mode) {
|
||||
uint8_t bv = _BV(pin & 0xf);
|
||||
if (mode == PinDirectionOutput) {
|
||||
_SFR_IO8((pin >> 4) + 1) |= bv;
|
||||
} else {
|
||||
_SFR_IO8((pin >> 4) + 1) &= ~bv;
|
||||
_SFR_IO8((pin >> 4) + 2) &= ~bv;
|
||||
#define PIN_VALUE(p) palReadPad(p & 0xFFFFFFF0, p & 0xF)
|
||||
|
||||
#define DDR_OUTPUT(p) palSetPadMode(p & 0xFFFFFFF0, p & 0xF, PAL_MODE_OUTPUT_PUSHPULL)
|
||||
#define DDR_INPUT(p) palSetPadMode(p & 0xFFFFFFF0, p & 0xF, PAL_MODE_INPUT_PULLDOWN)
|
||||
|
||||
#define PORT_HIGH(p) palSetPad(p & 0xFFFFFFF0, p & 0xF)
|
||||
#define PORT_LOW(p) palClearPad(p & 0xFFFFFFF0, p & 0xF)
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(__AVR__)
|
||||
#include <avr/io.h>
|
||||
|
||||
#define PIN_ADDRESS(p, offset) _SFR_IO8(ADDRESS_BASE + (p >> PORT_SHIFTER) + offset)
|
||||
|
||||
#define PIN(p) PIN_ADDRESS(p, 0)
|
||||
#define PIN_VALUE(p) (PIN(p) & _BV(p & 0xF))
|
||||
|
||||
#define DDR(p) PIN_ADDRESS(p, 1)
|
||||
#define DDR_OUTPUT(p) (DDR(p) |= _BV(p & 0xF))
|
||||
#define DDR_INPUT(p) (DDR(p) &= ~_BV(p & 0xF))
|
||||
|
||||
#define PORT(p) PIN_ADDRESS(p, 2)
|
||||
#define PORT_HIGH(p) (PORT(p) |= _BV(p & 0xF))
|
||||
#define PORT_LOW(p) (PORT(p) &= ~_BV(p & 0xF))
|
||||
|
||||
// Arduino shortcuts
|
||||
|
||||
enum {
|
||||
PinDirectionInput = 0,
|
||||
PinDirectionOutput = 1,
|
||||
PinLevelHigh = 1,
|
||||
PinLevelLow = 0,
|
||||
};
|
||||
|
||||
// ex: pinMode(B0, PinDirectionOutput);
|
||||
static inline void pinMode(uint8_t pin, int mode) {
|
||||
uint8_t bv = _BV(pin & 0xf);
|
||||
if (mode == PinDirectionOutput) {
|
||||
_SFR_IO8((pin >> 4) + 1) |= bv;
|
||||
} else {
|
||||
_SFR_IO8((pin >> 4) + 1) &= ~bv;
|
||||
_SFR_IO8((pin >> 4) + 2) &= ~bv;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ex: digitalWrite(B0, PinLevelHigh);
|
||||
static inline void digitalWrite(uint8_t pin, int mode) {
|
||||
uint8_t bv = _BV(pin & 0xf);
|
||||
if (mode == PinLevelHigh) {
|
||||
_SFR_IO8((pin >> 4) + 2) |= bv;
|
||||
} else {
|
||||
_SFR_IO8((pin >> 4) + 2) &= ~bv;
|
||||
// ex: digitalWrite(B0, PinLevelHigh);
|
||||
static inline void digitalWrite(uint8_t pin, int mode) {
|
||||
uint8_t bv = _BV(pin & 0xf);
|
||||
if (mode == PinLevelHigh) {
|
||||
_SFR_IO8((pin >> 4) + 2) |= bv;
|
||||
} else {
|
||||
_SFR_IO8((pin >> 4) + 2) &= ~bv;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Return true if the pin is HIGH
|
||||
// digitalRead(B0)
|
||||
static inline bool digitalRead(uint8_t pin) {
|
||||
return _SFR_IO8(pin >> 4) & _BV(pin & 0xf);
|
||||
}
|
||||
// Return true if the pin is HIGH
|
||||
// digitalRead(B0)
|
||||
static inline bool digitalRead(uint8_t pin) {
|
||||
return _SFR_IO8(pin >> 4) & _BV(pin & 0xf);
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -41,6 +41,7 @@
|
||||
#include <stdlib.h>
|
||||
#include "print.h"
|
||||
#include "send_string_keycodes.h"
|
||||
#include "pincontrol.h"
|
||||
|
||||
extern uint32_t default_layer_state;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user