Merge remote-tracking branch 'origin/master' into develop
QMK Bot
commit
b87b402ea5
|
|
@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define PRODUCT_ID 0x0000
|
||||
#define DEVICE_VER 0x0100
|
||||
#define MANUFACTURER shiftux
|
||||
#define PRODUCT The Redox Keyboard
|
||||
#define PRODUCT Redox Media
|
||||
|
||||
/* key matrix size */
|
||||
// Rows are doubled-up
|
||||
|
|
@ -57,4 +57,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#define ENCODERS_PAD_A { F4 }
|
||||
#define ENCODERS_PAD_B { F5 }
|
||||
#define ENCODER_RESOLUTION 4
|
||||
#define ENCODER_RESOLUTION 4
|
||||
|
|
|
|||
|
|
@ -0,0 +1,89 @@
|
|||
{
|
||||
"keyboard_name": "Redox Media",
|
||||
"url": "",
|
||||
"maintainer": "shiftux",
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"label":"Mute", "x":5.25, "y":0.15},
|
||||
{"label":"Play", "x":12.25, "y":0.15},
|
||||
{"label":"Next", "x":13.5, "y":0},
|
||||
|
||||
{"label":"_Nav || `", "x":0, "y":1.375, "w":1.25},
|
||||
{"label":"1", "x":1.25, "y":1.375},
|
||||
{"label":"2", "x":2.25, "y":1.125},
|
||||
{"label":"3", "x":3.25, "y":1},
|
||||
{"label":"4", "x":4.25, "y":1.125},
|
||||
{"label":"5", "x":5.25, "y":1.25},
|
||||
{"label":"6", "x":12.25, "y":1.25},
|
||||
{"label":"7", "x":13.25, "y":1.125},
|
||||
{"label":"8", "x":14.25, "y":1},
|
||||
{"label":"9", "x":15.25, "y":1.125},
|
||||
{"label":"0", "x":16.25, "y":1.375},
|
||||
{"label":"_Nav || -", "x":17.25, "y":1.375, "w":1.25},
|
||||
|
||||
{"label":"Tab", "x":0, "y":2.375, "w":1.25},
|
||||
{"label":"Q", "x":1.25, "y":2.375},
|
||||
{"label":"W", "x":2.25, "y":2.125},
|
||||
{"label":"E", "x":3.25, "y":2},
|
||||
{"label":"R", "x":4.25, "y":2.125},
|
||||
{"label":"T", "x":5.25, "y":2.25},
|
||||
{"label":"MO(_SYMB)", "x":6.25, "y":1.75},
|
||||
{"label":"MO(_SYMB)", "x":11.25, "y":1.75},
|
||||
{"label":"Y", "x":12.25, "y":2.25},
|
||||
{"label":"U", "x":13.25, "y":2.125},
|
||||
{"label":"I", "x":14.25, "y":2},
|
||||
{"label":"O", "x":15.25, "y":2.125},
|
||||
{"label":"P", "x":16.25, "y":2.375},
|
||||
{"label":"=", "x":17.25, "y":2.375, "w":1.25},
|
||||
|
||||
{"label":"Esc", "x":0, "y":3.375, "w":1.25},
|
||||
{"label":"A", "x":1.25, "y":3.375},
|
||||
{"label":"S", "x":2.25, "y":3.125},
|
||||
{"label":"D", "x":3.25, "y":3},
|
||||
{"label":"F", "x":4.25, "y":3.125},
|
||||
{"label":"G", "x":5.25, "y":3.25},
|
||||
{"label":"[", "x":6.25, "y":3},
|
||||
{"label":"]", "x":11.25, "y":3},
|
||||
{"label":"H", "x":12.25, "y":3.25},
|
||||
{"label":"J", "x":13.25, "y":3.125},
|
||||
{"label":"K", "x":14.25, "y":3},
|
||||
{"label":"L", "x":15.25, "y":3.125},
|
||||
{"label":";", "x":16.25, "y":3.375},
|
||||
{"label":"'", "x":17.25, "y":3.375, "w":1.25},
|
||||
|
||||
{"label":"Shift", "x":0, "y":4.375, "w":1.25},
|
||||
{"label":"Z", "x":1.25, "y":4.375},
|
||||
{"label":"X", "x":2.25, "y":4.125},
|
||||
{"label":"C", "x":3.25, "y":4},
|
||||
{"label":"V", "x":4.25, "y":4.125},
|
||||
{"label":"B", "x":5.25, "y":4.25},
|
||||
{"label":"_Adjust/Page Up", "x":6.75, "y":4.75},
|
||||
{"label":"Page Down", "x":7.75, "y":4.75},
|
||||
{"label":"Home", "x":9.75, "y":4.75},
|
||||
{"label":"_Adjust/End", "x":10.75, "y":4.75},
|
||||
{"label":"N", "x":12.25, "y":4.25},
|
||||
{"label":"M", "x":13.25, "y":4.125},
|
||||
{"label":",", "x":14.25, "y":4},
|
||||
{"label":",", "x":15.25, "y":4.125},
|
||||
{"label":"\\", "x":16.25, "y":4.375},
|
||||
{"label":"Shift", "x":17.25, "y":4.375, "w":1.25},
|
||||
|
||||
{"label":"LGUI", "x":0.25, "y":5.375},
|
||||
{"label":"P+", "x":1.25, "y":5.375},
|
||||
{"label":"P-", "x":2.25, "y":5.125},
|
||||
{"label":"LAlt || P*", "x":3.25, "y":5},
|
||||
{"label":"LCtrl || P/", "x":5.5, "y":6.25, "w":1.25},
|
||||
{"label":"Backspace", "x":6.75, "y":5.75, "h":1.5},
|
||||
{"label":"Delete", "x":7.75, "y":5.75, "h":1.5},
|
||||
{"label":"Enter", "x":9.75, "y":5.75, "h":1.5},
|
||||
{"label":"Space", "x":10.75, "y":5.75, "h":1.5},
|
||||
{"label":"RAlt", "x":11.75, "y":6.25, "w":1.25},
|
||||
{"label":"Left", "x":14.25, "y":5},
|
||||
{"label":"Down", "x":15.25, "y":5.125},
|
||||
{"label":"Up", "x":16.25, "y":5.375},
|
||||
{"label":"Right", "x":17.25, "y":5.375}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -19,28 +19,51 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#include "quantum.h"
|
||||
|
||||
#define XXX KC_NO
|
||||
|
||||
/*
|
||||
* ┌───┐ ┌───┐┌───┐
|
||||
* │56 │ │B6 ││B5 │
|
||||
* └───┘ └───┘└───┘
|
||||
* ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┐
|
||||
* │00 │01 │02 │03 │04 │05 │ │65 │64 │63 │62 │61 │60 │
|
||||
* ├───┼───┼───┼───┼───┼───┼───┐ ┌───┼───┼───┼───┼───┼───┼───┤
|
||||
* │10 │11 │12 │13 │14 │15 │06 │ │66 │75 │74 │73 │72 │71 │70 │
|
||||
* ├───┼───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┼───┤
|
||||
* │20 │21 │22 │23 │24 │25 │16 │ │76 │85 │84 │83 │82 │81 │80 │
|
||||
* ├───┼───┼───┼───┼───┼───┼───┘ └───┼───┼───┼───┼───┼───┼───┤
|
||||
* │30 │31 │32 │33 │34 │35 │ ┌───┬───┐ ┌───┬───┐ │95 │94 │93 │92 │91 │90 │
|
||||
* ├───┼───┼───┼───┼───┴───┘ │26 │36 │ │96 │86 │ └───┴───┼───┼───┼───┼───┤
|
||||
* │40 │41 │42 │43 │ ├───┼───┤ ├───┼───┤ │A3 │A2 │A1 │A0 │
|
||||
* └───┴───┴───┴───┘ ┌────┤ │ │ │ │ ├────┐ └───┴───┴───┴───┘
|
||||
* │44 │45 │46 │ │A6 │A5 │A4 │
|
||||
* └────┴───┴───┘ └───┴───┴────┘
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
// rows are doubled
|
||||
// clang-format off
|
||||
#define LAYOUT( \
|
||||
R5C6, R11C6, R11C5, \
|
||||
R0C0, R0C1, R0C2, R0C3, R0C4, R0C5, R6C5, R6C4, R6C3, R6C2, R6C1, R6C0, \
|
||||
R1C0, R1C1, R1C2, R1C3, R1C4, R1C5, R0C6, R6C6, R7C5, R7C4, R7C3, R7C2, R7C1, R7C0, \
|
||||
R2C0, R2C1, R2C2, R2C3, R2C4, R2C5, R1C6, R7C6, R8C5, R8C4, R8C3, R8C2, R8C1, R8C0, \
|
||||
R3C0, R3C1, R3C2, R3C3, R3C4, R3C5, R2C6, R3C6, R9C6, R8C6, R9C5, R9C4, R9C3, R9C2, R9C1, R9C0, \
|
||||
R4C0, R4C1, R4C2, R4C3, R4C4, R4C5, R4C6, R10C6, R10C5, R10C4, R10C3, R10C2, R10C1, R10C0 \
|
||||
K56, KB6, KB5, \
|
||||
K00, K01, K02, K03, K04, K05, K65, K64, K63, K62, K61, K60, \
|
||||
K10, K11, K12, K13, K14, K15, K06, K66, K75, K74, K73, K72, K71, K70, \
|
||||
K20, K21, K22, K23, K24, K25, K16, K76, K85, K84, K83, K82, K81, K80, \
|
||||
K30, K31, K32, K33, K34, K35, K26, K36, K96, K86, K95, K94, K93, K92, K91, K90, \
|
||||
K40, K41, K42, K43, K44, K45, K46, KA6, KA5, KA4, KA3, KA2, KA1, KA0 \
|
||||
) \
|
||||
{ \
|
||||
{ R0C0, R0C1, R0C2, R0C3, R0C4, R0C5, R0C6 }, \
|
||||
{ R1C0, R1C1, R1C2, R1C3, R1C4, R1C5, R1C6 }, \
|
||||
{ R2C0, R2C1, R2C2, R2C3, R2C4, R2C5, R2C6 }, \
|
||||
{ R3C0, R3C1, R3C2, R3C3, R3C4, R3C5, R3C6 }, \
|
||||
{ R4C0, R4C1, R4C2, R4C3, R4C4, R4C5, R4C6 }, \
|
||||
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R5C6 }, \
|
||||
{ K00, K01, K02, K03, K04, K05, K06 }, \
|
||||
{ K10, K11, K12, K13, K14, K15, K16 }, \
|
||||
{ K20, K21, K22, K23, K24, K25, K26 }, \
|
||||
{ K30, K31, K32, K33, K34, K35, K36 }, \
|
||||
{ K40, K41, K42, K43, K44, K45, K46 }, \
|
||||
{ XXX, XXX, XXX, XXX, XXX, XXX, K56 }, \
|
||||
\
|
||||
{ R6C0, R6C1, R6C2, R6C3, R6C4, R6C5, R6C6 }, \
|
||||
{ R7C0, R7C1, R7C2, R7C3, R7C4, R7C5, R7C6 }, \
|
||||
{ R8C0, R8C1, R8C2, R8C3, R8C4, R8C5, R8C6 }, \
|
||||
{ R9C0, R9C1, R9C2, R9C3, R9C4, R9C5, R9C6 }, \
|
||||
{ R10C0, R10C1, R10C2, R10C3, R10C4, R10C5, R10C6 }, \
|
||||
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R11C5, R11C6 } \
|
||||
{ K60, K61, K62, K63, K64, K65, K66 }, \
|
||||
{ K70, K71, K72, K73, K74, K75, K76 }, \
|
||||
{ K80, K81, K82, K83, K84, K85, K86 }, \
|
||||
{ K90, K91, K92, K93, K94, K95, K96 }, \
|
||||
{ KA0, KA1, KA2, KA3, KA4, KA5, KA6 }, \
|
||||
{ XXX, XXX, XXX, XXX, XXX, KB5, KB6 } \
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue