mirror of
https://github.com/openstenoproject/qmk
synced 2024-11-14 20:44:38 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
6e5292a8ab
4 changed files with 71 additions and 70 deletions
|
|
@ -24,14 +24,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define PRODUCT MOKEY64
|
||||
|
||||
#define MATRIX_ROWS 5
|
||||
#define MATRIX_COLS 14
|
||||
#define MATRIX_COLS 15
|
||||
|
||||
#define MATRIX_ROW_PINS { B1, B2, B3, B4, B5 }
|
||||
#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D2, D1, D3, D5, D4, D6, D7 }
|
||||
#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D2, D1, D3, D5, D4, D6, D7, B6 }
|
||||
#define UNUSED_PINS
|
||||
|
||||
/* COL2ROW, ROW2COL*/
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
|
||||
#define DEBOUNCE 5
|
||||
#define DEBOUNCE 5
|
||||
|
|
|
|||
|
|
@ -18,62 +18,62 @@
|
|||
{"label":"k0a", "x":10, "y":0},
|
||||
{"label":"k0b", "x":11, "y":0},
|
||||
{"label":"k0c", "x":12, "y":0},
|
||||
{"label":"k0d", "x":13, "y":0, "w":2},
|
||||
|
||||
{"label":"k0e", "x":13, "y":0, "w":2},
|
||||
|
||||
{"label":"k10", "x":0, "y":1, "w":1.5},
|
||||
{"label":"k11", "x":1.5, "y":1},
|
||||
{"label":"k12", "x":2.5, "y":1},
|
||||
{"label":"k13", "x":3.5, "y":1},
|
||||
{"label":"k14", "x":4.5, "y":1},
|
||||
{"label":"k15", "x":5.5, "y":1},
|
||||
{"label":"k16", "x":6.5, "y":1},
|
||||
{"label":"k17", "x":7.5, "y":1},
|
||||
{"label":"k18", "x":8.5, "y":1},
|
||||
{"label":"k19", "x":9.5, "y":1},
|
||||
{"label":"k1a", "x":10.5, "y":1},
|
||||
{"label":"k1b", "x":11.5, "y":1},
|
||||
{"label":"k1c", "x":12.5, "y":1},
|
||||
{"label":"k1d", "x":13.5, "y":1, "w":1.5},
|
||||
|
||||
{"label":"k12", "x":1.5, "y":1},
|
||||
{"label":"k13", "x":2.5, "y":1},
|
||||
{"label":"k14", "x":3.5, "y":1},
|
||||
{"label":"k15", "x":4.5, "y":1},
|
||||
{"label":"k16", "x":5.5, "y":1},
|
||||
{"label":"k17", "x":6.5, "y":1},
|
||||
{"label":"k18", "x":7.5, "y":1},
|
||||
{"label":"k19", "x":8.5, "y":1},
|
||||
{"label":"k1a", "x":9.5, "y":1},
|
||||
{"label":"k1b", "x":10.5, "y":1},
|
||||
{"label":"k1c", "x":11.5, "y":1},
|
||||
{"label":"k1d", "x":12.5, "y":1},
|
||||
{"label":"k1e", "x":13.5, "y":1, "w":1.5},
|
||||
|
||||
{"label":"k20", "x":0, "y":2, "w":1.75},
|
||||
{"label":"k21", "x":1.75, "y":2},
|
||||
{"label":"k22", "x":2.75, "y":2},
|
||||
{"label":"k23", "x":3.75, "y":2},
|
||||
{"label":"k24", "x":4.75, "y":2},
|
||||
{"label":"k25", "x":5.75, "y":2},
|
||||
{"label":"k26", "x":6.75, "y":2},
|
||||
{"label":"k27", "x":7.75, "y":2},
|
||||
{"label":"k28", "x":8.75, "y":2},
|
||||
{"label":"k29", "x":9.75, "y":2},
|
||||
{"label":"k2a", "x":10.75, "y":2},
|
||||
{"label":"k2b", "x":11.75, "y":2},
|
||||
{"label":"k2c", "x":12.75, "y":2, "w":2.25},
|
||||
|
||||
{"label":"k22", "x":1.75, "y":2},
|
||||
{"label":"k23", "x":2.75, "y":2},
|
||||
{"label":"k24", "x":3.75, "y":2},
|
||||
{"label":"k25", "x":4.75, "y":2},
|
||||
{"label":"k26", "x":5.75, "y":2},
|
||||
{"label":"k27", "x":6.75, "y":2},
|
||||
{"label":"k28", "x":7.75, "y":2},
|
||||
{"label":"k29", "x":8.75, "y":2},
|
||||
{"label":"k2a", "x":9.75, "y":2},
|
||||
{"label":"k2b", "x":10.75, "y":2},
|
||||
{"label":"k2c", "x":11.75, "y":2},
|
||||
{"label":"k2d", "x":12.75, "y":2, "w":2.25},
|
||||
|
||||
{"label":"k30", "x":0, "y":3, "w":2},
|
||||
{"label":"k31", "x":2, "y":3},
|
||||
{"label":"k32", "x":3, "y":3},
|
||||
{"label":"k33", "x":4, "y":3},
|
||||
{"label":"k34", "x":5, "y":3},
|
||||
{"label":"k35", "x":6, "y":3},
|
||||
{"label":"k36", "x":7, "y":3},
|
||||
{"label":"k37", "x":8, "y":3},
|
||||
{"label":"k38", "x":9, "y":3},
|
||||
{"label":"k39", "x":10, "y":3},
|
||||
{"label":"k3a", "x":11, "y":3},
|
||||
{"label":"k3b", "x":12, "y":3},
|
||||
{"label":"k3c", "x":13, "y":3},
|
||||
{"label":"k3d", "x":14, "y":3},
|
||||
{"label":"k32", "x":2, "y":3},
|
||||
{"label":"k33", "x":3, "y":3},
|
||||
{"label":"k34", "x":4, "y":3},
|
||||
{"label":"k35", "x":5, "y":3},
|
||||
{"label":"k36", "x":6, "y":3},
|
||||
{"label":"k37", "x":7, "y":3},
|
||||
{"label":"k38", "x":8, "y":3},
|
||||
{"label":"k39", "x":9, "y":3},
|
||||
{"label":"k3a", "x":10, "y":3},
|
||||
{"label":"k3b", "x":11, "y":3},
|
||||
{"label":"k3c", "x":12, "y":3},
|
||||
{"label":"k3d", "x":13, "y":3},
|
||||
{"label":"k3e", "x":14, "y":3},
|
||||
|
||||
{"label":"k40", "x":0, "y":4, "w":1.25},
|
||||
{"label":"k41", "x":1.25, "y":4, "w":1.25},
|
||||
{"label":"k42", "x":2.5, "y":4, "w":1.25},
|
||||
{"label":"k43", "x":3.75, "y":4, "w":6.25},
|
||||
{"label":"k44", "x":10, "y":4},
|
||||
{"label":"k45", "x":11, "y":4},
|
||||
{"label":"k46", "x":12, "y":4},
|
||||
{"label":"k47", "x":13, "y":4},
|
||||
{"label":"k48", "x":14, "y":4}
|
||||
{"label":"k43", "x":2.5, "y":4, "w":1.25},
|
||||
{"label":"k46", "x":3.75, "y":4, "w":6.25},
|
||||
{"label":"k4a", "x":10, "y":4},
|
||||
{"label":"k4b", "x":11, "y":4},
|
||||
{"label":"k4c", "x":12, "y":4},
|
||||
{"label":"k4d", "x":13, "y":4},
|
||||
{"label":"k4e", "x":14, "y":4}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,29 +20,29 @@
|
|||
|
||||
#define XXX KC_NO
|
||||
|
||||
/*
|
||||
/*
|
||||
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
|
||||
* │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │
|
||||
* │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │
|
||||
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
|
||||
* │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │
|
||||
* │10 │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 │
|
||||
* │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
|
||||
* ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
|
||||
* │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │
|
||||
* │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │
|
||||
* ├────┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┼───┼───┼───┼───┤
|
||||
* │40 │41 │42 │ 43 │44 │45 │46 │47 │48 │
|
||||
* │40 │41 │43 │ 46 │4a │4b │4c │4d │4e │
|
||||
* └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
|
||||
*/
|
||||
#define LAYOUT( \
|
||||
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
|
||||
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
|
||||
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
|
||||
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
|
||||
k40, k41, k42, k43, k44, k45, k46, k47, k48 \
|
||||
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
|
||||
k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
|
||||
k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
|
||||
k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
|
||||
k40, k41, k43, k46, k4a, k4b, k4c, k4d, k4e \
|
||||
) { \
|
||||
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
|
||||
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
|
||||
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX }, \
|
||||
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
|
||||
{ k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, XXX, XXX, XXX, XXX } \
|
||||
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \
|
||||
{ k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
|
||||
{ k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
|
||||
{ k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
|
||||
{ k40, k41, k43, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e } \
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ Support Atmega32u4 keyboard.
|
|||
|
||||
* Keyboard Maintainer: [rhmokey](https://github.com/rhmokey)
|
||||
* Hardware Supported: Atmega32u4
|
||||
|
||||
## Bootloader
|
||||
* **Physical reset button**: Short press the button on the back of the PCB to enter the Bootloader and flash the firmware
|
||||
|
||||
|
|
@ -18,4 +19,4 @@ Flashing example for this keyboard:
|
|||
|
||||
make mokey/mokey64:default:flash
|
||||
|
||||
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
|
||||
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
|
||||
|
|
|
|||
Loading…
Reference in a new issue