Commit graph

69 commits

Author SHA1 Message Date
morbetter
4f9e5d4cde
Adding VIA support for CannonKeys/Practice60 (#8169)
* Adding VIA support for 40percentclub/luddite

* Update config.h

* Update rules.mk

* Delete config.h

config.h was created to override the "default" of RGBLED_NUM 8
deleting the file to keep with defaults

* Removing block and comment as suggested

* Update PRODUCT_ID

Changing from:

 #define PRODUCT_ID      0x0A0C 

To:

 #define PRODUCT_ID      0x4C55 // "LU"

* Changing Vendor ID

Changing Vendor ID from:
#define VENDOR_ID       0xFEED
To:
#define VENDOR_ID       0x3430 // "40"

* Adding VIA support to cannonkeys/practice60

Adding VIA support to cannonkeys/practice60

 * updated VENDOR_ID to match other CannonKeys boards
 * changed PRODUCT_ID to be unique
 * added additional notes to readme.md
 * keymap.c and config.h for VIA support

* Update readme.md

* Update keyboards/cannonkeys/practice60/readme.md

* Update keyboards/cannonkeys/practice60/readme.md

* Update keyboards/cannonkeys/practice60/config.h

* Update rules.mk

* Update keyboards/cannonkeys/practice60/config.h

* Update config.h

* Rebased from Master

Rebased from Master
2020-06-29 12:16:14 -07:00
Ryan
3d45861216
Fix ordering for new info.jsons (#9567) 2020-06-28 12:51:48 +01:00
Ryan
c85e010d45
Add missing info.jsons for a few boards (#9549) 2020-06-28 11:56:50 +01:00
George Mao
fffee6ade1
Fixing Iron165 VIA Keymap (#9298)
* Fixing via issues

* Fixing whitespace issues on the keymap

* Fixed the default via layer 1 keymap, was a little weird before

* Removing redundant declarations in via/rules.mk
2020-06-11 00:12:53 +01:00
Joel Challis
423ce39f18
Merge pull request #8806 from awkannan/202004_obliterated75
Add Obliterated75 Keyboard
2020-04-24 21:39:41 +01:00
Andrew Kannan
643fc1d806
Update keyboards/cannonkeys/obliterated75/keymaps/default/keymap.c
Co-Authored-By: Ryan <fauxpark@gmail.com>
2020-04-21 12:03:42 -04:00
Andrew Kannan
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
Andrew Kannan
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 Kannan
7a0d145e27
Whitespace changes
Co-Authored-By: Ryan <fauxpark@gmail.com>
2020-04-15 12:35:24 -04:00
Ryan
e990863296
Miscellaneous stuff: remove clang-complete and autocomplete.sh, fix some rules.mk comments (#8784) 2020-04-15 02:03:49 -07:00
Andrew Kannan
4c0065dda7 Add new obliterated75 files 2020-04-15 00:04:03 -04:00
Andrew Kannan
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 Kannan
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
Joel Challis
50e85f91e8
Fix compile issues with devastatingtkl (#8765) 2020-04-12 14:53:30 +10:00
Andrew Kannan
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
Andrew Kannan
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
Andrew Kannan
0a643be39e
Update 072 based CannonKeys boards to rely on core QMK support (#8716)
* Swap CannonKeys 072 boards over to rely on core QMK backlight support

* Rename keymap

* Rename via_tsangan back to via
2020-04-07 14:01:11 +10:00
Joel Challis
6c8e205fc0
Remove keyboard level ws2812 spi drivers (#7694) 2020-04-06 21:31:34 +01:00
Joel Challis
7901006753
Refactor cannonkeys f103 boards to use core backlight (#8089)
* Refactor to use core backlight

* Remove custom implementation
2020-04-06 21:10:30 +01:00
Joel Challis
2392ddb76b
Enable memcore to fix malloc/rand crashes (#8695) 2020-04-05 22:15:40 +01:00
Ryan
bff56aa46c
Remove "ugly hack in usb_main.c" comments (#8296) 2020-03-02 23:56:46 +00:00
Andrew Kannan
c543ccf07c
Get the direction right on the S75 encoder (#8287) 2020-03-01 21:30:01 +00:00
Andrew Kannan
3dc061ac78
Make a fix to savage65 and tmov2 for via (#8286) 2020-03-02 07:16:43 +11:00
James Young
26eef35f07
2020 February 29 Breaking Changes Update (#8064) 2020-02-29 11:59:30 -08:00
Andrew Kannan
8d11359886
Update TMOv2 for new key (#7759)
* Update TMOv2 for new keymap

* Update based on PR changes
2020-02-21 17:22:58 +00:00
Andrew Kannan
67ee050a0e
S75 Encoder Fixes (#7758)
* S75 Encoder Fixes

* Flip encoder pins vs using setting
2020-02-21 21:25:17 +11:00
Joel Challis
014ad1d747
Fix RESET keycode on some STM32F072 keyboards (#8134)
* Add f072 board files with 'enter_bootloader_mode_if_requested' support

* rename default f072 board file to GENERIC_STM32_F072XB

* Remove board files

* Add bootloader def

* Update generic f072 board paths

* Revert wrong deletion
2020-02-13 19:39:22 +00:00
MechMerlin
a6b0a74d95
Add RESET key for default keymap in Satisfaction 75 (#8088) 2020-02-05 13:51:09 +11:00
Nick Brassel
4d06d2835c Move CORTEX_ENABLE_WFI_IDLE=TRUE to rules.mk files. 2020-01-28 23:45:42 +11:00
Joel Challis
7342c335d2
Refactor stm32duino f103 keyboards to use new central board config files (#7706)
* Create central board for bluepill

* Remove duplicate board files

* Refactor to use new central board config files

* Fix cannonkeys f103 boards
2020-01-27 22:39:30 +00:00
Joel Challis
50855593ff
Migrate common ld scripts to common location (#7887)
* Migrate common ld scripts to common location

* Remove duplicate ld scripts

* Update build to look at common ld location
2020-01-27 22:38:55 +00:00
Joel Challis
9a0245b778
Fix boards which were overriding backlight without setting custom (#7970) 2020-01-27 22:31:54 +00:00
zvecr
992656e753 Fix cannonkeys f103 boards 2020-01-26 23:35:57 +00:00
zvecr
ee86be9dca Refactor to use new central board config files 2020-01-26 23:35:57 +00:00
zvecr
98e5555705 Remove duplicate board files 2020-01-26 23:33:03 +00:00
Wilba
484a9b12bc Add VIA support for QMK backlight, QMK RGBLight (#7911)
* Add VIA support for QMK backlight, QMK RGBLight

* clang-format changes
2020-01-20 10:18:25 -08:00
Joel Challis
e34af631c2
Refactor f103,f072,f042 based keyboards to use new MCU selection defaults (#7705)
* refactor keyboards using ST_STM32F072B_DISCOVERY to use 'MCU = STM32F072'

* refactor keyboards using GENERIC_STM32_F042X6 to use 'MCU = STM32F042'

* refactor keyboards using GENERIC_STM32_F103 to use 'MCU = STM32F103'
2020-01-10 01:31:01 +00:00
bottilabo
2cd338cf7e Fix matrix_scan_user is not called at stm32 env(projectkb/alice etc..) which using cannonkeys/stm32f072 (#7821) 2020-01-09 21:21:58 +00:00
fauxpark
d3bd1d893b Ensure PROGMEM is present on default keymaps (#7836) 2020-01-09 10:19:24 +00:00
Wilba
320822d75b VIA Configurator Refactor (#7268)
* VIA Refactor

* Remove old code

* review changes

* review changes

* Fix cannonkeys/satisfaction75/prototype:via build

* Add via.h to quantum.h

* Move backlight init to after backlight config load

* Merge branch 'master' into via_refactor_pr

* Update user's rules.mk to new way of enabling VIA

* Added id_switch_matrix_state

* Review changes
2020-01-03 12:52:00 -08:00
Boy_314
853b99954e [Keymap] boy_314's satisfaction75 layout (#7638)
* added boy_314's satisfaction75 layout

* added readme

* updated NKRO toggle, removed unecessary code

* Update keyboards/cannonkeys/satisfaction75/keymaps/boy_314/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>
2019-12-15 23:27:10 -08:00
Yan-Fa Li
4b11c2b552 [Keyboard] instant60: Enable bootmagic lite to make eeprom reset easier (#7566) 2019-12-08 08:22:25 -08:00
Drashna Jaelre
e6b9980bd4 Remove keymap_config extern from default keymaps (#7399)
* Remove keymap_config extern from default keymaps

* Revert unicode

Apparently VSCode does not like unicode, I didn't actually edit these lines, so it must have been automatic... :(

Co-Authored-By: fauxpark <fauxpark@gmail.com>
2019-11-20 22:31:36 +00:00
Andrew Kannan
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
Yan-Fa Li
a096453259 [Keyboard] Fix matrix for Tsangan (#7159)
- 1st mod after space bar was wrong position
2019-10-28 16:26:59 -07:00
MechMerlin
531ff70e0d [Keyboard] Satisfaction75 Configurator support (info.json) (#6833)
* add configurator support for rev1 s75

* add configurator support for prototype

* Update keyboards/cannonkeys/satisfaction75/prototype/info.json

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

* Update keyboards/cannonkeys/satisfaction75/rev1/info.json

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

* Update keyboards/cannonkeys/satisfaction75/rev1/info.json

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

* Update keyboards/cannonkeys/satisfaction75/rev1/info.json

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

* Update keyboards/cannonkeys/satisfaction75/rev1/info.json

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

* Update keyboards/cannonkeys/satisfaction75/rev1/info.json

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

* fixup layouts

* Update keyboards/cannonkeys/satisfaction75/rev1/info.json

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

* Update keyboards/cannonkeys/satisfaction75/rev1/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
2019-10-09 11:03:33 -07:00
NoshBar
2c51d14223 [Keyboard] Cannon Keys Satisfaction75: Fix buffer sizes for sprintfs. (#6954)
sprintf always adds a NULL terminator at the end of the buffer it works on.
A few places made just enough space for the resulting string, but not the terminator.
So this just adds one to the buffer size to make room for it.
2019-10-07 14:35:28 -07:00
Andrew Kannan
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
Andrew Kannan
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
Jonathan Rascher
075495a792 [Keyboard] Support flashing Instant60 from command line (#6625) 2019-08-30 17:44:28 -07:00