fauxpark
7797070b37
Merge remote-tracking branch 'upstream/master' into develop
2020-12-18 02:15:28 +11:00
Ryan
6ea4b06f9f
Run cformat and dos2unix manually ( #11235 )
2020-12-17 14:06:30 +00:00
QMK Bot
973057cfe4
Merge remote-tracking branch 'origin/master' into develop
2020-12-17 09:51:19 +00:00
maikong
d9dcb716bf
[Keyboard] add MT64RGB ( #10865 )
...
* Create mt64
* Create mt84rgb
* Delete mt64
* Add files via upload
* Create MK84RGB
* gx84
* add new keyboard
* new keyboard
* Delete MK84RGB
* Delete config.h
* Delete mt84.c
* Delete mt84.h
* Delete mt84rgb
* Delete rules.mk
* add info json
* Add files via upload
* Delete config.h
* Delete rules.mk
* Delete keymap.c
* Delete keymap.c
* Delete info.json
* Delete mt64rgb.c
* Delete mt64rgb.h
* Delete rules.mk
* add keyboard
* Delete config.h
* Delete info.json
* Delete mt64rgb.c
* Delete mt64rgb.h
* Delete rules.mk
* Delete rules.mk
* Delete keymap.c
* Delete keymap.c
* Delete config.h
* Delete mt84.c
* Delete mt84.h
* Delete rules.mk
* Delete rules.mk
* Delete keymap.c
* Delete keymap.c
* Delete info.json
* Add files via upload
* Delete keymap.c
* Add files via upload
* Delete keymap.c
* Add files via upload
* Delete rules.mk
* Add files via upload
* Delete config.h
* Add files via upload
* Update config.h
* Update keymap.c
* Update keymap.c
* Update and rename keyboards/mt64rgb/keymaps/default/keymap.c to 键盘/mt64rgb/按键图/默认/keymap.c
* Update mt64rgb.h
* Update mt64rgb.c
* Update and rename keyboards/mt64rgb/rules.mk to 键盘/mt64rgb/rules.mk
* Update config.h
* Update rules.mk
* Update readme.md
* Update keymap.c
* Create rules.mk
* Update keymap.c
* Create keymap.c
* Delete keymap.c
* Update keymap.c
* Update keymap.c
* Update mt64rgb.h
* Delete rules.mk
* Update readme.md
* Update rules.mk
* Update readme.md
* Update info.json
* Update keymap.c
* Update mt64rgb.c
* Update config.h
* Update keymap.c
* Update readme.md
* Update rules.mk
* Update keymap.c
* Update config.h
* Update readme.md
* Update rules.mk
* Update readme.md
* Update config.h
2020-12-17 01:50:42 -08:00
QMK Bot
e58f69ea6a
Merge remote-tracking branch 'origin/master' into develop
2020-12-17 06:47:47 +00:00
hekekee
8346151fe0
[Keymap] ISO layout for KBD67 rev 2.0 ( #11136 )
2020-12-16 22:47:12 -08:00
QMK Bot
1bd9570ece
Merge remote-tracking branch 'origin/master' into develop
2020-12-17 06:45:50 +00:00
Liviturtle
dc4c80eef4
[Keyboard] add Labyrinth75 ( #11135 )
...
* added Labyrinth75
* changed to lowercase inline with the PR checklist
* added a correctly formatted image to readme.md
* fixed imgur link
* fixed info.json
* Update keyboards/labyrinth75/keymaps/default/keymap.c
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com >
* Update keyboards/labyrinth75/labyrinth75.h
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com >
* remove superfluous backslashes
* Update keyboards/labyrinth75/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com >
Co-authored-by: Drashna Jaelre <drashna@live.com >
2020-12-16 22:45:21 -08:00
QMK Bot
398f67290c
Merge remote-tracking branch 'origin/master' into develop
2020-12-17 06:44:20 +00:00
r-pufky
c4aae0e93b
[Keymap] Update based on massdrop/ctrl core changes n( #11134 )
2020-12-16 22:43:49 -08:00
QMK Bot
ddc27c2935
Merge remote-tracking branch 'origin/master' into develop
2020-12-17 05:56:48 +00:00
haierwangwei2005
49b6c5fd83
[Keyboard] Update config for 10 ble oled usbhub pad ( #11066 )
2020-12-16 21:56:17 -08:00
QMK Bot
41bf5505eb
Merge remote-tracking branch 'origin/master' into develop
2020-12-17 05:45:49 +00:00
smssmssms
7938921f9e
[Keyboard] Add POS78 keyboard ( #11024 )
...
* Add pos78 keyboard
* tidy up links
* Added missing commas
The missing commas were causing a compile error (Travis CI, #41934 failed).
* Added trailing commas
On lines 10-14, just missed last line (15).
* Travis CI errors
Trying to correct errors from Travis CI #41951 failed
* Corrected(?) TG(_FN) from Travis CI failure
* Revert readme.md to original format
Fauxpark
Co-authored-by: Ryan <fauxpark@gmail.com >
* Remove trailing \ from keymap.c
Fauxpark
Co-authored-by: Ryan <fauxpark@gmail.com >
* Change Vendor and Product ID
How do I update the Product ID search tool if 0x7878 is used/good?
* Add LAYOUT_ortho_6x13 Update keyboards/pos78/pos78.h
Co-authored-by: Drashna Jaelre <drashna@live.com >
* I bow to drashna's superior knowledge. Update keyboards/pos78/info.json
Co-authored-by: Drashna Jaelre <drashna@live.com >
* I bow to drashna's superior knowledge. Update keyboards/pos78/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com >
* I bow to drashna's superior knowledge. Update keyboards/pos78/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Added pic
* Add picture properly. Update keyboards/pos78/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com >
* Remove Bootmagic_enable (fauxpark)
Co-authored-by: Ryan <fauxpark@gmail.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
Co-authored-by: Drashna Jaelre <drashna@live.com >
2020-12-16 21:45:11 -08:00
QMK Bot
4352416d77
Merge remote-tracking branch 'origin/master' into develop
2020-12-17 05:28:22 +00:00
melonbred
58107ebedf
[Keyboard] Add program_yoink ( #10963 )
...
* Add new keyboard: program_yoink
* Updated rules.mk
* Updated split_space keymap
Fixed split_space keymap and now builds with no errors.
* Update keyboards/program_yoink/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/program_yoink/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/program_yoink/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/program_yoink/program_yoink.h
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/program_yoink/program_yoink.h
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/program_yoink/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/program_yoink/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/program_yoink/keymaps/split_bar/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/program_yoink/keymaps/split_bar/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/program_yoink/keymaps/split_bar/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/program_yoink/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update readme.md
* Apply suggestions from code review
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Apply suggestions from code review
Co-authored-by: Joel Challis <git@zvecr.com >
* Update keyboards/program_yoink/readme.md
per code review
* Apply suggestions from code review
* Update keyboards/program_yoink/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com >
* Update keyboards/program_yoink/config.h
Co-authored-by: Joel Challis <git@zvecr.com >
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Joel Challis <git@zvecr.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
2020-12-16 21:27:47 -08:00
QMK Bot
cb3dff5c3f
Merge remote-tracking branch 'origin/master' into develop
2020-12-17 05:26:37 +00:00
Álvaro A. Volpato
d82ab56a14
[Keyboard] Box75 ( #10949 )
...
* Initial BOX75 PCB v1.0.6 PCB support
* New prototype firmware
* Correct column pin assignment
* Update README
* Update keyboards/box75/config.h
Remove USB description
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/box75/rules.mk
Remove comment lines from BLUETOOTH_ENABLE and AUDIO_ENABLE
Co-authored-by: Ryan <fauxpark@gmail.com >
* Add VIA support
* Remove KC_NO define and use traditional one
* Update keyboards/box75/keymaps/default/keymap.c
Move KC_HOME location on keymap.c
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com >
* Update keyboards/box75/box75.h
Move HOME key location on keymap.c
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com >
* Changed F13 to print screen in default VIA firmware
Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com >
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com >
2020-12-16 21:26:03 -08:00
QMK Bot
4631e4ef8e
Merge remote-tracking branch 'origin/master' into develop
2020-12-17 05:25:34 +00:00
Álvaro A. Volpato
14024fabeb
[Keyboard] Iron180 ( #10948 )
...
* Initial CK60i support
* Initial Iron180 support
* Add PWM support
* Feedback from PCB protos
* Update README
* Remove CK60i references
* Remove KC_NO ____ definition and replaced with predefined
* Remove description field in USD descriptors
* Shorten bluetooth enable and audio output comments on rules.mk
* Initial VIA support
Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com >
2020-12-16 21:24:59 -08:00
QMK Bot
45fa5416ab
Merge remote-tracking branch 'origin/master' into develop
2020-12-17 05:22:14 +00:00
Álvaro A. Volpato
d60031b321
[Keyboard] Technika ( #10946 )
...
* Initial technika support
* Updated README
* Update keyboards/technika/config.h
Remove DESCRIPTION from usb desciptor fields
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/technika/rules.mk
Remove words from comments in rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com >
* Remove old KC_NO definitions and used default one
* Use defines for num, caps and scroll lock LED pins
* Fix underscore KC_NO substitution in keymap
Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com >
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
2020-12-16 21:21:37 -08:00
QMK Bot
4f431e8a90
Merge remote-tracking branch 'origin/master' into develop
2020-12-16 21:03:23 +00:00
Alabahuy
11669bb45b
[Keyboard] Add rart/rart4x4 with VIA support ( #11095 )
...
* Create config.h
* Create info.json
* Create rart4x4.c
* Create rart4x4.h
* Create readme.md
* Create rules.mk
* Create keymap.c
* Create keymap.c
* Rename keyboards/rart/rart4x4/default/keymap.c to keyboards/rart/rart4x4/keymaps/default/keymap.c
* Rename keyboards/rart/rart4x4/via/keymap.c to keyboards/rart/rart4x4/keymaps/via/keymap.c
* Create rules.mk
* Update info.json
* Update keymap.c
* Update rart4x4.h
* Update rules.mk
2020-12-16 13:02:47 -08:00
QMK Bot
13b31938ce
Merge remote-tracking branch 'origin/master' into develop
2020-12-16 17:48:32 +00:00
ridingqwerty
3295ac90ee
New keyboard: wsk/alpha9 ( #10430 )
...
* adding alpha variants
* adding cajal layouts
* adding V2 PCB support
adding additional layouts for new PCB version, and correecting incorrect image in info file
* Cleanup master -- remove alpha9
* Cleanup master -- remove g4m3ralpha
* Cleanup master -- remove cajal & sl40
* Master cleanup -- re-add sl40
* Master cleanup -- correct SL40 image
* Add keyboard: wsk/alpha9
* Cleaned up default keymap
* Removed misleading keymap README
* Slight tweak to default keymap.c
* Added license attribution to .{c,h} files
* Update keyboards/wsk/alpha9/config.h
Co-authored-by: Joel Challis <git@zvecr.com >
* Update keyboards/wsk/alpha9/alpha9.c
Co-authored-by: Joel Challis <git@zvecr.com >
* Update keyboards/wsk/alpha9/rules.mk
Co-authored-by: Joel Challis <git@zvecr.com >
* Update keyboards/wsk/alpha9/keymaps/default/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com >
* Update keyboards/wsk/alpha9/config.h
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com >
* Update keyboards/wsk/alpha9/info.json
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com >
* Update keyboards/wsk/alpha9/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/wsk/alpha9/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com >
* Update keyboards/wsk/alpha9/alpha9.c
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/wsk/alpha9/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: worldspawn00 <mcmancuso@gmail.com >
Co-authored-by: Joel Challis <git@zvecr.com >
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com >
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
2020-12-16 12:47:56 -05:00
QMK Bot
a5dd5bfd26
Merge remote-tracking branch 'origin/master' into develop
2020-12-16 17:37:30 +00:00
cBachoo
0d42d7b87b
Added Split Backspace Support for the Nemui ( #11131 )
...
* added nemui layout
* via support working
* added license headers for c and h files
* Update keyboards/nemui/keymaps/via/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/nemui/nemui.c
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Update keyboards/nemui/config.h
Co-authored-by: Ryan <fauxpark@gmail.com >
* Update keyboards/nemui/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com >
* Update keyboards/nemui/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com >
* removed nemui.json as it was supposed to only be in via repo
* Update keyboards/nemui/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com >
* Update keyboards/nemui/info.json
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com >
* Update keyboards/nemui/info.json
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com >
* Update keyboards/nemui/keymaps/via/keymap.c
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com >
* Update keyboards/nemui/keymaps/via/keymap.c
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com >
* added split backspace support for the nemui
* need to also update the qmk keymap
* fixed info.json to have the new keys
* vusb changes shouldn't have happened
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com >
2020-12-16 12:36:57 -05:00
QMK Bot
2e0f2025bd
Merge remote-tracking branch 'origin/master' into develop
2020-12-16 03:27:52 +00:00
Ryan
9366ed7282
Normalise include statements in keyboard code ( #11185 )
2020-12-16 14:27:23 +11:00
QMK Bot
55f681a723
Merge remote-tracking branch 'origin/master' into develop
2020-12-15 17:27:06 +00:00
Ryan
3925ff5342
gh60/satan: fix indicator LED define ( #11216 )
2020-12-15 17:26:18 +00:00
QMK Bot
c1b8b811ed
Merge remote-tracking branch 'origin/master' into develop
2020-12-15 11:14:52 +00:00
MakotoKurauchi
0831a3181a
[Keymap] Helix default keymap oled update ( #11152 )
...
* update keyboards/helix/rev2/local_features.mk - Improved parsing of the `HELIX =` option
* add 'is_mac_mode()' into keyboards/helix/rev2/rev2.c
* update helix/rev2/keymaps/default/keymap.c: use rgblight query functions
* Makes the OLED driver used by the helix:default keymap switchable.
* use TOP/drivers/oled/oled_driver.c
`make helix:default`
or
`make OLED_SELECT=core helix:default`
* use helix/local_drivers/ssd1306.c
`make OLED_SELECT=local helix:default`
* Separated the OLED related code from keymap.c and moved it to oled_display.c.
* Change the 'led_test' keymap to follow the changes in the 'default' keymap.
* update helix/rev2/keymaps/default/oled_display.c
* add '#define OLED_UPDATE_INTERVAL 50' into keyboards/helix/rev2/config.h
* Support for OLED_UPDATE_INTERVAL, even for older types of OLED tasks
* add readme.md for helix/rev2
* Apply drashna's suggestions to rev2.c.
* Apply drashna's suggestions to rev3_4rows.c, rev3_5rows.c.
Co-authored-by: mtei <2170248+mtei@users.noreply.github.com >
2020-12-15 20:14:14 +09:00
QMK Bot
9a04739b98
Merge remote-tracking branch 'origin/master' into develop
2020-12-14 22:27:09 +00:00
labahuy
ac8cddda22
[Keyboard] rart/rart45 ( #11096 )
...
* Create config.h
* Create info.json
* Create rart45.c
* Create rart45.h
* Create readme.md
* Create rules.mk
* Create keymap.c
* Create keymap.c
* Create rules.mk
* Update config.h
* Update rart45.c
* Update rart45.h
* Update rules.mk
* Update readme.md
* Update info.json
2020-12-14 14:26:30 -08:00
QMK Bot
25a1cb5a15
Merge remote-tracking branch 'origin/master' into develop
2020-12-13 18:51:35 +00:00
Xelus22
70f40339c2
Add i2c 24LC64 eeprom ( #11200 )
...
* add 24LC64 eeprom
* docs update
* Update docs/eeprom_driver.md
Co-authored-by: Joel Challis <git@zvecr.com >
Co-authored-by: Joel Challis <git@zvecr.com >
2020-12-14 05:50:50 +11:00
QMK Bot
6873c4cf91
Merge remote-tracking branch 'origin/master' into develop
2020-12-11 13:49:45 +00:00
Joel Challis
4b03b6f7f4
Nightingale Studios Hailey production fixes ( #11180 )
2020-12-11 13:49:31 +00:00
QMK Bot
a023484d64
Merge remote-tracking branch 'origin/master' into develop
2020-12-11 12:50:39 +00:00
David Heck
b185816717
Add XD75am as supported in XD75 readme ( #11170 )
2020-12-11 23:50:05 +11:00
QMK Bot
15373c8367
Merge remote-tracking branch 'origin/master' into develop
2020-12-10 14:47:20 +00:00
ojthetiny
82bb47a2f1
add Via keymap for beatervan ( #11159 )
...
* add via keymap for beatervan
* fixed error in rules.mk
2020-12-10 09:46:46 -05:00
QMK Bot
f743ff2256
Merge remote-tracking branch 'origin/master' into develop
2020-12-10 14:31:52 +00:00
ojthetiny
9517d90e84
add VIA keymap for edc40 ( #11160 )
...
* add via keymap for edc40
* fix error in keymap
2020-12-10 09:31:12 -05:00
QMK Bot
b8b8a294d3
Merge remote-tracking branch 'origin/master' into develop
2020-12-10 02:08:06 +00:00
Ryan
79d992d1e7
Use progmem.h for claw44 glcdfont ( #11164 )
2020-12-10 13:07:08 +11:00
QMK Bot
5e04ed9f53
Merge remote-tracking branch 'origin/master' into develop
2020-12-09 17:29:35 +00:00
Xelus22
cd67074f72
[Keyboard] Valor FRL TKL update - EEPROM change ( #11163 )
...
* valor fix
* change eeprom
* fix up eeprom
2020-12-09 09:28:58 -08:00