summaryrefslogtreecommitdiffstats
path: root/keyboards/melgeek
Commit message (Collapse)AuthorAgeFilesLines
* Move LED indicator config to data driven (#19800)Ryan2023-02-172-3/+4
|
* Migrate `MCU` and `BOOTLOADER` to data-driven (#19529)Ryan2023-02-0825-100/+26
|
* Debounce defines cleanup (#19742)Ryan2023-02-0320-33/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clean up `DEBOUNCE` in config.h, 0-9 * Clean up `DEBOUNCE` in config.h, A * Clean up `DEBOUNCE` in config.h, B * Clean up `DEBOUNCE` in config.h, C * Clean up `DEBOUNCE` in config.h, D * Clean up `DEBOUNCE` in config.h, E * Clean up `DEBOUNCE` in config.h, F * Clean up `DEBOUNCE` in config.h, G * Clean up `DEBOUNCE` in config.h, H * Clean up `DEBOUNCE` in config.h, handwired * Clean up `DEBOUNCE` in config.h, I * Clean up `DEBOUNCE` in config.h, J * Clean up `DEBOUNCE` in config.h, K * Clean up `DEBOUNCE` in config.h, L * Clean up `DEBOUNCE` in config.h, M * Clean up `DEBOUNCE` in config.h, N * Clean up `DEBOUNCE` in config.h, O * Clean up `DEBOUNCE` in config.h, P * Clean up `DEBOUNCE` in config.h, Q * Clean up `DEBOUNCE` in config.h, R * Clean up `DEBOUNCE` in config.h, S * Clean up `DEBOUNCE` in config.h, T * Clean up `DEBOUNCE` in config.h, U * Clean up `DEBOUNCE` in config.h, V * Clean up `DEBOUNCE` in config.h, W * Clean up `DEBOUNCE` in config.h, X * Clean up `DEBOUNCE` in config.h, Y * Clean up `DEBOUNCE` in config.h, Z * Remove default debounce from info.json * Migrate non-default debounce to info.json
* Remove usages of config_common.h from config.h files. (#19714)Nick Brassel2023-01-3110-10/+0
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-204-11/+11
|\
| * Refactor some layouts which contain keyboard name (#19643)Joel Challis2023-01-204-11/+11
| |
* | Migrate `LAYOUTS` to data driven (#19541)Ryan2023-01-1023-28/+9
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Migrate `LAYOUTS` to data driven, 0-9 * Migrate `LAYOUTS` to data driven, A * Migrate `LAYOUTS` to data driven, B * Migrate `LAYOUTS` to data driven, C * Migrate `LAYOUTS` to data driven, D * Migrate `LAYOUTS` to data driven, E * Migrate `LAYOUTS` to data driven, F * Migrate `LAYOUTS` to data driven, G * Migrate `LAYOUTS` to data driven, H * Migrate `LAYOUTS` to data driven, handwired * Migrate `LAYOUTS` to data driven, I * Migrate `LAYOUTS` to data driven, J * Migrate `LAYOUTS` to data driven, K * Migrate `LAYOUTS` to data driven, L * Migrate `LAYOUTS` to data driven, M * Migrate `LAYOUTS` to data driven, N * Migrate `LAYOUTS` to data driven, O * Migrate `LAYOUTS` to data driven, P * Migrate `LAYOUTS` to data driven, Q * Migrate `LAYOUTS` to data driven, R * Migrate `LAYOUTS` to data driven, S * Migrate `LAYOUTS` to data driven, T * Migrate `LAYOUTS` to data driven, U * Migrate `LAYOUTS` to data driven, V * Migrate `LAYOUTS` to data driven, W * Migrate `LAYOUTS` to data driven, X * Migrate `LAYOUTS` to data driven, Y * Migrate `LAYOUTS` to data driven, Z
* Change `RGB_MATRIX_STARTUP_*` defines to `RGB_MATRIX_DEFAULT_*` (#19079)Ryan2022-11-279-19/+19
|
* Remove .noci functionality (#19122)Joel Challis2022-11-212-0/+0
|
* LED config fixes (#18973)Ryan2022-11-111-23/+22
|
* Reworked backlight keycodes. (#18961)Nick Brassel2022-11-0630-30/+30
| | | Co-authored-by: Ryan <fauxpark@gmail.com>
* Merge remote-tracking branch 'upstream/master' into developfauxpark2022-10-2981-5503/+3228
|\
| * MelGeek MJ6XY Refactor (#18862)James Young2022-10-2781-5502/+3231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mj6xy.h: convert tabs to spaces * info.json: convert tabs to spaces * info.json: apply friendly formatting Whitespace-only change. * rename LAYOUT_60_ansi_7u_spc to LAYOUT_60_ansi_tsangan - rename `60_ansi_7u_spc` keymap to `default_ansi_tsangan` * add K31 position to LAYOUT_60_iso * rename LAYOUT_60_iso_7u_spc_split_rshift to LAYOUT_60_iso_tsangan_split_rshift - rename `60_iso_7u_spc_split_rshift` keymap to `default_iso_tsangan_split_rshift` * add K31 position to LAYOUT_60_iso_arrow * add K31 position to LAYOUT_60_iso_arrow_6u_spc * add K31 position to LAYOUT_60_iso_arrow_3u_spc * refactor LAYOUT_60_iso_7u_spc into LAYOUT_60_iso_tsangan - add K31 position to layout macro - rename `60_iso_7u_spc` keymap to `default_iso_tsangan` * add K31 position to LAYOUT_64_iso - rename `64_iso` keymap to `default_64_iso` * add K31 position to LAYOUT_64_iso_3u_spc - rename `64_iso_3u_spc` keymap to `default_64_iso_3u_spc` * add K31 position to LAYOUT_64_iso_split_3u_spc - rename `64_iso_split_3u_spc` keymap to `default_64_iso_split_3u_spc` * remove LAYOUT_60_iso_1u_lshift_split_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_split_rshift`. * remove LAYOUT_60_iso_1u_lshift_7u_spc_split_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_tsangan_split_rshift`. * rename LAYOUT_60_ansi_7u_spc_split_bs to LAYOUT_60_ansi_tsangan_split_bs - rename `60_ansi_7u_spc_split_bs` keymap to `default_60_ansi_tsangan_split_bs` * add K31 position to LAYOUT_60_iso_split_bs * rename LAYOUT_60_iso_7u_spc_split_bs_rshift to LAYOUT_60_iso_tsangan_split_bs_rshift - rename `60_iso_7u_spc_split_bs_rshift` keymap to `default_60_iso_tsangan_split_bs_rshift` * add K31 position to LAYOUT_60_iso_arrow_split_bs * add K31 position to LAYOUT_60_iso_arrow_3u_spc_split_bs - rename `60_iso_arrow_3u_spc_split_bs` keymap to `default_60_iso_arrow_3u_spc_split_bs` * add K31 position to LAYOUT_60_iso_arrow_split_bs_3u_spc - rename `60_iso_arrow_split_bs_3u_spc` keymap to `default_60_iso_arrow_split_bs_3u_spc` * refactor LAYOUT_60_iso_7u_spc_split_bs into LAYOUT_60_iso_tsangan_split_bs - add K31 position to layout macro - rename `60_iso_7u_spc_split_bs` keymap to `default_60_iso_tsangan_split_bs` * add K31 position to LAYOUT_64_iso_split_bs - rename `64_iso_split_bs` keymap to `default_64_iso_split_bs` * add K31 position to LAYOUT_64_iso_3u_spc_split_bs rename `64_iso_3u_spc_split_bs` keymap to `default_64_iso_3u_spc_split_bs` * add K31 position to LAYOUT_64_iso_split_bs_3u_spc - rename `64_iso_split_bs_3u_spc` keymap to `default_64_iso_split_bs_3u_spc` * remove LAYOUT_60_ansi_arrow_6u_spc macro and keymap Functionally identical to `LAYOUT_60_ansi_arrow`. * remove LAYOUT_64_ansi_6u_spc macro and keymap Functionally identical to `LAYOUT_64_ansi`. * remove LAYOUT_60_iso_arrow_6u_spc macro and keymap Functionally identical to `LAYOUT_60_iso_arrow`. * remove LAYOUT_64_iso_6u_spc macro and keymap Functionally identical to `LAYOUT_64_iso`. * remove LAYOUT_60_ansi_arrow_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_60_ansi_arrow_split_bs`. * remove LAYOUT_64_ansi_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_64_ansi_split_bs`. * remove LAYOUT_60_iso_arrow_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_60_iso_arrow_split_bs`. * remove LAYOUT_64_iso_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_64_iso_split_bs`. * remove LAYOUT_60_iso_1u_lshift_split_bs_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_split_bs_rshift`. * remove LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_tsangan_split_bs_rshift`. * refactor keymaps - convert tabs to spaces - update keycode grid alignment * remove LAYOUT_60_ansi_arrow_3u_spc macro and keymap Subset of `LAYOUT_60_ansi_arrow_3u_spc_split_bs`. * remove LAYOUT_60_iso_arrow_3u_spc macro and keymap Subset of `LAYOUT_60_iso_arrow_3u_spc_split_bs`. * remove LAYOUT_60_iso_tsangan_split_bs macro and keymap Subset of `LAYOUT_60_iso_tsangan_split_bs_rshift`. * remove LAYOUT_60_iso_tsangan_split_rshift macro and keymap Subset of `LAYOUT_60_iso_tsangan_split_bs_rshift`. * remove LAYOUT_64_ansi_3u_spc macro and keymap Subset of `LAYOUT_64_ansi_3u_spc_split_bs`. * remove LAYOUT_64_iso_3u_spc macro and keymap Subset of `LAYOUT_64_iso_3u_spc_split_bs`. * remove LAYOUT_60_iso_split_bs macro and keymap Subset of `LAYOUT_60_iso_split_bs_rshift`. * remove LAYOUT_60_iso_split_rshift macro and keymap Subset of `LAYOUT_60_iso_split_bs_rshift`. * add LAYOUT_60_ansi_split_bs_rshift macro and keymap * remove LAYOUT_60_ansi_split_bs macro and keymap Subset of `LAYOUT_60_ansi_split_bs_rshift`. * add LAYOUT_60_tsangan_hhkb macro and keymap * remove LAYOUT_60_ansi_tsangan_split_bs macro and keymap Subset of `LAYOUT_60_tsangan_hhkb`. * standardize keymap names Rename all keymaps per QMK guidelines (e.g. keymap using `LAYOUT_60_ansi_arrow` should be named `default_60_ansi_arrow`). * add LAYOUT_all; refactor default keymap Add a `LAYOUT_all` macro, and update the `default` keymap to use the new macro. * refactor via keymap Update the `via` keymap to match the behaviour of the `default` keymap. * improve keyboard readme - fix broken image reference - improve grammar on keyboard description - fix Hardware Availability link - fix `make` instructions - add bootloader and flashing instructions * fix default_60_tsangan_hhkb keymap Fix a keycode count mismatch. * mj6xy.h: add matrix diagram * KC_GESC -> QK_GESC per fauxpark * KC_SLCK -> KC_SCRL per fauxpark
* | Remove legacy Grave Escape keycodes (#18787)Ryan2022-10-2070-76/+76
| |
* | Remove legacy EEPROM clear keycodes (#18782)Ryan2022-10-2021-31/+31
| | | | | | | | | | | | | | | | | | | | | | * `EEP_RST` -> `EE_CLR`, default-ish keymaps * `EEP_RST` -> `EE_CLR`, user keymaps * `EEP_RST` -> `EE_CLR`, community layouts * `EEP_RST` -> `EE_CLR`, userspace * `EEP_RST` -> `EE_CLR`, docs & core
* | Remove legacy keycodes, part 5 (#18710)Ryan2022-10-1570-70/+70
| | | | | | | | | | * `KC_SLCK` -> `KC_SCRL` * `KC_NLCK` -> `KC_NUM`
* | Remove RGBLIGHT_ANIMATION and clean up effect defines for L-Q (#18727)Drashna Jaelre2022-10-151-5/+14
| |
* | Remove legacy keycodes, part 4 (#18683)Ryan2022-10-134-4/+4
| | | | | | | | | | | | | | | | | | | | | | * `KC_PGDOWN` -> `KC_PGDN` * `KC_PSCREEN` -> `KC_PSCR` * `KC_SCOLON` -> `KC_SCLN` * `KC_BSLASH` -> `KC_BSLS` * `KC_BSPACE` -> `KC_BSPC`
* | Change `{LED,RGB}_DISABLE_TIMEOUT` to `{LED,RGB}_MATRIX_TIMEOUT` (#18415)Ryan2022-09-269-9/+0
| |
* | Change `DRIVER_LED_COUNT` to `{LED,RGB}_MATRIX_LED_COUNT` (#18399)Ryan2022-09-2328-28/+28
|/
* RESET -> QK_BOOT user keymaps (#17940)Joel Challis2022-08-211-1/+1
|
* Merge remote-tracking branch 'origin/master' into developDrashna Jael're2022-08-202-2/+2
|\
| * RESET -> QK_BOOT keyboard readme (#18110)Joel Challis2022-08-202-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-0750-50/+50
|\|
| * RESET -> QK_BOOT default keymaps (#17939)Joel Challis2022-08-0750-50/+50
| |
* | Remove `UNUSED_PINS` (#17931)Nick Brassel2022-08-0615-15/+0
|/
* Move keyboard USB IDs and strings to data driven: M (#17859)Ryan2022-08-0320-70/+60
|
* [Keyboard] Add tegic for melgeek! (#17400)bomb2022-06-2011-0/+575
| | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-231-1/+1
|\
| * [Keyboard] mj64 Increase LED count (#17194)Albert Y2022-05-221-1/+1
| |
* | RESET -> QK_BOOT default keymaps (#17037)Joel Challis2022-05-1519-19/+19
|/
* Remove `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION` from keyboard config.h ↵Ryan2022-03-158-32/+0
| | | | (#16655)
* [Keyboard] MelGeek Mach80 rev2 (#15610)bomb2022-02-083-0/+256
|
* Correct matrix effect name (#15816)Albert Y2022-01-111-1/+1
|
* Tidy up NKRO_ENABLE rules (#15382)Ryan2021-12-0913-26/+13
|
* Tidy up `SLEEP_LED_ENABLE` rules (#15362)Ryan2021-12-0113-26/+0
|
* Remove use of __flash due to LTO issues (#15268)Joel Challis2021-11-2412-12/+12
|
* [Keyboard] Fix handful of boards compiling too large due to RGB matrix ↵Drashna Jaelre2021-11-161-3/+2
| | | | changes (#15184)
* Require explicit enabling of RGB Matrix modes (#15018)Drashna Jaelre2021-11-158-21/+380
|
* Remove `BOOTMAGIC_ENABLE = lite` option (#15002)James Young2021-11-0513-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* [Keyboard] Reduce compile size for melgeek mach80 (#15034)Drashna Jaelre2021-11-032-1/+2
|
* Clean up LED/RGB Matrix driver config (#14760)Ryan2021-10-1018-31/+12
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-061-175/+175
|\
| * MelGeek Mach80: correct Configurator layout (#14716)James Young2021-10-051-175/+175
| | | | | | Adds a 0.5u gap between the top two rows.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1513-0/+764
|\|
| * [Keyboard] Add Mach80 for Melgeek (#14076)bomb2021-09-1413-0/+764
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1212-13/+0
|\|
| * Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-1212-13/+0
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-128-17/+0
|\|
| * Remove width, height and key_count from info.json (#14274)Ryan2021-09-128-17/+0
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 07:21:22 +0000