mh
/
qmk_firmware
mirror of https://github.com/qmk/qmk_firmware/
1
0
Fork 0
Code Issues 0 Projects 0 Releases 1.6k Wiki Activity
Browse Source

FFKeebs Siris Configurator Layout Correction (#13328) 

* physically arrange layout macro

Arranges the layout macro and keycodes to resemble the assembled keyboard.

* correct info.json data

Corrects the key sequence and positioning in info.json.
pull/13351/head
James Young 2 years ago
committed by GitHub
parent
234c129f1e
commit
b1ea4842e3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 123 additions and 341 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +71
    -291
      keyboards/ffkeebs/siris/info.json
  2. +21
    -20
      keyboards/ffkeebs/siris/keymaps/default/keymap.c
  3. +21
    -20
      keyboards/ffkeebs/siris/keymaps/via/keymap.c
  4. +10
    -10
      keyboards/ffkeebs/siris/siris.h

+ 71
- 291
keyboards/ffkeebs/siris/info.json View File

@ -1,293 +1,73 @@
{
"keyboard_name":"Siris",
"url":"https://github.com/swiftrax",
"maintainer":"Swiftrax",
"width":17.75,
"height":5.5,
"layouts":{
"LAYOUT":{
"layout":[
{
"label":"0,3",
"x":3.5,
"y":0
},
{
"label":"0,8",
"x":13.75,
"y":0
},
{
"label":"0,2",
"x":2.5,
"y":0.125
},
{
"label":"0,4",
"x":4.5,
"y":0.125
},
{
"label":"0,7",
"x":12.75,
"y":0.13
},
{
"label":"0,9",
"x":14.75,
"y":0.13
},
{
"label":"0,5",
"x":5.5,
"y":0.25
},
{
"label":"0,6",
"x":11.75,
"y":0.25
},
{
"label":"0,1",
"x":1.5,
"y":0.375
},
{
"label":"0,0",
"x":0.5,
"y":0.38
},
{
"label":"0,10",
"x":15.75,
"y":0.38
},
{
"label":"0,11",
"x":16.75,
"y":0.38
},
{
"label":"1,3",
"x":3.5,
"y":1.0
},
{
"label":"1,8",
"x":13.75,
"y":1.0
},
{
"label":"1,2",
"x":2.5,
"y":1.125
},
{
"label":"1,4",
"x":4.5,
"y":1.125
},
{
"label":"1,7",
"x":12.75,
"y":1.13
},
{
"label":"1,9",
"x":14.75,
"y":1.13
},
{
"label":"1,5",
"x":5.5,
"y":1.25
},
{
"label":"1,6",
"x":11.75,
"y":1.25
},
{
"label":"1,1",
"x":1.5,
"y":1.375
},
{
"label":"1,0",
"x":0.5,
"y":1.38
},
{
"label":"1,10",
"x":15.75,
"y":1.38
},
{
"label":"1,11",
"x":16.75,
"y":1.38
},
{
"label":"2,3",
"x":3.5,
"y":2
},
{
"label":"2,8",
"x":13.75,
"y":2
},
{
"label":"2,2",
"x":2.5,
"y":2.125
},
{
"label":"2,4",
"x":4.5,
"y":2.125
},
{
"label":"2,7",
"x":12.75,
"y":2.13
},
{
"label":"2,9",
"x":14.75,
"y":2.13
},
{
"label":"2,5",
"x":5.5,
"y":2.25
},
{
"label":"2,6",
"x":11.75,
"y":2.25
},
{
"label":"2,1",
"x":1.5,
"y":2.375
},
{
"label":"2,0",
"x":0.5,
"y":2.38
},
{
"label":"2,10",
"x":15.75,
"y":2.38
},
{
"label":"2,11",
"x":16.75,
"y":2.38
},
{
"label":"4,5",
"x":6.75,
"y":2.63
},
{
"label":"4,6",
"x":10.5,
"y":2.63
},
{
"label":"3,3",
"x":3.5,
"y":3
},
{
"label":"3,8",
"x":13.75,
"y":3
},
{
"label":"3,2",
"x":2.5,
"y":3.125
},
{
"label":"3,4",
"x":4.5,
"y":3.125
},
{
"label":"3,7",
"x":12.75,
"y":3.13
},
{
"label":"3,9",
"x":14.75,
"y":3.13
},
{
"label":"3,5",
"x":5.5,
"y":3.25
},
{
"label":"3,6",
"x":11.75,
"y":3.25
},
{
"label":"3,1",
"x":1.5,
"y":3.375
},
{
"label":"3,0",
"x":0.5,
"y":3.38
},
{
"label":"3,10",
"x":15.75,
"y":3.38
},
{
"label":"3,11",
"x":16.75,
"y":3.38
},
{
"label":"4,2",
"x":4.25,
"y":4.15
},
{
"label":"4,0",
"x":13,
"y":4.15
},
{
"label":"4,3",
"x":5.25,
"y":4.25
},
{
"label":"4,8",
"x":12,
"y":4.25
},
{
"x":6.5,
"y":4.5,
"w":1.5
},
{
"x":10.25,
"y":4.5,
"w":1.5
}
]
}
}
"keyboard_name": "Siris",
"url": "https: //github.com/swiftrax",
"maintainer": "Swiftrax",
"width": 16,
"height": 5.5,
"layouts": {
"LAYOUT": {
"layout": [
{"label":"0,0", "x":0, "y":0.375},
{"label":"0,1", "x":1, "y":0.375},
{"label":"0,2", "x":2, "y":0.125},
{"label":"0,3", "x":3, "y":0},
{"label":"0,4", "x":4, "y":0.125},
{"label":"0,5", "x":5, "y":0.25},
{"label":"0,6", "x":10, "y":0.25},
{"label":"0,7", "x":11, "y":0.125},
{"label":"0,8", "x":12, "y":0},
{"label":"0,9", "x":13, "y":0.125},
{"label":"0,10", "x":14, "y":0.375},
{"label":"0,11", "x":15, "y":0.375},
{"label":"1,0", "x":0, "y":1.375},
{"label":"1,1", "x":1, "y":1.375},
{"label":"1,2", "x":2, "y":1.125},
{"label":"1,3", "x":3, "y":1},
{"label":"1,4", "x":4, "y":1.125},
{"label":"1,5", "x":5, "y":1.25},
{"label":"1,6", "x":10, "y":1.25},
{"label":"1,7", "x":11, "y":1.125},
{"label":"1,8", "x":12, "y":1},
{"label":"1,9", "x":13, "y":1.125},
{"label":"1,10", "x":14, "y":1.375},
{"label":"1,11", "x":15, "y":1.375},
{"label":"2,0", "x":0, "y":2.375},
{"label":"2,1", "x":1, "y":2.375},
{"label":"2,2", "x":2, "y":2.125},
{"label":"2,3", "x":3, "y":2},
{"label":"2,4", "x":4, "y":2.125},
{"label":"2,5", "x":5, "y":2.25},
{"label":"4,5", "x":6.25, "y":2.625},
{"label":"4,6", "x":8.75, "y":2.625},
{"label":"2,6", "x":10, "y":2.25},
{"label":"2,7", "x":11, "y":2.125},
{"label":"2,8", "x":12, "y":2},
{"label":"2,9", "x":13, "y":2.125},
{"label":"2,10", "x":14, "y":2.375},
{"label":"2,11", "x":15, "y":2.375},
{"label":"3,0", "x":0, "y":3.375},
{"label":"3,1", "x":1, "y":3.375},
{"label":"3,2", "x":2, "y":3.125},
{"label":"3,3", "x":3, "y":3},
{"label":"3,4", "x":4, "y":3.125},
{"label":"3,5", "x":5, "y":3.25},
{"label":"3,6", "x":10, "y":3.25},
{"label":"3,7", "x":11, "y":3.125},
{"label":"3,8", "x":12, "y":3},
{"label":"3,9", "x":13, "y":3.125},
{"label":"3,10", "x":14, "y":3.375},
{"label":"3,11", "x":15, "y":3.375},
{"label":"4,2", "x":3.75, "y":4.15},
{"label":"4,3", "x":4.75, "y":4.25},
{"x":6, "y":4.5, "w":1.5},
{"x":8.5, "y":4.5, "w":1.5},
{"label":"4,8", "x":10.25, "y":4.25},
{"label":"4,0", "x":11.25, "y":4.15}
]
}
}
}

+ 21
- 20
keyboards/ffkeebs/siris/keymaps/default/keymap.c View File

@ -18,30 +18,31 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_MINS,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
KC_LGUI, MO(1), KC_SPC, KC_LBRC, KC_RBRC, KC_ENT, MO(2), KC_BSPC),
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_MINS,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LBRC, KC_RBRC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
KC_LGUI, MO(1), KC_SPC, KC_ENT, MO(2), KC_BSPC),
[1] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______),
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______),
[2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______),
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______),
[3] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______),
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______),
};
bool encoder_update_user(uint8_t index, bool clockwise) {


+ 21
- 20
keyboards/ffkeebs/siris/keymaps/via/keymap.c View File

@ -18,30 +18,31 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_MINS,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
KC_LGUI, MO(1), KC_SPC, KC_LBRC, KC_RBRC, KC_ENT, MO(2), KC_BSPC),
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_MINS,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LBRC, KC_RBRC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
KC_LGUI, MO(1), KC_SPC, KC_ENT, MO(2), KC_BSPC),
[1] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______),
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______),
[2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______),
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______),
[3] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______),
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______),
};
bool encoder_update_user(uint8_t index, bool clockwise) {


+ 10
- 10
keyboards/ffkeebs/siris/siris.h View File

@ -23,15 +23,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define XXX KC_NO
#define LAYOUT( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
K42, K43, K44, K45, K46, K47, K48, K49 \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
K20, K21, K22, K23, K24, K25, K45, K46, K26, K27, K28, K29, K2A, K2B, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
K42, K43, K44, K47, K48, K49 \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }, \
{ XXX, XXX, K42, K43, K44, K45, K46, K47, K48, K49, XXX, XXX } \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }, \
{ XXX, XXX, K42, K43, K44, K45, K46, K47, K48, K49, XXX, XXX } \
}

Write Preview
Loading…
Cancel
Save