summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-048-0/+423
|\
| * [Keyboard] Add LCK75 keyboard (#11493)im a can what do you think lmao?2021-02-038-0/+423
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add lck75 keyboard A 75% THT keyboard with an OLED and rotary encoder * added info.json * fixed rules.mk * changed vendor id * Update keyboards/lck75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/lck75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/lck75/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/lck75/keymaps/default/keymap.c moved code to the rules.mk folder Co-authored-by: Drashna Jaelre <drashna@live.com> * Update rules.mk moved oled driver enable to rules.mk code * Update keyboards/lck75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update oled.c id like to keep the copyright there as it's my friend that helped me with the OLED specifically. also updated the old_task_user * Update keyboards/lck75/oled.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lck75/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lck75/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lck75/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update rules.mk * merged oled.c code into keymap.c file tested and works correctly on my board * merged code from this file into the keymap.c file this file is no longer needed Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-031-1/+1
|\|
| * Use num lock instead of caps lock for KBDPAD MKII LED (#11781)Andre DeMarre2021-02-041-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-032-1/+16
|\|
| * Update iNETT Studio Square.X RGB Light (#11723)Matrix Zou2021-02-032-1/+16
| | | | | | | | * Add Caps Lock indicators support * Fix 'a' flag error for RGB Light Mode
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-039-0/+409
|\|
| * [Keyboard] add koalafications (#11628)Brandon Claveria2021-02-039-0/+409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add koalafications * fix keymap * add oled * oled stuff * fix oled stuff * add animation * more oled stuff * update rules.mk * oled annimation * change PID * Update keyboards/handwired/swiftrax/koalafications/info.json * Update keyboards/handwired/swiftrax/koalafications/readme.md
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-031-1/+1
|\|
| * Fixing layer order for Breeze default keymap (#11779)Eithan Shavit2021-02-031-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-031-1/+1
|\|
| * Fix DEBUG_MATRIX_SCAN_RATE on chibiOS when console is enabled (#11776)Drashna Jaelre2021-02-031-1/+1
| | | | | | | | | | | | | | | | | | * Fix DEBUG_MATRIX_SCAN_RATE on chibiOS when console is enabled * update type in dprintf Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-026-180/+7
|\|
| * Clean up KBD8X keyboard (#11565)Drashna Jaelre2021-02-026-180/+7
| | | | | | | | | | | | * Clean up KBD8X keyboard * remove unneeded rules
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-023-79/+88
|\|
| * Knobgoblin info file fix (#11697)mrT1ddl3s2021-02-023-79/+88
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-024-0/+629
|\|
| * add orthodeluxe keymap for Planck keyboard (#11077)erikbakker-dev2021-02-024-0/+629
| | | | | | | | | | | | | | | | | | * add orthodeluxe keymap for Planck keyboard * add licence header to config.h * fix indentation * add bootmagic lite and simplify code
* | Address wake from sleep instability (#11450)Joshua Diamond2021-02-025-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * resolve race condition between suspend and wake in LUFA * avoid multiple calls to suspend_power_down() / suspend_wakeup_init() * Remove duplicate suspend_power_down_kb() call * pause on wakeup to wait for USB state to settle * need the repeated suspend_power_down() (that's where the sleep is) * more efficient implementation * fine tune the pause after sending wakeup * speculative chibios version of pause-after-wake * make wakeup delay configurable, and adjust value * better location for wakeup delay
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-012-3/+6
|\|
| * CLI: Fix json flashing (#11765)Erovia2021-02-012-3/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-011-2/+2
|\|
| * Fix Ergosaurus default RGB_DI_PIN (#11634)Carlos2021-02-011-2/+2
| | | | | | | | | | * Update RGB_DI_PIN to match breakout on pcb * Wrap in safer define check
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-0112-0/+413
|\|
| * [Keyboard] Add nullbitsco SCRAMBLE (#11078)Jay Greco2021-02-0112-0/+413
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add SCRAMBLE * Make requested changes to PR * Add all layers to VIA keymap Implement drashna's PR feedback in order to avoid random data within the layers in VIA. * Make requested changes to PR Implement fauxpark's PR feedback to clean up readme.md and rules.mk. * Make changes based on PR feedback -Changed VIA layers to enum -Added info on how to enter the bootloader to readme
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-011-0/+2
|\|
| * added limit to RGB brightness (#11759)cole smith2021-02-011-0/+2
| |
* | Move transport.c to QUANTUM_LIB_SRC (#11751)Drashna Jaelre2021-02-012-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-016-0/+633
|\|
| * [Docs] Japanese translation of internals_*.md (#10316)umi2021-02-016-0/+633
| | | | | | | | | | | | | | * add git checkout internals_related.md translation * update based on comment * unify the end of sentence
* | Stop sounds when suspended (#11553)Joshua Diamond2021-02-017-4/+56
| | | | | | | | | | | | | | * fix stopping audio on suspend vs. startup sound * trim firmware size * fix stuck audio on startup (ARM)
* | Decouple USB events from the USB interrupt handler. (#10437)Nick Brassel2021-02-013-9/+80
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-311-30/+7
|\|
| * quantum.c send char cleanups (#11743)Ryan2021-02-011-30/+7
| |
* | Create a system to map between info.json and config.h/rules.mk (#11548)Zach White2021-01-3113-461/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * generate rules.mk from a json mapping * generate rules.mk from a json mapping * support for config.h from json maps * improve the mapping system * document the mapping system * move data/maps to data/mappings * fix flake8 errors * fixup LED_MATRIX_DRIVER * remove product and description from the vision_division keymap level * reduce the complexity of generate-rules-mk * add tests for the generate commands * fix qmk doctor when submodules are not clean
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-318-0/+348
|\|
| * [Keyboard] SplitKB's Zima (#11577)Drashna Jaelre2021-01-318-0/+348
| | | | | | | | Co-authored-by: Thomas Baart <thomas@splitkb.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-312-2/+2
|\|
| * Fix missing F2 in top row in AoS TKL maps (#11735)Rys Sommefeldt2021-01-312-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developZach White2021-01-3045-2/+208
|\|
| * Add a <FEATURE>_SUPPORTED flag (#9058)Zach White2021-01-3045-1/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial attempt at allowing keyboards to indicate what features they do not support * try to use a for loop instead * Update disable_features.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * add a few more features * remove my test fixture * disable things that make all:all suggested" Co-authored-by: Zach White <skullydazed@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | undef TAPPING_TERM in users/hvp/hvp.hZach White2021-01-301-1/+2
| |
* | rename callum's custom keycode that conflicts with a LUFA defineZach White2021-01-301-2/+2
| |
* | add missing _MACRO to users/brandonschlack/brandonschlack.hZach White2021-01-301-0/+1
| |
* | check for BACKLIGHT_ENABLE so this works on all keyboardsZach White2021-01-301-0/+2
| |
* | change LAYOUT_planck_grid to LAYOUT_ortho_4x12Zach White2021-01-301-5/+5
| |
* | bring the bocaj keymap inline with LAYOUT_ortho_4x12Zach White2021-01-302-10/+10
| |
* | bring the xyverz keymap inline with LAYOUT_66_ansiZach White2021-01-302-26/+28
| |
* | strip fn_actionsZach White2021-01-301-99/+2
| |
* | remove conflicting NKRO_ENABLE flagZach White2021-01-301-1/+0
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 09:29:33 +0000