48 Commits
Author SHA1 Message Date
Andrew KannanandGitHub 46d679ab11 qmk format-json: Add an in-place mode to format json command (#21610) 2023-09-14 21:38:42 +01:00
adef366e0c CannonKeys Meetup Pad 2023 (#21806)
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-08-29 18:08:51 -07:00
042e42d1b7 Add Chimera65 Hotswap keyboard (#20038)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-11 14:04:26 -07:00
758766820d Add Type-B firmware to QMK (#19764)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-02-09 13:55:26 -07:00
3115cdf663 [Keyboard] Add Crin (#18065)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-02-02 13:32:22 -08:00
f288a3bb3b [Keyboard] Add Ortho60 v2 Keyboard (#18890)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-03 23:15:44 -08:00
ddcb8dd7ca [Keyboard] Add Serenity PCB (#18705)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-12 16:59:17 -08:00
0113550066 [Keyboard] Add Brutal v2 1800 PCB to QMK (#18891)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-11-08 08:23:37 -08:00
2dff39720d [Keyboard] Add Ellipse PCB support (#18706)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-24 22:05:53 -07:00
d861a35ebf [Keyboard] Add Ellipse hotswap PCB support (#18707)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-24 22:05:22 -07:00
Andrew KannanandGitHub bc538e3776 [Keyboard] CannonKeys Malicious Ergo (#17076)
* Add Malicious Ergo keyboard to QMK

* Update layout

* update info.json

* update info.json again

* Update info.json again

* i h8 info.json

* its default not all

* Update keyboards/cannonkeys/malicious_ergo/config.h

* Add bootloader instructions and license header

* Update keyboards/cannonkeys/malicious_ergo/rules.mk

* Update keyboards/cannonkeys/malicious_ergo/rules.mk

* Update keyboards/cannonkeys/malicious_ergo/readme.md

* Remove rotation from info.json

* Remove labels

* Update keyboards/cannonkeys/malicious_ergo/readme.md

* Update keyboards/cannonkeys/malicious_ergo/malicious_ergo.h

* Revise info.json again

* whitespace fix

* Apply suggestions from code review

Move pid/vid into info json
Fix rounding errors in info json

Thanks to fauxpark and noroadsleft!
2022-08-30 11:29:05 -07:00
1c97a0375e [Keyboard] Add BrutalV2 65 Keyboard (#17252)
* Add Brutal65 V2 to QMK

* Update info.json and copyright notices

* Update info.json]

* Update readme and delete chconf

* Update matrix and keymaps to match info json

* Update keyboards/cannonkeys/brutalv2_65/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/cannonkeys/brutalv2_65/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/cannonkeys/brutalv2_65/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-07 11:30:35 -07:00
fbe236fa77 [Keyboard] Add Cloudline PCB support (#17253)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-07 11:29:31 -07:00
c10bc9f91e [Keyboard] Adelie Firmware (#13265)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-12-14 19:41:41 -08:00
388a4ae817 [Keyboard] Add Vicious40 to QMK (#12981)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 09:19:26 -07:00
f439bfd543 [Keyboard] Aella Keyboard PCB (#13372)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19 20:46:01 -07:00
46b8230468 [Keyboard] Add CannonKeys Balance PCB to QMK (#13489)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19 18:49:26 -07:00
65d8ac4759 [Keyboard] Add Onyx keyboard to QMK (#11292)
* Add Onyx keyboard to QMK

* Apply suggestions from code review

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-10 22:18:01 -08:00
495a61ad7a [Keyboard] Sagittarius (#10896)
* Sagittarius keyboard

* Update Sagittarius keyboard

* fix

* remove info.json as it's very hard to make

* Add license and address PR comments

* Apply suggestions from code review

Co-authored-by: Joel Challis <git@zvecr.com>

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

* Add info json, update keymap

* Fix info json

* Update keymap

* Update keyboards/cannonkeys/sagittarius/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-05 20:23:35 -08:00
bea897caf1 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>
2020-12-29 23:43:46 +00:00
0f086df89f Allow APM32 MCUs on certain CannonKeys PCBs (#10899)
* Allow APM32 MCUs on certain CannonKeys PCBs

* another one

* Update DFU suffix args

* missed one

* Apply suggestions from code review

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
2020-12-03 18:22:05 -08:00
e937fc4513 Add Instant65 to QMK (#9804)
* Add Instant65 to QMK

* Fix via map

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-07-27 14:29:09 -04:00
b0e99c803d Atlas Updates (#9343)
* Update atlas keyboard files and default keyboard layout

* Remove wierd LT things

* Update keyboards/cannonkeys/atlas/keymaps/via/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
2020-07-27 12:16:21 -04:00
643fc1d806 Update keyboards/cannonkeys/obliterated75/keymaps/default/keymap.c
Co-Authored-By: Ryan <fauxpark@gmail.com>
2020-04-21 12:03:42 -04:00
7a9980fd85 Apply suggestions from code review
Co-Authored-By: Ryan <fauxpark@gmail.com>
Co-Authored-By: Joel Challis <git@zvecr.com>
2020-04-17 11:04:25 -04:00
99d9250045 Apply suggestions from code review
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-Authored-By: Ryan <fauxpark@gmail.com>
2020-04-16 16:20:43 -04:00
Andrew KannanandGitHub 17d0f6338e [Keyboard] ProjectKB Alice rev2 (#8718)
* Add revision 1 and revision 2 to ProjectKB Alice PCB

* Swap SLEEP LED to no

* Basic root rules.mk

* Apply suggestions from code review

* Update keyboards/projectkb/alice/rules.mk
2020-04-15 15:37:47 -07:00
7a0d145e27 Whitespace changes
Co-Authored-By: Ryan <fauxpark@gmail.com>
2020-04-15 12:35:24 -04:00
Andrew KannanandGitHub eb7fc7f9d9 [Keyboard] Add CannonKeys Atlas keyboard (#8207)
* Atlas keyboard

* Update info and readme

* Update firmware

* Apply suggestions from code review

* Updates

* Add 2x2U layout

* Minor cleanup

* Fix trailing comma

* Remove line

* Apply suggestions from code review
2020-04-12 08:08:15 -07:00
Andrew KannanandGitHub 799b21f8cd [Keyboard] Add CannonKeys Rekt1800 keyboard (#7760)
* Add Rekt1800 keyboards

* Update keyboards/cannonkeys/rekt1800/config.h

* Update keyboards/cannonkeys/rekt1800/info.json

* Apply suggestions from code review

* Apply suggestions from code review

* Remove line

* Apply suggestions from code review
2020-04-12 03:36:03 -07:00
27e7f322a5 CannonKeys DB60 (Daughterboard60) PCB (#8208)
* Cannonkeys DB60 Keyboard

* WhitespacE

* Add ISO and make layer names more idiomatic

* backlight enable

* Remove big backslash from ISO

* Apply suggestions from code review

Co-Authored-By: Ryan <fauxpark@gmail.com>

* Update for correct matrix

* Apply suggestions from code review

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-Authored-By: Ryan <fauxpark@gmail.com>

* Update chibios config files

* Complete VIA keymap

* Remove ugly hack comments

* Update keyboards/cannonkeys/db60/rules.mk

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>
Co-authored-by: Joel Challis <git@zvecr.com>
2020-04-11 23:21:36 +01:00
dfdc89296b DevastatingTKL Keyboard (#8209)
* Save progress

* Finished matrix and everything

* Apply suggestions from code review

Co-Authored-By: Ryan <fauxpark@gmail.com>

* Update DevastatingTKL

* Renames

* Add renamed files

* Update chibios files and VIA keymap for completion

* Some cleanup

* Apply suggestions from code review

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/devastatingtkl/rules.mk

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>
Co-authored-by: Joel Challis <git@zvecr.com>
2020-04-11 23:19:44 +01:00
455a0c5978 [Keyboard] New CannonKeys boards and EEPROM fixes (#6968)
* Add Iron165

* CannonKeys new boards and cleanup

* Tmo50 info json

* Update readme for TMOv2

* update via keymap tmo

* info json again

* Apply suggestions from code review

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Address PR comments

* More changes for rules files cleanup

* info.json fixed?

* Fix Savage65 matrix

* Apply suggestions from code review

Thanks noroadsleft for the improvements!

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Bump eeprom version

* Apply suggestions from code review

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
2019-10-29 23:45:58 -07:00
Andrew KannanandDrashna Jaelre e5aa28455e [Keyboard] 201909 s75 custom encoder (#6745)
* Handle custom encoder configuration

* Whitespace changes

* Undo broken stuff

* more

* Remove printfs

* fix the dumb bug
2019-09-18 17:41:46 -07:00
59af2cbe64 Add Chimera65 Keyboard (#6670)
* Add chimera board

* info json start

* Update keyboards/cannonkeys/chimera65/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Apply suggestions from code review

Co-Authored-By: Drashna Jaelre <drashna@live.com>
Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/chimera65/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>
2019-09-16 19:37:51 -07:00
cd59fe78be [Keyboard] Add Ortho75 (#6177)
* Add Ortho75

* fix typo

* Add dfu args to rules.mk

* Update keyboards/cannonkeys/ortho75/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/ortho75/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/ortho75/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/ortho75/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/ortho75/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/ortho75/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/ortho75/keymaps/default/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>
2019-06-24 00:28:38 -07:00
3915c8eb00 [Keyboard] Add AN-C PCB (#6157)
* Add cannonkeys AN-C keyboard

* Update Instant60 readme to point to CannonKeys docs

* Ortho75

* Update keyboards/cannonkeys/an_c/an_c.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/an_c/an_c.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/an_c/keymaps/default/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/an_c/keymaps/default/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/an_c/rules.mk

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/instant60/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/cannonkeys/an_c/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update readme

* Update info.json

* Remove Ortho75 and put in a separate branch

* Update info.json

* remove redundant things

* Update keyboards/cannonkeys/an_c/keymaps/default/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update rules and info.json
2019-06-24 00:09:02 -07:00
Andrew KannanandDrashna Jaelre 6464dfc91d [Keyboard] Satisfaction75 i2c fix and VIA layout (#5798) 2019-05-09 22:53:36 -07:00
Andrew KannanandDrashna Jaelre 6a4c54870c [Keyboard] Instant60 Tsangan (#5580)
* Update instant60 for tsangan version

* Add extra init hook

* Remove hacky first init thing
2019-04-07 18:32:16 -07:00
Andrew KannanandDrashna Jaelre 99a8628383 [Keyboard] CannonKeys Instant60 Keyboard (#5433)
* Instant 60

* Instant60 changes again

* turn off LSE and features

* Working RGB underglow 🎉

* Add missing files

* Update keymap to have reset

* Backlighting on

* Backlight code for instant60

* Move 072 files to common folder and use it in Instant60

* Updates

* Update keyboards/cannonkeys/instant60/rules.mk

Co-Authored-By: awkannan <andrew.kannan@klaviyo.com>
2019-03-18 11:12:09 -07:00
Andrew KannanandDrashna Jaelre e046872a80 [Keyboard] Satisfaction75 Protoype/Rev1 split, and new VIA features (#5303)
* Add satisfaction75 revision 1

* Update manufacturer

* Add tester layout and update rev1 comments

* Add ifdef guards for OLED for tester

* Add oled disabling rules

* Update to save backlight settings and setup for VIA custom config

* Add new VIA values to satisfaction75

* Safety guard in clock set mode

* Fix mistaken doc edit

* Address PR comments

* bring the default back to pass travis CI

* Address further PR comments
2019-03-11 20:47:50 -07:00
Andrew KannanandMechMerlin 6b4549da8c Add Satisfaction75 to QMK, Enable EEPROM on stm32f072 (#5094)
* Add stm32f072 base ck4x4 to handwired

* add prints

* Save these tries

* Save changes again

* Working hadron oled

* OLEd working but ws2812b still iffy:

* save another try

* Encoder feature + OLED

* RTC code

* Implement clock setting mode

* Whitespace

* Encoder hooked up to working LED PWM code

* Add missing files

* eeprom changes

* Save changes

* Move i2c master

* Move satisfaction75 under cannonkeys

* Set proper default folder

* Revert some core changes

* Undo paved iris changes

* Reorganize code for maintainability and prep for new features

* Add starting code for clock OLED mode

* Clock set mode finished

* Add custom encoder modes

* Actually add VIA keymap

* Gate to only 072

* fix gate for only 072

* Update header guards and includes

* Update i2c selection strategy

* Update board.c to handle software reset to DFU
2019-02-13 08:03:26 -08:00
Andrew KannanandDrashna Jaelre 7186d1581a Moving cannonkeys boards to one place, eeprom fix (#4999)
* Move boards to cannonkeys and share resources

* Share common files between cannonkey boards

* Fix ortho60 keymap

* update LED numbers

* Add RGB keys to Ortho60 and Ortho48

* Add Backlight control to default layout Ortho60 and 48

* Remove unnecessary ws2812.c SRC from rules.mk
2019-01-29 20:04:20 -08:00
Andrew KannanandDrashna Jaelre 0f507f0169 Practice60 RGB and PWM Backlight (#4929)
* Update Practice60 to enable RGB via SPI DMA and use PWM backlight breathing

* Correct stm32f103c8t6 flash size in eeprom definition

* Remove unused files and improve ifdef checks

* Update quantum/rgblight.c

Co-Authored-By: awkannan <andrew.kannan@klaviyo.com>

* Update quantum/rgblight.c

Co-Authored-By: awkannan <andrew.kannan@klaviyo.com>

* EEPROM implementation fix and updated p60 code

* Update define

* Remove dead code

* Update keymap to remove test key

* Update keymap again
2019-01-28 16:40:02 -08:00
Andrew KannanandDrashna Jaelre 20e134e681 Keyboard: Adding ortho60 to handwired (#4672)
* Adding ortho60 to handwired

* update to use LAYOUT_ortho_5x12

* Address PR comments about layout macros

* Add default layout to info.json for configurator

* Hack to xyverz layout until RGB branch is merged

* Fix undef RGBDIPIN in xyverz 12x5 layout

* Revert change to xvyerz's layout

* Fix typo

* Fix order

* Revert xyverz rules.mk
2018-12-18 08:26:43 -08:00
Andrew KannanandDrashna Jaelre 709bf386f4 Update Practice60 to use MT feature and revise system ticks (#4413)
* Update Practice60 to use MT feature and revise system tics

* Increase system tick frequency

10,000 instead of 10,000
2018-11-12 22:03:48 -08:00
Andrew KannanandDrashna Jaelre e653cc198e The "Practice60" Board, Blue Pill powered (#4407)
* Starting point for blue pill based practice60

* Changes

* add

* try raw bin no botloader

* swap back to bootloader version

* edit

* Remove debug LED flash

* Disable JTAG to open up B3 and B4

* Add led backlight support (no breathing yet)

* Update matrix for correctness

* RGB Underglow working in a very simple state

* not as bright

* Move to handwired

* revert ChibiOS_Test changes

* Changes based on PR comments

* Address PR comments v2

* Move files
2018-11-12 16:31:22 -08:00
Andrew KannanandDrashna Jaelre 45a4a0a7fc Keyboard: Adding initial luddite keyboard framework (#4029)
* Adding initial luddite keyboard framework

* Use pragma and update readme

* Remove duplicate macro definitions
2018-10-01 09:25:16 -07:00