gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-23 03:42:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
5b5b36421a
qmk_firmware/keyboards/chlx/merro60
History
James Young 84ea77ead6
Remove BOOTMAGIC_ENABLE = lite option (#15002) 
* remove BOOTMAGIC_ENABLE=lite setting

* change keyboard BOOTMAGIC_ENABLE rules

Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keyboard BOOTMAGIC_ENABLE inline comments

Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite".

* change keymap BOOTMAGIC_ENABLE rules

Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keymap BOOTMAGIC_ENABLE inline comments

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* change layout/user BOOTMAGIC_ENABLE rules/comments

Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/

* remove docs references to Full Bootmagic

* convert data-driven Bootmagic Lite instances

* remove Bootmagic Lite bodge from data-driven generation

* Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a

* update docs/ja/config_options.md per mtei

* update docs/faq_misc.md per mtei

Remove remaining Full Bootmagic reference.
2021-11-05 08:18:09 +11:00
..
keymaps Merro60 Layout Macro Refactor (#13827) 2021-07-31 12:17:55 -07:00
config.h [Keyboard] Add merro60 (#12527) 2021-05-15 17:29:04 -07:00
info.json Remove width, height and key_count from info.json (#14274) 2021-09-12 14:04:56 +10:00
merro60.c [Keyboard] Add merro60 (#12527) 2021-05-15 17:29:04 -07:00
merro60.h Merro60 Layout Macro Refactor (#13827) 2021-07-31 12:17:55 -07:00
readme.md [Keyboard] Add merro60 (#12527) 2021-05-15 17:29:04 -07:00
rules.mk Remove BOOTMAGIC_ENABLE = lite option (#15002) 2021-11-05 08:18:09 +11:00

readme.md

merro60

merro60 PCB

A standard 60% format keyboard pcb with USB-C and unified daughterboard compatibility. Has modified cutouts to allow usage of certain tray mount cases into gummy gasket o-ring mount.

Keyboard Maintainer: Alexander Lee Hardware Supported: chlx PCB merro60.1, merro60.1.1, merro60.1.2

Enter bootloader mode by any of the following options -

  • When unplugged, holding the top-left key (typically ESC) while plugging in the keyboard
  • When plugged in, pressing and releasing the reset button on the pcb bottom behind the CAPSLOCK / A-key region
  • When plugged in, shorting out the two reset metal contacts near the spacebar switch location (NOT the spacebar switch pin holes)

Make example for this keyboard (after setting up your build environment):

make chlx/merro60:default

See the build environment setup and the make instructions for more information. Brand new to QMK? Start with our Complete Newbs Guide.