summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-13Fix typos: key-modifer→key-modifier and interacton→interaction (#22464)precondition
2023-11-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-12add `68_ansi` Community Layout to nebula68b (#22433)Duncan Sutherland
2023-11-12Generalise ADC driver source inclusion (#22448)Joel Challis
2023-11-12Remove requirement for `keymap_steno.h` include in keymaps (#22423)Ryan
* Remove requirement for `keymap_steno.h` include in keymaps * Add back keymap_steno.h with a note for the time being
2023-11-12Slight refactor of joystick axis type into typedef (#22445)Ryan
2023-11-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-11[Keyboard] Fixes to make snes_macropad play nicer with qmk configurator (#22432)John Barbero
* [Keyboard] Change default implementation for get_layer_name_user Will now show the layer number instead of "Unknown", since this is what will be shown if QMK Configurator is used to compile the firmware. * [Keyboard] Update the layout info This makes it look sort of like a macropad + gamepad rather than an 4x6 ortholinear keyboard. * [Keyboard] Fix default implementation of get_layer_name_user Based on feedback from code review the implementation was swapped in favor of using get_u8_str. This implied a change to the argument type from int to uint8_t, which cascaded into the existing keymaps. (This made sense in general, since the return type of get_highest_layer is also a uint8_t.)
2023-11-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-11studiokestra/line_tkl: correct layout data (#22455)Duncan Sutherland
* fix `layouts` data * add EoF
2023-11-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-11add 5087 keyboard (#20557)jonylee@hfd
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2023-11-11fix: make clicky delay silent (#21866)Less/Rikki
2023-11-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-11Add `qmk license-check` developer-level CLI command. (#22075)Nick Brassel
2023-11-11Fixup snes_macropad on develop (#22444)jack
2023-11-11snled27351: fix missing `i2c_init()` (#22446)Ryan
2023-11-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-10[Keyboard] Add MariOrion v2.5 (#22273)Maria
* Pushed MariOrion v2.5 to the branch. Prod and proto version added. * Pushed MariOrion v2.5 to the branch. Prod and proto version added. * Proper addition of layout options Addition of split bs rshift tsangan layout options. Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25 * Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25 * Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/proto/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Updated readme.md with more information regarding make commands, and proto vs prod. * Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/prod/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Amended some changes to info.json - community layouts changed from scope to array. * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Removed via.json from the via keymaps. Replaced with matrix_diagram.md. via.json file moved off to [public mariorion_v25 repo](https://github.com/toril940/orion-v25) * Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Removed via.json from the via keymaps. Replaced with matrix_diagram.md. via.json file moved off to [public mariorion_v25 repo](https://github.com/toril940/orion-v25) * Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/rules.mk Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/matrix_diagram.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/proto/mariorion_v25.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/prod/mariorion_v25.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Pushed new info.json and keymap.c files. * Pushed new info.json and keymap.c files. * Fixes to LED driver wrt PWM definitions with STM. * Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/prod/mariorion_v25.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/proto/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/proto/mariorion_v25.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/proto/mariorion_v25.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Committing a details update to readme.md. * Committing a details update to readme.md. * Update keyboards/mariorion_v25/prod/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/prod/mariorion_v25.c Co-authored-by: Ryan <fauxpark@gmail.com> * Revert "Committing a details update to readme.md." This reverts commit 068a82a1fcf1996d87f7f97a10e9f5fbbee79a29. * Committing a details update to readme.md. * Update keyboards/mariorion_v25/halconf.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/mcuconf.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/prod/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/proto/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/halconf.h Co-authored-by: Ryan <fauxpark@gmail.com> * Production pictures replacing the standard ones in the readme.md :) * waffle87 requests bundled: - Licence headers added - Codeblocked matrix_diagram.md - Consolidated files where possible - Removed excess from config.h --------- Co-authored-by: toril940 <anastasialucas940@hotmail.com> Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2023-11-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-10Add Ploopy Madromys mouse (#21989)ploopyco
Added PloopyCo madromys/adept mouse Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-11-10Infer LED DRIVER_COUNT from configured addresses (#22311)Joel Challis
2023-11-10LED drivers: clean up `SWx`/`CSy` pullup/down resistor config (#22381)Ryan
2023-11-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-09[Keyboard] Add alpaca/wfeclipse (#22230)temp4gh
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-11-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-09Update gregandcin/teaqueen (#22402)gregandcin
2023-11-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-09Add SNES Macropad keyboard (#22377)John Barbero
Co-authored-by: jack <0x6a73@protonmail.com>
2023-11-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-09Update layer state of Lily58 from 'Default' to 'Base' (#22397)Panos Sakkos
2023-11-09Migrate some common features to generic (#22403)Joel Challis
2023-11-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-09Fix indicator LED definition for Sofle RGB. (#22408)Matthias Liffers
2023-11-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-09Fix corne keylog (#22420)John Barbero
* [Keyboard] Fix bug in set_keylog function Fixes issue where some keys would not trigger the oled to output the row and column of a pressed key (would happen with LT(...) for my keymap) * [Keyboard] Tiny improvement to oled_render_keylog for crkbd Added improvement suggestion I got for another keyboard
2023-11-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-08Add iso85k keyboard (#22411)Fredrik A. Kristiansen
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-08[Keyboard] Rename soda/{mango,pocket} (#22151)Jeayo Keh
Co-authored-by: Joel Challis <git@zvecr.com>
2023-11-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-08Fix Herringbone pro Layouts (#22317)Yak
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-08feat(mechwild/clunker): new layouts (#22342)Less/Rikki
2023-11-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-08[Keyboard] Add PCB Utopia88 (#22257)Kelwin0313
2023-11-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-08[Keyboard] Add Duet Switch Tester (#22367)ai03
Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-11-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-11-08Add riblee handwired split keyboard (#22277)Reibl János Dániel
2023-11-08Merge remote-tracking branch 'origin/master' into developQMK Bot
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 20:27:40 +0000