hailey
/
qmk_firmware
mirror of https://github.com/hailey/qmk_firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MacroCat Refactor (#17969)

Browse Source
master
James Young 3 years ago committed by GitHub
parent d790b53580
commit c230d0658e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 69 additions and 66 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      keyboards/macrocat/info.json
  2. 24
      keyboards/macrocat/keymaps/default/keymap.c
  3. 48
      keyboards/macrocat/keymaps/oled/keymap.c
  4. 48
      keyboards/macrocat/keymaps/via/keymap.c
  5. 6
      keyboards/macrocat/readme.md

9
keyboards/macrocat/info.json
Unescape View File

@ -1,7 +1,7 @@
{ {
"manufacturer": "Catmunch", "manufacturer": "Catmunch",
"keyboard_name": "MacroCat Keyboard", "keyboard_name": "MacroCat Keyboard",
"maintainer": "Catmunch", "maintainer": "Catmunch, starcatmeow",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"features": { "features": {
@ -24,8 +24,11 @@
"pid": "0x8086", "pid": "0x8086",
"vid": "0x2022" "vid": "0x2022"
}, },
"layout_aliases": {
"LAYOUT_numpad_4x4": "LAYOUT_ortho_4x4"
},
"layouts": { "layouts": {
"LAYOUT_numpad_4x4": { "LAYOUT_ortho_4x4": {
"layout": [ "layout": [
{ "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 0], "x": 0, "y": 0 },
{ "matrix": [0, 1], "x": 1, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 },
@ -46,4 +49,4 @@
] ]
} }
} }
} }

24
keyboards/macrocat/keymaps/default/keymap.c
Unescape View File

@ -4,16 +4,16 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = { [0] = LAYOUT_ortho_4x4(
{KC_PLUS, KC_9, KC_8, KC_7 }, KC_PLUS, KC_9, KC_8, KC_7 ,
{KC_MINS, KC_6, KC_5, KC_4 }, KC_MINS, KC_6, KC_5, KC_4 ,
{KC_DOT, KC_3, KC_2, KC_1 }, KC_DOT, KC_3, KC_2, KC_1 ,
{KC_ENT, KC_SPACE, KC_0, MO(1)} KC_ENT, KC_SPACE, KC_0, MO(1)
}, ),
[1] = { [1] = LAYOUT_ortho_4x4(
{KC_ASTR, KC_MPRV, KC_MPLY,KC_MNXT}, KC_ASTR, KC_MPRV, KC_MPLY,KC_MNXT,
{KC_SLSH, KC_LPRN, KC_UP, KC_RPRN}, KC_SLSH, KC_LPRN, KC_UP, KC_RPRN,
{KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT}, KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT,
{KC_TAB, KC_BSPC, KC_0, KC_TRNS} KC_TAB, KC_BSPC, KC_0, KC_TRNS
} )
}; };

48
keyboards/macrocat/keymaps/oled/keymap.c
Unescape View File

@ -4,28 +4,28 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = { [0] = LAYOUT_ortho_4x4(
{KC_PLUS, KC_9, KC_8, KC_7 }, KC_PLUS, KC_9, KC_8, KC_7 ,
{KC_MINS, KC_6, KC_5, KC_4 }, KC_MINS, KC_6, KC_5, KC_4 ,
{KC_DOT, KC_3, KC_2, KC_1 }, KC_DOT, KC_3, KC_2, KC_1 ,
{KC_ENT, KC_SPACE, KC_0, MO(1)} KC_ENT, KC_SPACE, KC_0, MO(1)
}, ),
[1] = { [1] = LAYOUT_ortho_4x4(
{KC_ASTR, KC_MPRV, KC_MPLY,KC_MNXT}, KC_ASTR, KC_MPRV, KC_MPLY,KC_MNXT,
{KC_SLSH, KC_LPRN, KC_UP, KC_RPRN}, KC_SLSH, KC_LPRN, KC_UP, KC_RPRN,
{KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT}, KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT,
{KC_TAB, KC_BSPC, KC_0, KC_TRNS} KC_TAB, KC_BSPC, KC_0, KC_TRNS
}, ),
[2] = { [2] = LAYOUT_ortho_4x4(
{KC_NO, KC_NO, KC_NO, KC_NO}, KC_NO, KC_NO, KC_NO, KC_NO,
{KC_NO, KC_NO, KC_NO, KC_NO}, KC_NO, KC_NO, KC_NO, KC_NO,
{KC_NO, KC_NO, KC_NO, KC_NO}, KC_NO, KC_NO, KC_NO, KC_NO,
{KC_NO, KC_NO, KC_NO, KC_NO} KC_NO, KC_NO, KC_NO, KC_NO
}, ),
[3] = { [3] = LAYOUT_ortho_4x4(
{KC_NO, KC_NO, KC_NO, KC_NO}, KC_NO, KC_NO, KC_NO, KC_NO,
{KC_NO, KC_NO, KC_NO, KC_NO}, KC_NO, KC_NO, KC_NO, KC_NO,
{KC_NO, KC_NO, KC_NO, KC_NO}, KC_NO, KC_NO, KC_NO, KC_NO,
{KC_NO, KC_NO, KC_NO, KC_NO} KC_NO, KC_NO, KC_NO, KC_NO
} )
}; };

48
keyboards/macrocat/keymaps/via/keymap.c
Unescape View File

@ -4,28 +4,28 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = { [0] = LAYOUT_ortho_4x4(
{KC_PPLS, KC_9, KC_8, KC_7 }, KC_PPLS, KC_9, KC_8, KC_7 ,
{KC_PMNS, KC_6, KC_5, KC_4 }, KC_PMNS, KC_6, KC_5, KC_4 ,
{KC_PDOT, KC_3, KC_2, KC_1 }, KC_PDOT, KC_3, KC_2, KC_1 ,
{KC_PENT, KC_SPACE, KC_P0, MO(1)} KC_PENT, KC_SPACE, KC_P0, MO(1)
}, ),
[1] = { [1] = LAYOUT_ortho_4x4(
{KC_PAST, KC_NO, KC_NO, KC_NO}, KC_PAST, KC_NO, KC_NO, KC_NO,
{KC_PSLS, KC_LPRN, KC_UP, KC_RPRN}, KC_PSLS, KC_LPRN, KC_UP, KC_RPRN,
{KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT}, KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT,
{KC_TAB, KC_BSPC, KC_P0, KC_TRNS} KC_TAB, KC_BSPC, KC_P0, KC_TRNS
}, ),
[2] = { [2] = LAYOUT_ortho_4x4(
{KC_NO, KC_NO, KC_NO, KC_NO}, KC_NO, KC_NO, KC_NO, KC_NO,
{KC_NO, KC_NO, KC_NO, KC_NO}, KC_NO, KC_NO, KC_NO, KC_NO,
{KC_NO, KC_NO, KC_NO, KC_NO}, KC_NO, KC_NO, KC_NO, KC_NO,
{KC_NO, KC_NO, KC_NO, KC_NO} KC_NO, KC_NO, KC_NO, KC_NO
}, ),
[3] = { [3] = LAYOUT_ortho_4x4(
{KC_NO, KC_NO, KC_NO, KC_NO}, KC_NO, KC_NO, KC_NO, KC_NO,
{KC_NO, KC_NO, KC_NO, KC_NO}, KC_NO, KC_NO, KC_NO, KC_NO,
{KC_NO, KC_NO, KC_NO, KC_NO}, KC_NO, KC_NO, KC_NO, KC_NO,
{KC_NO, KC_NO, KC_NO, KC_NO} KC_NO, KC_NO, KC_NO, KC_NO
} )
}; };

6
keyboards/macrocat/readme.md
Unescape View File

@ -4,7 +4,7 @@
A cat like macro keyboard/numpad. A cat like macro keyboard/numpad.
* Keyboard Maintainer: [catmunch](https://github.com/catmunch) * Keyboard Maintainer: [catmunch](https://github.com/catmunch), [starcatmeow](https://github.com/starcatmeow)
* Hardware Supported: Fully Supported * Hardware Supported: Fully Supported
* Hardware Availability: [MacroCat Keyboard](https://github.com/catmunch/macrocat) * Hardware Availability: [MacroCat Keyboard](https://github.com/catmunch/macrocat)
@ -16,8 +16,6 @@ Flashing example for this keyboard:
make macrocat:default:flash make macrocat: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).
## Bootloader ## Bootloader
Enter the bootloader in 3 ways: Enter the bootloader in 3 ways:
@ -25,3 +23,5 @@ Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
* **Brand new atmega32u4 chip**: Plug the cable in, it will automatically boot into bootloader * **Brand new atmega32u4 chip**: Plug the cable in, it will automatically boot into bootloader
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).

Write Preview
Loading…
Cancel
Save