~ruther/qmk_firmware

d35a98ca2482745b0f4b45f4dd3a80552e46289e — James Young 3 years ago 9d070e6
dyz selka40 touch-up (#14748)

* friendly-format info.json

* remove info.json rounding errors

* fix info.json layout macro reference

JSON data referenced `LAYOUT` instead of `LAYOUT_all`.

* correct info.json key sequence

* remove dead space from info.json layout data

* remove vertical offsets from info.json layout data

* horizontally align info.json layout data

* add matrix diagram to selka40.h

* add LAYOUT_2u_bs

* remove duplicated settings
3 files changed, 136 insertions(+), 22 deletions(-)

M keyboards/dyz/selka40/config.h
M keyboards/dyz/selka40/info.json
M keyboards/dyz/selka40/selka40.h
M keyboards/dyz/selka40/config.h => keyboards/dyz/selka40/config.h +0 -15
@@ 23,21 23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#define MANUFACTURER    dyz
#define PRODUCT         selka40

/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 13

/*
 * Keyboard Matrix Assignments
 *
 * Change this to how you wired your keyboard
 * COLS: AVR pins used for columns, left to right
 * ROWS: AVR pins used for rows, top to bottom
 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
 *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
 *
*/

/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5


M keyboards/dyz/selka40/info.json => keyboards/dyz/selka40/info.json +104 -2
@@ 23,8 23,110 @@
        "device_ver": "0x0001"
    },
    "layouts": {
        "LAYOUT": {
            "layout": [{"label":"Esc", "x":1.03, "y":2.45}, {"label":"Q", "x":2.03, "y":2.45}, {"label":"P", "x":11.969999999999999, "y":2.45}, {"label":"{", "x":12.969999999999999, "y":2.45}, {"label":"}", "x":13.969999999999999, "y":2.45}, {"label":"Tab", "x":0.9, "y":3.45, "w":1.25}, {"label":"A", "x":2.15, "y":3.45}, {"label":"\"", "x":12.34, "y":3.45}, {"label":"Enter", "x":13.34, "y":3.45, "w":1.75}, {"label":"Shift", "x":0.75, "y":4.45, "w":1.75}, {"label":"Z", "x":2.5, "y":4.45}, {"label":">", "x":11.97, "y":4.45}, {"label":"?", "x":12.97, "y":4.45}, {"label":"Shift", "x":13.97, "y":4.45, "w":1.25}, {"label":"Ctrl", "x":1, "y":5.45, "w":1.25}, {"label":"Win", "x":2.25, "y":5.45}, {"label":"Fn2", "x":12.72, "y":5.45}, {"label":"Ctrl", "x":13.72, "y":5.45, "w":1.25}, {"label":"W", "x":3.47, "y":1.9300000000000006}, {"label":"E", "x":4.47, "y":1.9300000000000006}, {"label":"R", "x":5.47, "y":1.9300000000000006}, {"label":"T", "x":6.47, "y":1.9300000000000006}, {"label":"S", "x":3.72, "y":2.9300000000000006}, {"label":"D", "x":4.72, "y":2.9300000000000006}, {"label":"F", "x":5.72, "y":2.9300000000000006}, {"label":"G", "x":6.72, "y":2.9300000000000006}, {"label":"X", "x":4.22, "y":3.9300000000000006}, {"label":"C", "x":5.22, "y":3.9300000000000006}, {"label":"V", "x":6.22, "y":3.9300000000000006}, {"label":"B", "x":7.22, "y":3.9300000000000006}, {"label":"Alt", "x":5.22, "y":4.930000000000001}, {"label":"Space", "x":6.22, "y":4.930000000000001, "w":2}, {"label":"Y", "x":7.37, "y":4.1000000000000005}, {"label":"U", "x":8.37, "y":4.1000000000000005}, {"label":"I", "x":9.37, "y":4.1000000000000005}, {"label":"O", "x":10.37, "y":4.1000000000000005}, {"label":"H", "x":7.62, "y":5.1000000000000005}, {"label":"J", "x":8.62, "y":5.1000000000000005}, {"label":"K", "x":9.62, "y":5.1000000000000005}, {"label":"L", "x":10.62, "y":5.1000000000000005}, {"label":"B", "x":7.12, "y":6.1000000000000005}, {"label":"N", "x":8.12, "y":6.1000000000000005}, {"label":"M", "x":9.12, "y":6.1000000000000005}, {"label":"<", "x":10.12, "y":6.1000000000000005}, {"label":"Space", "x":7.12, "y":7.1000000000000005, "w":2.25}, {"label":"Fn", "x":9.37, "y":7.1000000000000005}]
        "LAYOUT_all": {
            "layout": [
                {"label":"Esc", "x":0.5, "y":0},
                {"label":"Q", "x":1.5, "y":0},
                {"label":"W", "x":2.5, "y":0},
                {"label":"E", "x":3.5, "y":0},
                {"label":"R", "x":4.5, "y":0},
                {"label":"T", "x":5.5, "y":0},
                {"label":"Y", "x":7.5, "y":0},
                {"label":"U", "x":8.5, "y":0},
                {"label":"I", "x":9.5, "y":0},
                {"label":"O", "x":10.5, "y":0},
                {"label":"P", "x":11.5, "y":0},
                {"label":"{", "x":12.5, "y":0},
                {"label":"}", "x":13.5, "y":0},

                {"label":"Tab", "x":0.25, "y":1, "w":1.25},
                {"label":"A", "x":1.5, "y":1},
                {"label":"S", "x":2.5, "y":1},
                {"label":"D", "x":3.5, "y":1},
                {"label":"F", "x":4.5, "y":1},
                {"label":"G", "x":5.5, "y":1},
                {"label":"H", "x":8, "y":1},
                {"label":"J", "x":9, "y":1},
                {"label":"K", "x":10, "y":1},
                {"label":"L", "x":11, "y":1},
                {"label":"\"", "x":12, "y":1},
                {"label":"Enter", "x":13, "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":"B", "x":7.75, "y":2},
                {"label":"N", "x":8.75, "y":2},
                {"label":"M", "x":9.75, "y":2},
                {"label":"<", "x":10.75, "y":2},
                {"label":">", "x":11.75, "y":2},
                {"label":"?", "x":12.75, "y":2},
                {"label":"Shift", "x":13.75, "y":2, "w":1.25},

                {"label":"Ctrl", "x":0.25, "y":3, "w":1.25},
                {"label":"Win", "x":1.5, "y":3},
                {"label":"Alt", "x":3.75, "y":3},
                {"label":"Space", "x":4.75, "y":3, "w":2},
                {"label":"Space", "x":7.75, "y":3, "w":2.25},
                {"label":"Fn", "x":10, "y":3},
                {"label":"Fn2", "x":12.5, "y":3},
                {"label":"Ctrl", "x":13.5, "y":3, "w":1.25}
            ]
        },
        "LAYOUT_2u_bs": {
            "layout": [
                {"label":"Esc", "x":0.5, "y":0},
                {"label":"Q", "x":1.5, "y":0},
                {"label":"W", "x":2.5, "y":0},
                {"label":"E", "x":3.5, "y":0},
                {"label":"R", "x":4.5, "y":0},
                {"label":"T", "x":5.5, "y":0},
                {"label":"Y", "x":7.5, "y":0},
                {"label":"U", "x":8.5, "y":0},
                {"label":"I", "x":9.5, "y":0},
                {"label":"O", "x":10.5, "y":0},
                {"label":"P", "x":11.5, "y":0},
                {"label":"Backspace", "x":12.5, "y":0, "w":2},

                {"label":"Tab", "x":0.25, "y":1, "w":1.25},
                {"label":"A", "x":1.5, "y":1},
                {"label":"S", "x":2.5, "y":1},
                {"label":"D", "x":3.5, "y":1},
                {"label":"F", "x":4.5, "y":1},
                {"label":"G", "x":5.5, "y":1},
                {"label":"H", "x":8, "y":1},
                {"label":"J", "x":9, "y":1},
                {"label":"K", "x":10, "y":1},
                {"label":"L", "x":11, "y":1},
                {"label":"\"", "x":12, "y":1},
                {"label":"Enter", "x":13, "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":"B", "x":7.75, "y":2},
                {"label":"N", "x":8.75, "y":2},
                {"label":"M", "x":9.75, "y":2},
                {"label":"<", "x":10.75, "y":2},
                {"label":">", "x":11.75, "y":2},
                {"label":"?", "x":12.75, "y":2},
                {"label":"Shift", "x":13.75, "y":2, "w":1.25},

                {"label":"Ctrl", "x":0.25, "y":3, "w":1.25},
                {"label":"Win", "x":1.5, "y":3},
                {"label":"Alt", "x":3.75, "y":3},
                {"label":"Space", "x":4.75, "y":3, "w":2},
                {"label":"Space", "x":7.75, "y":3, "w":2.25},
                {"label":"Fn", "x":10, "y":3},
                {"label":"Fn2", "x":12.5, "y":3},
                {"label":"Ctrl", "x":13.5, "y":3, "w":1.25}
            ]
        }
    }
}

M keyboards/dyz/selka40/selka40.h => keyboards/dyz/selka40/selka40.h +32 -5
@@ 18,14 18,41 @@
#include "quantum.h"
#define _X_ KC_NO

/*
 *                                                     ┌───────┐
 *                                                     │0B     │ 2u Backspace
 *                                                     └───────┘
 *     ┌───┬───┬───┬───┬───┬───┐   ┌───┬───┬───┬───┬───┬───┬───┐
 *     │00 │01 │02 │03 │04 │05 │   │06 │07 │08 │09 │0A │0B │0C │
 *    ┌┴───┼───┼───┼───┼───┼───┤   └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
 *    │10  │11 │12 │13 │14 │15 │     │16 │17 │18 │19 │1A │1B    │
 *   ┌┴────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐   ┌┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬───┴┐
 *   │20    │21 │22 │23 │24 │25 │   │26 │27 │28 │29 │2A │2B │2C  │
 *   └┬────┬┴──┬┴───┼───┼───┴───┤   ├───┴───┴┬──┴┬──┴──┬┴──┬┴───┬┘
 *    │30  │31 │    │34 │35     │   │36      │37 │     │3B │3C  │
 *    └────┴───┘    └───┴───────┘   └────────┴───┘     └───┴────┘
 */

#define LAYOUT_all( \
	K00, K01, K02, K03, K04, K05,           K06, K07, K08, K09, K0A, K0B, K0C, \
    K00, K01, K02, K03, K04, K05,           K06, K07, K08, K09, K0A, K0B, K0C, \
    K10, K11, K12, K13, K14, K15,           K16, K17, K18, K19, K1A,      K1B, \
    K20, K21, K22, K23, K24, K25,           K26, K27, K28, K29, K2A, K2B, K2C, \
    K30, K31,           K34, K35,           K36, K37,                K3B, K3C  \
) { \
    { K00,  K01,  K02,  K03, K04, K05,      K06, K07, K08, K09, K0A, K0B, K0C }, \
    { K10,  K11,  K12,  K13, K14, K15,      K16, K17, K18, K19, K1A, K1B, _X_ }, \
    { K20,  K21,  K22,  K23, K24, K25,      K26, K27, K28, K29, K2A, K2B, K2C }, \
    { K30,  K31,  _X_,  _X_, K34, K35,      K36, K37, _X_, _X_, _X_, K3B, K3C } \
}

#define LAYOUT_2u_bs( \
    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, K2C, \
    K30, K31,           K34, K35,           K36, K37,                K3B, K3C  \
) { \
	{ K00,  K01,  K02,  K03, K04, K05,      K06, K07, K08, K09, K0A, K0B, K0C }, \
	{ K10,  K11,  K12,  K13, K14, K15,      K16, K17, K18, K19, K1A, K1B, _X_ }, \
	{ K20,  K21,  K22,  K23, K24, K25,      K26, K27, K28, K29, K2A, K2B, K2C }, \
	{ K30,  K31,  _X_,  _X_, K34, K35,      K36, K37, _X_, _X_, _X_, K3B, K3C } \
    { K00,  K01,  K02,  K03, K04, K05,      K06, K07, K08, K09, K0A, K0B, _X_ }, \
    { K10,  K11,  K12,  K13, K14, K15,      K16, K17, K18, K19, K1A, K1B, _X_ }, \
    { K20,  K21,  K22,  K23, K24, K25,      K26, K27, K28, K29, K2A, K2B, K2C }, \
    { K30,  K31,  _X_,  _X_, K34, K35,      K36, K37, _X_, _X_, _X_, K3B, K3C }  \
}