6c720a6538
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 01:22:19 +00:00
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
9cd0e36dbc
Merge remote-tracking branch 'origin/master' into develop
2021-10-11 00:25:18 +00:00
c8d5988ba4
[Keyboad] Add VIA support for Atreus promicro ( #13169 )
2021-10-10 17:24:45 -07:00
b487e10753
Clean up LED/RGB Matrix driver config ( #14760 )
2021-10-10 16:57:49 -07:00
a7810db7ba
Merge remote-tracking branch 'origin/master' into develop
2021-10-10 20:30:26 +00:00
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
ce15168624
Merge remote-tracking branch 'origin/master' into develop
2021-10-10 19:19:38 +00:00
06124f9885
cannonkeys/satisfaction75: Add empty layers to the via keymap ( #14782 )
2021-10-11 06:19:08 +11:00
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
0ea72af8b7
Merge remote-tracking branch 'origin/master' into develop
2021-10-10 04:51:12 +00:00
ee9da1fcf3
[Keyboard] Fix DZTECH duo_s default keymap ( #14772 )
2021-10-09 21:50:35 -07:00
1bde510463
Merge remote-tracking branch 'origin/master' into develop
2021-10-09 23:56:53 +00:00
a8a5d20464
Ein_60: add Configurator layout data ( #14777 )
2021-10-10 00:56:21 +01:00
f895e966b7
Fix OLED timeout on recent qwiic migrations ( #14775 )
2021-10-10 00:23:10 +01:00
ff85eb8ee5
Merge remote-tracking branch 'origin/master' into develop
2021-10-09 15:31:32 -07:00
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
9a20bc1f8f
Merge remote-tracking branch 'origin/master' into develop
2021-10-09 20:04:35 +00:00
f216c20fc7
Update Japanese document ( #14766 )
2021-10-09 21:04:00 +01:00
713c32fa5e
Merge remote-tracking branch 'origin/master' into develop
2021-10-09 20:03:20 +00:00
5aca3f613c
Update Japanese document ( #14767 )
2021-10-09 21:03:17 +01:00
969596bd67
Update Japanese document ( #14769 )
2021-10-09 21:02:55 +01:00
bdb19faafa
Merge remote-tracking branch 'origin/master' into develop
2021-10-09 18:31:45 +00:00
82bf688e44
[Keyboard] Update Tractyl Manuform config for F411 ( #14770 )
2021-10-09 11:31:13 -07:00
dace4d5f0d
Remove QWIIC_DRIVERS ( #14174 )
2021-10-09 14:48:27 +01:00
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
7b753f227a
Enable eeprom with F401xE ld ( #14752 )
2021-10-08 22:26:57 +01:00
948023c70a
Merge remote-tracking branch 'origin/master' into develop
2021-10-08 21:23:35 +00:00
f90d8b35f2
[Keyboard] Fix IS31FL3741 driver flushin for Xelus pachi rgb ( #14755 )
2021-10-08 22:23:03 +01:00
db41a3426c
Improve Adafruit BLE configuration defines ( #14749 )
...
* Improve Adafruit BLE configuration defines
* Formatting
2021-10-08 16:15:20 +01:00
00fd404433
Put back eeconfig_update_ functions ( #14751 )
2021-10-08 13:44:07 +01:00
7c5233e097
Merge remote-tracking branch 'origin/master' into develop
2021-10-08 10:28:42 +00:00
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
76076a03f7
Merge remote-tracking branch 'origin/master' into develop
2021-10-08 04:13:19 +00:00
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
d00282b219
Merge remote-tracking branch 'origin/master' into develop
2021-10-08 00:27:09 +00:00
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
e0d688d4c8
Move converter specific tmk_core protocols ( #14743 )
2021-10-07 23:14:26 +01:00
c39170b7ef
Merge remote-tracking branch 'origin/master' into develop
2021-10-07 20:21:08 +00:00
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
8cc0f896ce
Merge remote-tracking branch 'origin/master' into develop
2021-10-07 20:04:00 +00:00
13f3e30e86
Fix link from feature_tap_dance.md to tapping term settings ( #14741 )
2021-10-07 21:03:21 +01:00
a8866a9dca
Merge remote-tracking branch 'origin/master' into develop
2021-10-07 17:52:12 +00:00
cbf1e0bab5
Dyz40 Configurator fixes ( #14739 )
...
* add matrix diagram to keyboard header file
* friendly-format info.json
* correct layout data
* add legends to info.json key labels
* add LAYOUT_split_space_split_bs
Rename the `LAYOUT` tree in info.json to `LAYOUT_split_space_split_bs`, and add a corresponding layout macro.
* add LAYOUT_all data to info.json
* add LAYOUT_7u_space
* add LAYOUT_7u_space_split_bs
* add LAYOUT_split_space
* convert tabs to spaces in dyz40.h
2021-10-07 10:51:38 -07:00
426eab92b0
Merge remote-tracking branch 'origin/master' into develop
2021-10-07 17:46:29 +00:00
12b9bedee5
update product id for selka40 ( #14629 )
2021-10-07 10:45:56 -07:00
0d72438ad6
Correct the Turkish F '?' keycode (TR_QUES) ( #14740 )
...
define TR_QUES S(TR_ASTR) // ? → define TR_QUES S(TR_SLSH) // ?
2021-10-07 15:01:50 +01:00
51665b1fff
Merge remote-tracking branch 'origin/master' into develop
2021-10-07 13:50:11 +00:00
63cb273d15
Enabled Bootmagic Lite ( #14573 )
...
* Enabled Bootmagic Lite
* Enabled Bootmagic Lite
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2021-10-07 14:49:16 +01:00
1c0347b8b8
Remove SERIAL_LINK feature ( #14727 )
...
* Remove SERIAL_LINK
* more stale paths in doxygen-todo
* Fix
* More refs
* Update testing docs
* Update doxygen-todo
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-07 12:32:05 +11:00
QMK Bot
Wolf Van Herreweghe
leonardusdipa
Ryan
Kyle McCreery
Sergey Vlasov
Drashna Jaelre
James Young
Joel Challis
Dao Tak Isaac
shela
Dasky
s-show
precondition
Bahrul Hidayat
jmcwilliams403