Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-03 | 1 | -9/+623 | |
|\| | ||||||
| * | aves65: complete layout data (#13868) | James Young | 2021-08-03 | 1 | -9/+623 | |
| | | | | | | | | | | | | | | | | | | | | | | add layout data for: - LAYOUT_all - LAYOUT_65_iso - LAYOUT_65_iso_split_bs - LAYOUT_65_iso_blocker_split_bs - LAYOUT_65_ansi - LAYOUT_65_ansi_split_bs - LAYOUT_65_ansi_blocker - LAYOUT_65_ansi_blocker_split_bs | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-03 | 1 | -1/+2 | |
|\| | ||||||
| * | 4pplet/eagle_viper_rep/rev_a: fix missing key object (#13867) | James Young | 2021-08-03 | 1 | -1/+2 | |
| | | | | | | Adds a key object for the KC_NUHS key to the info.json data. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-03 | 15 | -38/+198 | |
|\| | ||||||
| * | [Keymap] Minor cleanup of bcat keymaps and userspace (#13224) | Jonathan Rascher | 2021-08-03 | 15 | -38/+198 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-03 | 1 | -1/+1 | |
|\| | ||||||
| * | 40percentclub/nori: fix matrix reference in LAYOUT_ortho_4x8 (#13866) | James Young | 2021-08-03 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | * 40percentclub/nori: fix matrix reference in LAYOUT_ortho_4x8 * remove ortho_4x8 from Community Layouts rule ortho_4x8 isn't a valid option here. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-03 | 1 | -1/+11 | |
|\| | ||||||
| * | capsunlocked/cu7: fix missing key object (#13862) | James Young | 2021-08-03 | 1 | -1/+11 | |
| | | | | | | Adds a key object for the encoder keypress. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-03 | 1 | -1/+1 | |
|\| | ||||||
| * | [Docs] Remove extra word it bootmagic page (#13855) | plarso | 2021-08-02 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-03 | 4 | -26/+47 | |
|\| | ||||||
| * | 0xCB Static: fix `qmk info` and Configurator issues (#13856) | James Young | 2021-08-02 | 4 | -26/+47 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-02 | 1 | -2/+2 | |
|\| | ||||||
| * | Function96 V2: Fixed info.json file (#13322) | JTM | 2021-08-02 | 1 | -2/+2 | |
| | | | | | | Fixes the info.json data for the LAYOUT_default and LAYOUT_ansi_splitspace macros. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-02 | 1 | -3/+5 | |
|\| | ||||||
| * | flash_stm32: don't unlock flash if already unlocked (#13841) | xyzz | 2021-08-02 | 1 | -3/+5 | |
| | | | | | | | | | | On stm32f4 after reboot from DFU it was observed that the flash is already unlocked. In that case, attempting to unlock it again causes a data abort. | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | Nick Brassel | 2021-08-02 | 40 | -328/+2099 | |
|\| | ||||||
| * | Duck Eagle/Viper V2 Refactor (#13828) | James Young | 2021-07-31 | 7 | -56/+393 | |
| | | ||||||
| * | Merro60 Layout Macro Refactor (#13827) | James Young | 2021-07-31 | 9 | -67/+238 | |
| | | ||||||
| * | Momoka Ergo: layout macro/Configurator fix (#13825) | James Young | 2021-07-31 | 3 | -116/+130 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * momoka_ergo.h: use modified QMK 3-character notation Renames the matrix position arguments to use QMK's K<row><column> notation, but using L or R for the left and right halves, respectively. * physically arrange layout macro Arrange the layout macro and keycodes to resemble the assembled keyboard. * info.json: rebuild LAYOUT data Fixes mispositioned keys in QMK Configurator. | |||||
| * | Update endgame keymap to work with suspend changes (#13805) | slashbunny | 2021-07-31 | 2 | -2/+1 | |
| | | | | | | | | | | | | Updates the Massdrop CTRL keyboard engame keymap to work after the changes to USB suspend in #12697 Fixes #13782 | |||||
| * | DP60 layout macro renames (#13811) | James Young | 2021-07-31 | 2 | -17/+414 | |
| | | | | | | | | | | | | | | | | | | * info.json: apply human-friendly formatting * rename LAYOUT_60_wkl to LAYOUT_60_ansi_tsangan_split_rshift * rename LAYOUT_60_wkl_split_bs to LAYOUT_60_tsangan_hhkb * info.json: remove `key_count` keys | |||||
| * | Charue Sunsetter: layout macro fixes (#13809) | James Young | 2021-07-31 | 6 | -32/+591 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove K214 from LAYOUT_1065_ansi macro Position K214 is only used by the ISO layout (as KC_NUHS); it doesn't get used here. Removing it so the layout macro matches the info.json layout data. Also updates info.json to use human-friendly formatting. * add layout macros Adds: - LAYOUT_1065_ansi_split_bs macro - LAYOUT_1065_iso macro - LAYOUT_1065_iso_split_bs macro - `default_iso` keymap * add LAYOUT_all macro Adds LAYOUT_all macro and a `default_all` keymap. This PCB is unusual in that the ANSI Backslash and ANSI Enter do not share their matrix positions with the Non-US Backslash or ISO Enter keys at all. This layout macro supports both the ANSI and ISO positions in one macro/keymap. | |||||
| * | Rartland: add 65_ansi and 65_iso layouts (#13807) | James Young | 2021-07-31 | 3 | -5/+215 | |
| | | | | | | | | | | | | | | * add 65_ansi and 65_iso layouts ... with Community Layout support * add block comment of layouts to rartland.h | |||||
| * | [Keymap] Add peott-fr Kinesis keymap (#13812) | peott-fr | 2021-07-31 | 1 | -0/+28 | |
| | | ||||||
| * | [Keyboard] Reduce nibble oled_status keymap size (#13813) | Jay Greco | 2021-07-31 | 1 | -5/+7 | |
| | | ||||||
| * | [Keyboard] Fix RGBKB Pan Rev1 Encoder RGB handling (#13781) | Drashna Jaelre | 2021-07-31 | 2 | -26/+76 | |
| | | ||||||
| * | change DIP_SWITCH_ENABLE to off (#13815) | MakotoKurauchi | 2021-07-31 | 4 | -2/+6 | |
| | | ||||||
* | | Fix alignment of USB out report buffer 2 -> 4 (#13838) | a_p_u_r_o | 2021-08-02 | 1 | -1/+1 | |
| | | ||||||
* | | [BUG] Fix Key Override includes (#13831) | Drashna Jaelre | 2021-08-01 | 1 | -1/+1 | |
| | | | | | | | | | | * [BUG] Fix Key Override includes * simplify includes | |||||
* | | fix develop branch move file (#13832) | Jonavin | 2021-08-01 | 1 | -0/+0 | |
| | | | | | | Co-authored-by: zvecr <git@zvecr.com> | |||||
* | | [Keyboard] Fix SRC include for matrix/m20add issi driver (#13826) | Drashna Jaelre | 2021-07-31 | 1 | -1/+1 | |
| | | ||||||
* | | Fix compile issues due to LED changes (#13821) | Drashna Jaelre | 2021-07-31 | 3 | -135/+135 | |
| | | ||||||
* | | __flash? (#13799) | Joel Challis | 2021-07-31 | 76 | -92/+95 | |
| | | ||||||
* | | Move some led drivers to common folder (#13749) | Joel Challis | 2021-07-31 | 64 | -58/+58 | |
| | | | | | | * Move some led drivers to common folder | |||||
* | | [develop] Fix pimoroni trackball read address (#13810) | Dasky | 2021-07-31 | 1 | -1/+1 | |
| | | ||||||
* | | Update LUFA Submodule (2021-07-30) (#13819) | Drashna Jaelre | 2021-07-31 | 1 | -0/+0 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-31 | 1 | -364/+85 | |
|\| | ||||||
| * | Neito: correct key sequence in info.json (#13808) | James Young | 2021-07-31 | 1 | -364/+85 | |
| | | ||||||
* | | [CLI] Make `qmk doctor` more lenient about system config (#13804) | ruro | 2021-07-30 | 2 | -6/+12 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-31 | 2 | -6/+6 | |
|\| | ||||||
| * | Fix up paths for bioi boards - parallel compilation failures due to file ↵ | Nick Brassel | 2021-07-31 | 2 | -6/+6 | |
| | | | | | | | | collisions. (#13806) | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-30 | 1 | -0/+1 | |
|\| | ||||||
| * | Explicitly state that VIA should not be enabled in the default keymap. (#13803) | Nick Brassel | 2021-07-31 | 1 | -0/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-30 | 2 | -0/+0 | |
|\| | ||||||
| * | Move ergosaurus via keymap to correct location (#13802) | Joel Challis | 2021-07-31 | 2 | -0/+0 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-30 | 1 | -1/+1 | |
|\| | ||||||
| * | Fix onekey console keymap (#13797) | Ryan | 2021-07-30 | 1 | -1/+1 | |
| | |