fern/qmk-firmware
1
0
Fork 0
mirror of https://github.com/firewalkwithm3/qmk_firmware.git synced 2024-11-22 11:30:30 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
18427 commits 1 branch 0 tags 300 MiB
Commit graph

18427 commits

This branch
This branch
All branches
Author SHA1 Message Date
QMK Bot d0a3fc3067 Merge remote-tracking branch 'origin/master' into develop 2021-10-11 03:47:11 +00:00
Albert Y 5d7efc7183
[Keyboard] Add bootmagic lite keys to both halve of A.dux (#14731) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-10-10 20:46:45 -07:00
QMK Bot 9b975065d9 Merge remote-tracking branch 'origin/master' into develop 2021-10-11 03:31:28 +00:00
im a can what do you think lmao? ef7fa0fe91
[Keyboard] update lck75 keyboard layouts (#14687) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-10 20:30:55 -07:00
QMK Bot 09ca08b237 Merge remote-tracking branch 'origin/master' into develop 2021-10-11 02:56:59 +00:00
Shay Merrill ae73df00ec
[Keymap] orthodox keymap for shaymdev (#14660) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-10 19:56:27 -07:00
QMK Bot 5d4ae2a1de Merge remote-tracking branch 'origin/master' into develop 2021-10-11 01:39:24 +00:00
KnoblesseOblige 5414e61f01
[Keyboard] Add keebsforall/freebirdtkl (#14460) 2021-10-10 18:38:58 -07:00
QMK Bot 3d2bc8ef24 Merge remote-tracking branch 'origin/master' into develop 2021-10-11 01:38:06 +00:00
Jay Greco c75bf9daf4
[Keyboard] nullbitsco keyboards: common file cleanup (#14358) 2021-10-10 18:37:33 -07:00
QMK Bot 6c720a6538 Merge remote-tracking branch 'origin/master' into develop 2021-10-11 01:22:19 +00:00
Wolf Van Herreweghe 5c034c43ab
[Keyboard] Add firmware for the TS60 (#14157) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
 2021-10-10 18:21:49 -07:00
QMK Bot 9cd0e36dbc Merge remote-tracking branch 'origin/master' into develop 2021-10-11 00:25:18 +00:00
leonardusdipa c8d5988ba4
[Keyboad] Add VIA support for Atreus promicro (#13169) 2021-10-10 17:24:45 -07:00
Ryan b487e10753
Clean up LED/RGB Matrix driver config (#14760) 2021-10-10 16:57:49 -07:00
QMK Bot a7810db7ba Merge remote-tracking branch 'origin/master' into develop 2021-10-10 20:30:26 +00:00
Kyle McCreery fa1a59e7f8
Changing RGB default to on so it plays well with VIA's QMK lighting section and adding the B9 init workaround to obe.c so the I2C EEPROM will initialize correctly since we are using B9 for caps lock indicator. (#14677) 2021-10-10 21:30:00 +01:00
QMK Bot ce15168624 Merge remote-tracking branch 'origin/master' into develop 2021-10-10 19:19:38 +00:00
Sergey Vlasov 06124f9885
cannonkeys/satisfaction75: Add empty layers to the via keymap (#14782) 2021-10-11 06:19:08 +11:00
Sergey Vlasov 2d3bd7cfcf
Fix OLED timeout on satisfaction75 after migration from QWIIC (#14780) 
The custom OLED_OFF mode implemented on satisfaction75 is incompatible
with the OLED_TIMEOUT feature (the OLED_TIMEOUT code assumes that any
key or encoder action should turn the OLED display on, and does not
provide any way to disable that behavior).  To keep the OLED_OFF mode
functioning as before while still having a working OLED idle timeout, a
custom implementation of the OLED idle timeout code is added.
 2021-10-10 17:01:29 +01:00
QMK Bot 0ea72af8b7 Merge remote-tracking branch 'origin/master' into develop 2021-10-10 04:51:12 +00:00
Drashna Jaelre ee9da1fcf3
[Keyboard] Fix DZTECH duo_s default keymap (#14772) 2021-10-09 21:50:35 -07:00
QMK Bot 1bde510463 Merge remote-tracking branch 'origin/master' into develop 2021-10-09 23:56:53 +00:00
James Young a8a5d20464
Ein_60: add Configurator layout data (#14777) 2021-10-10 00:56:21 +01:00
Joel Challis f895e966b7
Fix OLED timeout on recent qwiic migrations (#14775) 2021-10-10 00:23:10 +01:00
Drashna Jael're ff85eb8ee5
Merge remote-tracking branch 'origin/master' into develop 2021-10-09 15:31:32 -07:00
Dao Tak Isaac 3c188d98a1
[Keyboard] Add cg108 keyboard and fix keymap Dosa40rgb (#14753) 
* Add cg108 keyboard and fix keymap Dosa40rgb

* Update keyboards/dtisaac/cg108/readme.md

* Update keyboards/dtisaac/dosa40rgb/rules.mk

* Update keyboards/dtisaac/cg108/info.json

* Update keyboards/dtisaac/cg108/keymaps/default/keymap.c

* Update keyboards/dtisaac/cg108/rules.mk

* Update keyboards/dtisaac/cg108/rules.mk
 2021-10-09 14:55:00 -07:00
QMK Bot 9a20bc1f8f Merge remote-tracking branch 'origin/master' into develop 2021-10-09 20:04:35 +00:00
shela f216c20fc7
Update Japanese document (#14766) 2021-10-09 21:04:00 +01:00
QMK Bot 713c32fa5e Merge remote-tracking branch 'origin/master' into develop 2021-10-09 20:03:20 +00:00
shela 5aca3f613c
Update Japanese document (#14767) 2021-10-09 21:03:17 +01:00
shela 969596bd67
Update Japanese document (#14769) 2021-10-09 21:02:55 +01:00
QMK Bot bdb19faafa Merge remote-tracking branch 'origin/master' into develop 2021-10-09 18:31:45 +00:00
Drashna Jaelre 82bf688e44
[Keyboard] Update Tractyl Manuform config for F411 (#14770) 2021-10-09 11:31:13 -07:00
Joel Challis dace4d5f0d
Remove QWIIC_DRIVERS (#14174) 2021-10-09 14:48:27 +01:00
Joel Challis 22cafb9a20
Migrate satisfaction75 away from QWIIC_DRIVERS (#14747) 
* stash

* refactor old draw

* refactor old draw - tidy

* refactor old draw - tidy

* refactor old draw - reorder for diffs

* refactor old draw - reorder for diffs
 2021-10-09 14:46:47 +01:00
Dasky 7b753f227a
Enable eeprom with F401xE ld (#14752) 2021-10-08 22:26:57 +01:00
QMK Bot 948023c70a Merge remote-tracking branch 'origin/master' into develop 2021-10-08 21:23:35 +00:00
Drashna Jaelre f90d8b35f2
[Keyboard] Fix IS31FL3741 driver flushin for Xelus pachi rgb (#14755) 2021-10-08 22:23:03 +01:00
Ryan db41a3426c
Improve Adafruit BLE configuration defines (#14749) 
* Improve Adafruit BLE configuration defines

* Formatting
 2021-10-08 16:15:20 +01:00
Joel Challis 00fd404433
Put back eeconfig_update_ functions (#14751) 2021-10-08 13:44:07 +01:00
QMK Bot 7c5233e097 Merge remote-tracking branch 'origin/master' into develop 2021-10-08 10:28:42 +00:00
s-show 7205b70e84
Translate keycodes us ansi shifted (#13820) 
* copy "keycodes_us_ansi_shifted.md" to docs/ja.

* Add japanese translation "docs/keycodes_us_ansi_shifted.md".

* Apply suggestions from code review

Co-authored-by: shela <shelaf@users.noreply.github.com>

* Update docs/ja/keycodes_us_ansi_shifted.md

Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>

Co-authored-by: shela <shelaf@users.noreply.github.com>
Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
 2021-10-08 19:28:00 +09:00
QMK Bot 76076a03f7 Merge remote-tracking branch 'origin/master' into develop 2021-10-08 04:13:19 +00:00
James Young d35a98ca24
dyz selka40 touch-up (#14748) 
* friendly-format info.json

* remove info.json rounding errors

* fix info.json layout macro reference

JSON data referenced `LAYOUT` instead of `LAYOUT_all`.

* correct info.json key sequence

* remove dead space from info.json layout data

* remove vertical offsets from info.json layout data

* horizontally align info.json layout data

* add matrix diagram to selka40.h

* add LAYOUT_2u_bs

* remove duplicated settings
 2021-10-07 21:12:46 -07:00
QMK Bot d00282b219 Merge remote-tracking branch 'origin/master' into develop 2021-10-08 00:27:09 +00:00
James Young 9d070e6a08
DYZ TKL touch-up (#14744) 
* friendly-format info.json

* add LAYOUT_all layout data

* add matrix diagram to dyz_tkl.h

* add LAYOUT_tkl_ansi

* add LAYOUT_tkl_ansi_f13

* add LAYOUT_tkl_iso

* add LAYOUT_tkl_iso_f13

* remove `ENCODER_ENABLE = no` from rules.mk

* remove redundant definitions from config.h

Data-driven compilation calculates `MATRIX_ROWS` and `MATRIX_COLS` from the info.json data, so defining them in config.h isn't necessary.

* add missing comma to info.json per fauxpark
 2021-10-07 17:26:38 -07:00
Joel Challis e0d688d4c8
Move converter specific tmk_core protocols (#14743) 2021-10-07 23:14:26 +01:00
QMK Bot c39170b7ef Merge remote-tracking branch 'origin/master' into develop 2021-10-07 20:21:08 +00:00
James Young 51470dfae1
Dyz60 touch-up (#14742) 
* friendly-format info.json

* refactor keymaps

- update grid alignment
- use four-space indent
- use QMK short-form keycodes

* correct info.json layout data

Adds three missing positions, and corrects some key sizes.

* add matrix diagram to dyz60.h

* add LAYOUT_60_ansi

* add LAYOUT_60_iso

* add LAYOUT_60_ansi_split_bs_rshift

* add LAYOUT_60_iso_split_bs_rshift

* add readme

* Remove duplication between config.h and info.json

Duplicating settings between config.h and info.json leads to warnings when compiling.

Removes the duplicated settings from config.h.
 2021-10-07 21:20:34 +01:00