summaryrefslogtreecommitdiffstats
path: root/keyboards/amj96
Commit message (Collapse)AuthorAgeFilesLines
* Remove `matrix_key_count()` (#16603)Ryan2022-03-101-9/+0
| | | | | * Remove `matrix_key_count()` * Remove `matrix_bitpop()`
* Merge remote-tracking branch 'upstream/master' into developfauxpark2021-12-091-2/+1
|\
| * Tidy up NKRO_ENABLE rules (#15382)Ryan2021-12-091-2/+1
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-12-021-2/+0
|\|
| * Tidy up `SLEEP_LED_ENABLE` rules (#15362)Ryan2021-12-011-2/+0
| |
* | [Core] Remove matrix_is_modified() and debounce_is_active() (#15349)Stefan Kerkmann2021-11-291-6/+0
|/
* Patch for develop branch merge conflictsJames Young2021-09-241-7/+7
| | | | Fixes bugs introduced by 675c5a5e12f5c5efe59a0d0b30b17a41a398c74e.
* Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-09-248-118/+188
|\
| * AMJ96 Refactor (#14571)James Young2021-09-238-127/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-211-1/+1
|\|
| * Remove audio pin references in rules.mk (#14532)Ryan2021-09-211-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-121-1/+0
|\|
| * Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-121-1/+0
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-121-3/+0
|\|
| * Remove width, height and key_count from info.json (#14274)Ryan2021-09-121-3/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-101-7/+0
|\|
| * Remove bootloader listings from rules.mk (#14330)Ryan2021-09-101-7/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-052-43/+0
|\|
| * Remove empty override functions (#14312)Ryan2021-09-052-43/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove empty override functions, 0-9 * Remove empty override functions, A-D * Remove empty override functions, E-H * Remove empty override functions, handwired * Remove empty override functions, I-L * Remove empty override functions, M-P * Remove empty override functions, Q-T * Remove empty override functions, U-Z
* | Change keyboard level include guards to `pragma once` (#14248)Ryan2021-09-012-22/+16
|/ | | | | | | | | * Change keyboard level include guards to `pragma once` And clean up a lot of layout macros * Oops * Remove dangling endif
* Remove MIDI Configuration boilerplate (#11151)James Young2021-08-162-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove keyboard-level instances of `MIDI_ENABLE = no` Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e '/^[ #]*MIDI_ENABLE[ \t]*=[ \t]*no/d' {} + ``` Co-Authored-By: Nick Brassel <nick@tzarc.org> * fix case-sensitivity issues on MIDI_ENABLE Change instances of `MIDI_ENABLE = YES` to `MIDI_ENABLE = yes`. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;MIDI_ENABLE[ \t]*=[ \t]*[Yy][Ee][Ss];MIDI_ENABLE = yes;g' {} + ``` * replace `# MIDI controls` with `# MIDI support` Replace `# MIDI controls` with `# MIDI support` in keyboard-level `rules.mk` files. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*MIDI[ \t]*\(controls\|support\).*;# MIDI support;g' {} + ``` * align inline comments Aligns the inline comments to the length used by the QMK AVR rules.mk template. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;MIDI_ENABLE *= *yes.*;MIDI_ENABLE = yes # MIDI support;g' {} + ``` * remove commented instances of `MIDI_ENABLE` from keyboard `rules.mk` files Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#\([ \t]*MIDI_ENABLE\) = yes; \1 = no ;' {} + find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;^\([ \t]*\)\(MIDI_ENABLE = no\);\2\1;' {} + find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e '/^[ #]\+MIDI_ENABLE *= *no/d' {} + ``` * remove MIDI configuration boilerplate from keyboard config.h files Co-authored-by: Nick Brassel <nick@tzarc.org>
* Remove Full Bootmagic (#13846)James Young2021-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * disambiguate Bootmagic rules in keymaps The files edited by this commit were added at a point in time where `BOOTMAGIC_ENABLE = yes` enabled full Bootmagic. This commit edits the files to specify that full Bootmagic is intended. * remove BOOTMAGIC_ENABLE=full setting * unify commented BOOTMAGIC_ENABLE rules in keyboards Explicitly sets `BOOTMAGIC_ENABLE = no` in keyboards where the rule was commented out. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-zA-Z]\+\).*;\1 = no # Virtual DIP switch configuration;g' {} + ``` * remove commented Bootmagic rules from keymap/user level Command: ``` find keyboards/ layouts/ users/ -type f -name 'rules.mk' -exec sed -i -e '/#.*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*/d' {} + ``` * update keyboard BOOTMAGIC_ENABLE rule formatting Sets the formatting of BOOTMAGIC_ENABLE rules to `BOOTMAGIC_ENABLE = [value]`, without the inline comments (which will be replaced later). Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + ``` * update keyboards' BOOTMAGIC_ENABLE settings Updates keyboard `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = \)full;\1lite;g' '{}' + ``` * update keymap/user BOOTMAGIC_ENABLE settings Updates keymap/user `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used. Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' + find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' + ``` * remove and replace inline comments in keyboards and keymap/user files Removes and replaces the inline comments, which have been updated to read `Enable Bootmagic Lite`. Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = lite\);\1 # Enable Bootmagic Lite;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = yes\);\1 # Enable Bootmagic Lite;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = no\);\1 # Enable Bootmagic Lite;g' '{}' + ``` * rename improperly named makefiles Some files intended to be used as makefiles had improper names causing them to not be used as intended when building. This commit corrects the filenames of the affected files. * update renamed file with new rule formatting * update QMK's template files Updates QMK's `rules.mk` templates to use the new inline comment. * update QMK Docs - remove documentation of full Bootmagic - update links to Bootmagic Lite doc - add doc for Magic Keycodes * rules.mk patch for coarse/ixora and coarse/vinta
* Remove FAUXCLICKY feature (deprecated) (#11829)Drashna Jaelre2021-02-091-2/+0
|
* Remove legacy print backward compatiblitly (#11805)Joel Challis2021-02-061-2/+2
| | | | | | | * Remove legacy print backward compatiblitly * Remove legacy print backward compatiblitly - core * revert comment changes
* Remove `MIDI_ENABLE_STRICT` from keyboards' config.h (#11679)Ryan2021-01-271-3/+0
|
* Remove `DESCRIPTION`, 0-A (#11369)Ryan2021-01-111-1/+0
|
* Fix AVR boards which were overriding backlight without setting… (#8044)Joel Challis2020-01-312-19/+3
| | | | | | | | | | | | | | | | * Add backlight custom driver to all boards not declaring it but overriding backlight * Apply suggestions from code review Co-Authored-By: fauxpark <fauxpark@gmail.com> * Apply suggestions from code review Co-Authored-By: fauxpark <fauxpark@gmail.com> * Remove old tmk references from show_options.mk Co-authored-by: fauxpark <fauxpark@gmail.com>
* Trim firmware sizes from default rules.mk, part 1 (#8027)ridingqwerty2020-01-291-5/+5
| | | | | | | | | | | * Removed reference to firmware size in 0-9,a-f board-level and default keymap 'rules.mk' files * Correct some 'rules.mk' in boards buried under vendor folders * PR8027 patch Co-authored-by: GeorgeKoenig <35542036+GeorgeKoenig@users.noreply.github.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Cleanup rules.mk for 32U4 keyboards, A-F (#6804)fauxpark2019-10-051-45/+9
| | | | | | * Cleanup rules.mk for 32U4 keyboards, A-F * Put back stuff in VIA keymaps
* Remove superfluous JTAG disable code (#6445)fauxpark2019-08-201-3/+0
| | | | | | | | | | | | | | | | | | * Remove superfluous JTAG disable code * 32A has differently named register * Accidentally some operators * 32A also has different JTAG pins * Wrap disable_jtag() in an ifndef * Document this new define * Rename the define, it conflicts with a LUFA thing Also, move the ifndef wrapping to the call in keyboard_setup()
* Remove commented out MCUs in rules.mk (#5884)fauxpark2019-07-161-1/+0
|
* Remove/migrate action_get_macro()s from default keymaps (#5625)fauxpark2019-07-151-16/+0
| | | | | | * Remove/migrate action_get_macro()s from default keymaps * Leave these breaks alone
* Replace DEBOUNCING_DELAY (deprecated) with DEBOUNCE (#5997)Drashna Jaelre2019-06-061-1/+1
|
* Cleanup Default Keymaps (#5442)Drashna Jaelre2019-03-191-5/+1
| | | | | | | | * Cleanup Default Keymaps to conform to QMK Firmware standards * Minor fixes * Revert some changes
* Remove CUSTOM_MATRIX option from diode direction (#5090)zvecr2019-02-181-1/+1
| | | | | | | | * Remove CUSTOM_MATRIX refs from DIODE_DIRECTION * Remove '#define DIODE_DIRECTION CUSTOM_MATRIX' * Remove CUSTOM_MATRIX refs from DIODE_DIRECTION documentation
* Adds a default value for IS_COMMAND for COMMAND feature (#4301)Drashna Jaelre2019-01-261-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add default value for IS_COMMAND for COMMAND feature * Cleanup and consistency * Update Templates to reflect change * Fix IS_COMMAND in template * Fix IS_COMMAND define * Use consistent IS_COMMAND block in templates * Remove unnecessary `#undef IS_COMMAND` directives * Fix compile issue on orthodox * Reomve IS_COMMAND option for newer boards * Remove all existing definitions of IS_COMMAND if they use default LSHIFT and RSHIFT setting * Remove a couple of additional IS_COMMAND defines * Remove remaining redundant IS_COMMAND definitions * Remove #undef IS_COMMAND from orthodox:drashna and whitefox:konstantin * Remove multiple empty lines in modified config.h files * Update additional boards * Reomve IS_COMMAND from newer boards * Update Alice keyboard * Remove IS_COMMAND from additional boards Jan 24th edition
* Modified URLs to point to new locationsJeremy Bernhardt2019-01-131-1/+1
|
* Remove empty fn_actions[]fauxpark2019-01-111-4/+0
|
* Keyboard: AMJ96 Refactor and Configurator update (#3707)noroadsleft2018-08-226-35/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Remove bootloader from info.jsonsskullY2018-04-111-1/+0
|
* Pull information from config.h and rules.mk (#2711)skullydazed2018-04-071-3/+0
| | | | | | * Pull information from config.h and rules.mk * Readd the kbd75 maintainer
* AMJ96 Support (#2651)MechMerlin2018-03-3110-0/+711
* 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