Merge remote-tracking branch 'origin/master' into develop
Update Choco60 firmware to support new PCB (#11218) * Update vendor and product info * Add rev2 for Choco60 * Add keymap for VIA * Add readme.md for rev1 and rev2 * Use list instead of new line * Remove DESCRIPTION Co-authored-by: Ryan <fauxpark@gmail.com> * Update rev1/readme.md to specify rev1 directly. Co-authored-by: Ryan <fauxpark@gmail.com> * Remove some definitions Co-authored-by: Ryan <fauxpark@gmail.com> * Remove comments Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
Add 6key to keyboards/handwired (#11226) * Add 6key to keyboards/handwired * Add keyboards/handwired/6key folder * Add 6key.c * Add 6key.h * Add config.h * Add keymaps/default/keymap.c * Add readme.md * Add rules.mk * Add info.json * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Make changes based on pr comments * Apply formatting suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/handwired/6key/rules.mk Co-authored-by: jyliang2 <jyliang2@illinois.edu> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com>
add nodu keyboard (#11233) * add nodu keyboard * fix info.json * limit via to 3 layers Co-authored-by: Swiftrax <swiftrax@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
Tsukuyomi Keyboard (#10898) * Add Tsukuyomi PCB * Remove unncessary file * Fix * update config * Tsukuyomi info.json * Update readme * add license header and add dfu suffix args * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> * Update info.json * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
Add convenience method for setting Nibble's big LED RGB (#11257)
Merge remote-tracking branch 'origin/master' into develop
[Bug] Fix RGB Matrix Indicators (#11308)
Merge remote-tracking branch 'origin/master' into develop
Fix backlight for XD84 (#11309) Like XD87, XD8 should have `#define BACKLIGHT_ON_STATE 0` too.
Merge remote-tracking branch 'origin/master' into develop
Remove MATRIX_IS_ON macro (#11330) * Remove MATRIX_IS_ON macro this macro is both incorrect and excessive given that macro_is_on() exists * Remove massdrop matrix.h
Merge remote-tracking branch 'origin/master' into develop
Add ALETH42 keyboard (#10720) * Add Aleth42 keyboard * Fix Rotary Encoder Section * Add VIA keymap * Fix VIA keymap remove RETRO_TAPPING define because of incompatiblity of rotary encoders with layer tapping. change KC_ESC to KC_GESC * Change TAPPING definitions Comment TAPPING_TERM Remove RETRO_TAPPING * Add rev1 Add new rev1 directory Move previous files to rev0 * Add define of ENCODER_RESOLUTION * Change number of RGBLED * Change USB descriptor param Change VID, PID and product name * Change default and via keymaps * Remove upper keymap * Add readme * Change USB descriptor param VID 0x04D8 PID 0xEAC8 Manufacturer 25KEYS rev0 -> 0x0000 rev1 -> 0x0001 Remove define DESCRIPTION * Fix info.json Remove info,json under /rev0 /rev1 Add correct info.json at keyboard/aleth42/ * Change keymaps * Remove unnecessary comments * Change BOOTMAGIC option * Change config options * Fix readme files * Change keymap readme files * Change to use get_highest_layer * Update keyboards/aleth42/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Use tap_code16 function * Remove empty config file * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
Update keycode docs (#11343)
Merge remote-tracking branch 'origin/master' into develop