Commit Graph

6 Commits (214d2a31ed51bebde1b0635ec0591dd444d2d706)

Author SHA1 Message Date
James Young 20d3dc0c83
Patch for develop branch merge conflicts
Fixes bugs introduced by 675c5a5e12.
2021-09-24 12:42:57 -07:00
Drashna Jael're 675c5a5e12
Merge remote-tracking branch 'origin/master' into develop 2021-09-24 12:21:32 -07:00
James Young 29f199f456
AMJ96 Refactor (#14571)
* clean up amj96.h

- use #pragma once include guard
- remove extra comments
- update matrix position alignment (easier readability)

* info.json: apply human-friendly formatting

* rename LAYOUT to LAYOUT_all

* clean up rules.mk

Align to QMK's AVR template.

* clean up default keymap

- use four-space indent
- add RESET keycode (Fn+R)
- remove unnecessary functions

* clean up config.h

- use #pragma once include guard
- move lighting settings to the middle of the file (QMK template conformance)
- remove Magic and MIDI configuration blocks

* update readme.md file

- update keyboard info list
- add flashing instructions
- update Docs links
- remove trailing spaces

* remove "empty" config.h and readme.md from default keymap
2021-09-23 11:01:49 -07:00
Ryan 41c50bb653
Change keyboard level include guards to `pragma once` (#14248)
* Change keyboard level include guards to `pragma once`

And clean up a lot of layout macros

* Oops

* Remove dangling endif
2021-09-01 19:03:14 +10:00
noroadsleft 356fe590e6 Keyboard: AMJ96 Refactor and Configurator update (#3707)
* AMJ96 Refactor

LAYOUT matrix and default keymap refactored to use full-length keycodes (instead of shorthand).

* Configurator update

Minor physical layout update and made the labels more sensible.

* Readme update

White space correction.

* Default keymap update: #include QMK_KEYBOARD_H

* rules.mk update

Disabled the following options as my local test compile's .hex ended up too big to fit in the available flash space:

MOUSEKEY_ENABLE
EXTRAKEY_ENABLE
BACKLIGHT_ENABLE
RGBLIGHT_ENABLE

If this is undesirable, suggestions are welcome.

* Config/rules update

Re-enabled MOUSEKEY_ENABLE, EXTRAKEY_ENABLE, BACKLIGHT_ENABLE, and RGBLIGHT_ENABLE and disabled COMMAND_ENABLE in rules.mk; enabled NO_ACTION_MACRO and NO_ACTION_FUNCTION per @drashna

* Swapped `___` for `XXX` in amj96.h per @mechmerlin
2018-08-22 08:58:12 -07:00
MechMerlin 015aed50a3 AMJ96 Support (#2651)
* Initial commit: Get things compiling

* port the custom matrix code

* Update readme

* make second layer fully transparent

* populate config.h identifiers with more correct information

* Add in switch backlight support

* Enable backlight LEDs, and change pin for RGB

* port TMK version over

* remove all that TMK stuff, it didn't work lol

* Updated readme

* Fix keymap

- Change KEYMAP to LAYOUT
- Adjust formatting of table

* Edit readme to reflect NOTES

* add info.json for QMK configurator support

* Replaced placeholder with MechMerlin
2018-03-31 01:57:49 -04:00