[Keyboard] Instant60 VIA Support (#5909)
* VIA Support for Instant60 * Backlighting updates * Update default keymap * Add Standard layout default VIA supported layout * Clean up some backslashes * Add info.json * Update info json metadata * add info.json for practice65 * Update keyboards/cannonkeys/instant60/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/practice65/info.json Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cannonkeys/instant60/keymaps/via/keymap.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * Remove unused enum
This commit is contained in:
Andrew Kannan
Drashna Jaelre
parent
b479eff940
commit
e8372692c5
10 changed files with 317 additions and 11 deletions
|
|
@ -66,12 +66,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
// Bump this every time we change what we store
|
// Bump this every time we change what we store
|
||||||
// This will automatically reset the EEPROM with defaults
|
// This will automatically reset the EEPROM with defaults
|
||||||
// and avoid loading invalid data from the EEPROM
|
// and avoid loading invalid data from the EEPROM
|
||||||
#define EEPROM_VERSION 0x01
|
#define EEPROM_VERSION 0x02
|
||||||
#define EEPROM_VERSION_ADDR 34
|
#define EEPROM_VERSION_ADDR 34
|
||||||
|
|
||||||
#define EEPROM_CUSTOM_BACKLIGHT 804
|
|
||||||
|
|
||||||
|
|
||||||
|
#define DYNAMIC_KEYMAP_LAYER_COUNT 4
|
||||||
|
// Dynamic macro starts after dynamic keymaps (35+(4*5*15*2)) = (35+600) = 635
|
||||||
|
// start + layer * rows * col * 2
|
||||||
|
#define DYNAMIC_KEYMAP_EEPROM_ADDR 35
|
||||||
|
#define EEPROM_CUSTOM_BACKLIGHT 636
|
||||||
|
#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 637
|
||||||
|
#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 200
|
||||||
|
#define DYNAMIC_KEYMAP_MACRO_COUNT 16
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Feature disable options
|
* Feature disable options
|
||||||
|
|
|
||||||
15
keyboards/cannonkeys/instant60/info.json
Normal file
15
keyboards/cannonkeys/instant60/info.json
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
{
|
||||||
|
"keyboard_name": "Instant60",
|
||||||
|
"url": "https://cannonkeys.com",
|
||||||
|
"maintainer": "awkannan",
|
||||||
|
"width": 15,
|
||||||
|
"height": 5,
|
||||||
|
"layouts": {
|
||||||
|
"LAYOUT_ansi": {
|
||||||
|
"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
|
||||||
|
},
|
||||||
|
"LAYOUT_tsangan": {
|
||||||
|
"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -31,18 +31,18 @@ enum custom_keycodes {
|
||||||
|
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
[_BASE] = LAYOUT_tsangan(
|
[_BASE] = LAYOUT_tsangan(
|
||||||
KC_GESC, 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_DEL, \
|
KC_GESC, 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_BSLS, KC_DEL, \
|
||||||
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_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_BSPC, \
|
||||||
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_ENT, \
|
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_ENT, \
|
||||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN1),\
|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN1),\
|
||||||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
|
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
|
||||||
),
|
),
|
||||||
|
|
||||||
[_FN1] = LAYOUT_tsangan(
|
[_FN1] = LAYOUT_tsangan(
|
||||||
KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,\
|
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,\
|
||||||
RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
|
RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
|
||||||
BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
|
BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
|
||||||
BL_INC, BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
|
BL_INC, BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
|
||||||
KC_GRV, _______, _______, _______, _______, _______, RESET
|
_______, _______, _______, _______, _______, _______, RESET
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
|
|
||||||
43
keyboards/cannonkeys/instant60/keymaps/via/keymap.c
Normal file
43
keyboards/cannonkeys/instant60/keymaps/via/keymap.c
Normal file
|
|
@ -0,0 +1,43 @@
|
||||||
|
/*
|
||||||
|
Copyright 2012,2013 Jun Wako <wakojun@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
|
||||||
|
|
||||||
|
|
||||||
|
// Each layer gets a name for readability, which is then used in the keymap matrix below.
|
||||||
|
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
|
||||||
|
// Layer names don't all need to be of the same length, obviously, and you can also skip them
|
||||||
|
// entirely and just use numbers.
|
||||||
|
#define _BASE 0
|
||||||
|
#define _FN1 1
|
||||||
|
|
||||||
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
[_BASE] = LAYOUT_all(
|
||||||
|
KC_GESC, 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_BSLS, KC_DEL,
|
||||||
|
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_BSPC,
|
||||||
|
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_ENT,
|
||||||
|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN1),
|
||||||
|
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN1), KC_RCTL
|
||||||
|
),
|
||||||
|
|
||||||
|
[_FN1] = LAYOUT_all(
|
||||||
|
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
|
||||||
|
RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
BL_INC, BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, RESET
|
||||||
|
)
|
||||||
|
};
|
||||||
5
keyboards/cannonkeys/instant60/keymaps/via/rules.mk
Normal file
5
keyboards/cannonkeys/instant60/keymaps/via/rules.mk
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
# rules.mk overrides to enable VIA
|
||||||
|
|
||||||
|
RAW_ENABLE = yes
|
||||||
|
DYNAMIC_KEYMAP_ENABLE = yes
|
||||||
|
|
||||||
43
keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c
Normal file
43
keyboards/cannonkeys/instant60/keymaps/via_standard/keymap.c
Normal file
|
|
@ -0,0 +1,43 @@
|
||||||
|
/*
|
||||||
|
Copyright 2012,2013 Jun Wako <wakojun@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
|
||||||
|
|
||||||
|
|
||||||
|
// Each layer gets a name for readability, which is then used in the keymap matrix below.
|
||||||
|
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
|
||||||
|
// Layer names don't all need to be of the same length, obviously, and you can also skip them
|
||||||
|
// entirely and just use numbers.
|
||||||
|
#define _BASE 0
|
||||||
|
#define _FN1 1
|
||||||
|
|
||||||
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
[_BASE] = LAYOUT_all(
|
||||||
|
KC_GESC, 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_DEL,
|
||||||
|
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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
|
||||||
|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN1),
|
||||||
|
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN1), KC_RCTL
|
||||||
|
),
|
||||||
|
|
||||||
|
[_FN1] = LAYOUT_all(
|
||||||
|
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
|
||||||
|
RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
BL_INC, BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, RESET
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
# rules.mk overrides to enable VIA
|
||||||
|
|
||||||
|
RAW_ENABLE = yes
|
||||||
|
DYNAMIC_KEYMAP_ENABLE = yes
|
||||||
|
|
||||||
12
keyboards/cannonkeys/practice65/info.json
Normal file
12
keyboards/cannonkeys/practice65/info.json
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
"keyboard_name": "Practice65",
|
||||||
|
"url": "https://cannonkeys.com",
|
||||||
|
"maintainer": "awkannan",
|
||||||
|
"width": 16,
|
||||||
|
"height": 5,
|
||||||
|
"layouts": {
|
||||||
|
"LAYOUT_default": {
|
||||||
|
"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -5,9 +5,16 @@
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "quantum.h"
|
#include "quantum.h"
|
||||||
|
|
||||||
|
#include "ws2812.h"
|
||||||
|
|
||||||
|
#include "raw_hid.h"
|
||||||
|
#include "dynamic_keymap.h"
|
||||||
#include "tmk_core/common/eeprom.h"
|
#include "tmk_core/common/eeprom.h"
|
||||||
|
|
||||||
#include "ws2812.h"
|
// HACK
|
||||||
|
#include "keyboards/zeal60/zeal60_api.h" // Temporary hack
|
||||||
|
#include "keyboards/zeal60/zeal60_keycodes.h" // Temporary hack
|
||||||
|
|
||||||
|
|
||||||
backlight_config_t kb_backlight_config = {
|
backlight_config_t kb_backlight_config = {
|
||||||
.enable = true,
|
.enable = true,
|
||||||
|
|
@ -41,6 +48,17 @@ void load_custom_config(){
|
||||||
kb_backlight_config.raw = eeprom_read_byte((uint8_t*)EEPROM_CUSTOM_BACKLIGHT);
|
kb_backlight_config.raw = eeprom_read_byte((uint8_t*)EEPROM_CUSTOM_BACKLIGHT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef DYNAMIC_KEYMAP_ENABLE
|
||||||
|
void dynamic_keymap_custom_reset(void){
|
||||||
|
void *p = (void*)(EEPROM_CUSTOM_BACKLIGHT);
|
||||||
|
void *end = (void*)(DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR);
|
||||||
|
while ( p != end ) {
|
||||||
|
eeprom_update_byte(p, 0);
|
||||||
|
++p;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void eeprom_init_kb(void)
|
void eeprom_init_kb(void)
|
||||||
{
|
{
|
||||||
// If the EEPROM has the magic, the data is good.
|
// If the EEPROM has the magic, the data is good.
|
||||||
|
|
@ -48,9 +66,17 @@ void eeprom_init_kb(void)
|
||||||
if (eeprom_is_valid()) {
|
if (eeprom_is_valid()) {
|
||||||
load_custom_config();
|
load_custom_config();
|
||||||
} else {
|
} else {
|
||||||
|
#ifdef DYNAMIC_KEYMAP_ENABLE
|
||||||
|
// This resets the keymaps in EEPROM to what is in flash.
|
||||||
|
dynamic_keymap_reset();
|
||||||
|
// This resets the macros in EEPROM to nothing.
|
||||||
|
dynamic_keymap_macro_reset();
|
||||||
|
// Reset the custom stuff
|
||||||
|
dynamic_keymap_custom_reset();
|
||||||
|
#endif
|
||||||
// Save the magic number last, in case saving was interrupted
|
// Save the magic number last, in case saving was interrupted
|
||||||
|
save_backlight_config_to_eeprom();
|
||||||
eeprom_set_valid(true);
|
eeprom_set_valid(true);
|
||||||
save_backlight_config_to_eeprom();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -120,6 +146,158 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
|
||||||
save_backlight_config_to_eeprom();
|
save_backlight_config_to_eeprom();
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef DYNAMIC_KEYMAP_ENABLE
|
||||||
|
// Handle macros
|
||||||
|
if (record->event.pressed) {
|
||||||
|
if ( keycode >= MACRO00 && keycode <= MACRO15 )
|
||||||
|
{
|
||||||
|
uint8_t id = keycode - MACRO00;
|
||||||
|
dynamic_keymap_macro_send(id);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif //DYNAMIC_KEYMAP_ENABLE
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Start Dynamic Keymap code
|
||||||
|
#ifdef RAW_ENABLE
|
||||||
|
|
||||||
|
void raw_hid_receive( uint8_t *data, uint8_t length )
|
||||||
|
{
|
||||||
|
uint8_t *command_id = &(data[0]);
|
||||||
|
uint8_t *command_data = &(data[1]);
|
||||||
|
switch ( *command_id )
|
||||||
|
{
|
||||||
|
case id_get_protocol_version:
|
||||||
|
{
|
||||||
|
command_data[0] = PROTOCOL_VERSION >> 8;
|
||||||
|
command_data[1] = PROTOCOL_VERSION & 0xFF;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case id_get_keyboard_value:
|
||||||
|
{
|
||||||
|
switch( command_data[0])
|
||||||
|
{
|
||||||
|
case id_uptime:
|
||||||
|
{
|
||||||
|
uint32_t value = timer_read32();
|
||||||
|
command_data[1] = (value >> 24 ) & 0xFF;
|
||||||
|
command_data[2] = (value >> 16 ) & 0xFF;
|
||||||
|
command_data[3] = (value >> 8 ) & 0xFF;
|
||||||
|
command_data[4] = value & 0xFF;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
{
|
||||||
|
*command_id = id_unhandled;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
#ifdef DYNAMIC_KEYMAP_ENABLE
|
||||||
|
|
||||||
|
case id_dynamic_keymap_get_keycode:
|
||||||
|
{
|
||||||
|
uint16_t keycode = dynamic_keymap_get_keycode( command_data[0], command_data[1], command_data[2] );
|
||||||
|
command_data[3] = keycode >> 8;
|
||||||
|
command_data[4] = keycode & 0xFF;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case id_dynamic_keymap_set_keycode:
|
||||||
|
{
|
||||||
|
dynamic_keymap_set_keycode( command_data[0], command_data[1], command_data[2], ( command_data[3] << 8 ) | command_data[4] );
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case id_dynamic_keymap_reset:
|
||||||
|
{
|
||||||
|
dynamic_keymap_reset();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case id_dynamic_keymap_macro_get_count:
|
||||||
|
{
|
||||||
|
command_data[0] = dynamic_keymap_macro_get_count();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case id_dynamic_keymap_macro_get_buffer_size:
|
||||||
|
{
|
||||||
|
uint16_t size = dynamic_keymap_macro_get_buffer_size();
|
||||||
|
command_data[0] = size >> 8;
|
||||||
|
command_data[1] = size & 0xFF;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case id_dynamic_keymap_macro_get_buffer:
|
||||||
|
{
|
||||||
|
uint16_t offset = ( command_data[0] << 8 ) | command_data[1];
|
||||||
|
uint16_t size = command_data[2]; // size <= 28
|
||||||
|
dynamic_keymap_macro_get_buffer( offset, size, &command_data[3] );
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case id_dynamic_keymap_macro_set_buffer:
|
||||||
|
{
|
||||||
|
uint16_t offset = ( command_data[0] << 8 ) | command_data[1];
|
||||||
|
uint16_t size = command_data[2]; // size <= 28
|
||||||
|
dynamic_keymap_macro_set_buffer( offset, size, &command_data[3] );
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case id_dynamic_keymap_macro_reset:
|
||||||
|
{
|
||||||
|
dynamic_keymap_macro_reset();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case id_dynamic_keymap_get_layer_count:
|
||||||
|
{
|
||||||
|
command_data[0] = dynamic_keymap_get_layer_count();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case id_dynamic_keymap_get_buffer:
|
||||||
|
{
|
||||||
|
uint16_t offset = ( command_data[0] << 8 ) | command_data[1];
|
||||||
|
uint16_t size = command_data[2]; // size <= 28
|
||||||
|
dynamic_keymap_get_buffer( offset, size, &command_data[3] );
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case id_dynamic_keymap_set_buffer:
|
||||||
|
{
|
||||||
|
uint16_t offset = ( command_data[0] << 8 ) | command_data[1];
|
||||||
|
uint16_t size = command_data[2]; // size <= 28
|
||||||
|
dynamic_keymap_set_buffer( offset, size, &command_data[3] );
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
#endif // DYNAMIC_KEYMAP_ENABLE
|
||||||
|
case id_eeprom_reset:
|
||||||
|
{
|
||||||
|
eeprom_reset();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case id_bootloader_jump:
|
||||||
|
{
|
||||||
|
// Need to send data back before the jump
|
||||||
|
// Informs host that the command is handled
|
||||||
|
raw_hid_send( data, length );
|
||||||
|
// Give host time to read it
|
||||||
|
wait_ms(100);
|
||||||
|
bootloader_jump();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
{
|
||||||
|
// Unhandled message.
|
||||||
|
*command_id = id_unhandled;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return same buffer with values changed
|
||||||
|
raw_hid_send( data, length );
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -77,10 +77,9 @@ void backlight_init_ports(void) {
|
||||||
pwmStart(&PWMD3, &pwmCFG);
|
pwmStart(&PWMD3, &pwmCFG);
|
||||||
// pwmEnableChannel(&PWMD3, 0, PWM_FRACTION_TO_WIDTH(&PWMD3, 0xFFFF,cie_lightness(0xFFFF)));
|
// pwmEnableChannel(&PWMD3, 0, PWM_FRACTION_TO_WIDTH(&PWMD3, 0xFFFF,cie_lightness(0xFFFF)));
|
||||||
if(kb_backlight_config.enable){
|
if(kb_backlight_config.enable){
|
||||||
|
backlight_set(kb_backlight_config.level);
|
||||||
if(kb_backlight_config.breathing){
|
if(kb_backlight_config.breathing){
|
||||||
breathing_enable();
|
breathing_enable();
|
||||||
} else{
|
|
||||||
backlight_set(kb_backlight_config.level);
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
backlight_set(0);
|
backlight_set(0);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue