Commit Graph

271 Commits

Author SHA1 Message Date
Drashna Jael're
acec40a11a Merge branch 'firmware20' into firmware21 2021-10-20 11:13:47 -07:00
Drashna Jael're
b34675555c Merge commit 'd9e077468ab3446cbd7306a453a73dad2c1403e8' into firmware_21 2021-10-11 20:36:47 -07:00
QMK Bot
2481e109a0 Merge remote-tracking branch 'origin/master' into develop 2021-08-23 22:06:37 +00:00
Olli Helenius
9472c4b8cb Fix US_RDQU keycode (#13464)
`US_RDQU` and `US_LDQU` were aliased to the same keycode. `US_RDQU`
should use the right bracket.
2021-08-24 08:06:04 +10:00
freqmod
705774f7bf Steno combinedkeys (#12538)
* Add support for steno keys that press adjacent keys simultaniously

* Add some docs for steno combined keys
2021-08-18 04:48:00 +10:00
Florian Didron
28d29f7df6 feat: adds latam < > macOS bindings 2021-08-16 08:36:36 +09:00
QMK Bot
8925199ae8 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 16:17:22 +00:00
Carl-Fredrik Arvidson
3486870ee4 Adds Swedish Mac ISO and ANSI keymaps (#13055)
* Adds Swedish Mac ISO and ANSI keymaps

* Replaces NBSP with space

* Adds missing keys

* Remove duplicates

* Remove duplicates

* Update quantum/keymap_extras/keymap_swedish_osx_iso.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_iso.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_iso.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_iso.h

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

* Change case and remove whitespace

* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_iso.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_iso.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_iso.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_iso.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_iso.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_iso.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h

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

* Fix uppercase

* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h

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

* Add specific files for Swedish Pro

* Update quantum/keymap_extras/keymap_swedish_osx_iso.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_iso.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h

Remove whitespace

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

* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h

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

* Update quantum/keymap_extras/keymap_swedish_pro_osx_ansi.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_iso.h

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

* Update quantum/keymap_extras/keymap_swedish_osx_iso.h

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 09:16:17 -07:00
Ryan
50d4dfd2e6 keymap_extras: Remove deprecated defines (#12949) 2021-07-06 09:05:11 +10:00
Ryan
dc3896e31c Cleanup junk chars, part 4 (#13345) 2021-07-01 16:41:51 +10:00
Drashna Jael're
acf2c323e2 Merge upstream QMK Firmware at '0.12.52~1' 2021-06-29 12:24:07 -07:00
Florian Didron
ec7a7beeed fix: cms Ω mapping 2021-06-23 16:26:39 +09:00
Florian Didron
97dd9e6acc fix: Latam contribution key codes 2021-04-21 16:31:30 +09:00
Florian Didron
d2cf9c1c36 fix: missing icelandic mappings 2021-04-21 10:13:35 +09:00
Florian Didron
fd09f4bc2f feat: adds Ω to the cms mappings 2021-04-21 09:08:32 +09:00
Florian Didron
36b79a0630 feat: adds spanish latam contribution 2021-04-08 17:06:41 +09:00
Florian Didron
fd9afdcf70 fix: french canadian } 2021-03-31 20:38:30 +09:00
Florian Didron
70b3b5cdab fix: a couple of french swiss mappings 2021-03-30 16:31:18 +09:00
Florian Didron
d6f37f0f74 feat: adds icelandic contribution 2021-03-25 19:30:28 +09:00
Florian Didron
a798f38e73 feat: adds french canadian contribution 2021-03-25 19:15:14 +09:00
Florian Didron
3d45f17e5a feat: adds ukranian user contribution 2021-03-25 18:49:55 +09:00
Florian Didron
f02a3af5c5 feat: swiss french oryx aliases 2021-02-11 18:05:25 +09:00
Ryan
f1a82690be keymap_fr_ch: undef CH_H (#11537) 2021-02-02 09:33:22 -08:00
Ryan
3635973fd5 Change include guards in quantum/ to pragma once (#11239) 2021-01-12 22:46:10 -08:00
Hedgestock
f304fa3ea2 Fixed french quotes on canadian multilingual (#11183) 2021-01-12 22:46:08 -08:00
Geoffrey BOTIN
aa41225a1e Fix typo causing redefined error in keymap_french_osx (#10962)
Co-authored-by: gbotin <geoffrey.botin@gmail.com>
2021-01-12 22:43:34 -08:00
Ryan
204f4c4ea3 Fix Belgian sendstring properly (#10444) 2021-01-12 22:43:29 -08:00
Drashna Jaelre
4db4a0c73f Fix Belgian sendstring file (#10443)
Specifically, the `BE_CIRC` is an alt-ed keycode, which means it 
doesn't fit into the 8 bit keycode range...  It should be `BE_SECT`,
as it is already alt-ed by the alt lut.

Confirmed that this change fixes compilation warnings and works 
correctly, on reddit. 
https://www.reddit.com/r/olkb/comments/iywin1/unsigned_conversion_from_int_to_unsigned_char/g6jvfgl/
2021-01-12 22:43:29 -08:00
QMK Bot
6155987d9f Merge remote-tracking branch 'origin/master' into develop 2021-01-13 04:53:32 +00:00
Ryan
09835033da keymap_fr_ch: undef CH_H (#11537) 2021-01-13 15:53:00 +11:00
Florian Didron
b129fa575b feat: adds portuguese OSX contributions 2021-01-11 09:08:29 +09:00
André Cruz
4a3cd96b12 Added mac variant of portuguese keymap (#326)
This keymap is very similar to the existing portuguese keymap, but
some symbols are moved around.
2021-01-11 08:26:40 +09:00
Joshua Diamond
e190872b82 Improved Language Specific Keycodes for US International and Extended Layouts (#11307)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-02 15:54:48 +11:00
André Cruz
ca8df55858 Added mac variant of portuguese keymap extras (#11260)
* Added mac variant of portuguese keymap

This keymap is very similar to the existing portuguese keymap, but
some symbols are moved around.

Apply suggestions from code review

Corrected whitespace and implemented some suggested changes.

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

Converted some spaces to nbsp

Added sendstring ISO version

* Apply suggestions from code review

Added suggestions from code review

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

* Replaced space with nbsp

* Corrected 2 chars in ascii_to_shift_lut

{ and } require shift

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-12-29 19:40:58 -08:00
Ryan
48f4768d33 Change include guards in quantum/ to pragma once (#11239) 2020-12-26 15:53:12 +11:00
Hedgestock
8ea7f4f45f Fixed french quotes on canadian multilingual (#11183) 2020-12-11 19:00:07 +00:00
Geoffrey BOTIN
2ffac90c99 Fix typo causing redefined error in keymap_french_osx (#10962)
Co-authored-by: gbotin <geoffrey.botin@gmail.com>
2020-11-17 09:27:09 +11:00
Ryan
7ed08a191f Add Estonian keymap (#8527) 2020-10-29 12:03:30 +09:00
Félix Sanz
168ce1a743 Update keymap_spanish_dvorak.h (#10213)
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-10-23 04:42:34 +11:00
Florian Didron
0435ba95ca fix: comment typo 2020-10-22 14:26:21 +09:00
Florian Didron
d529eb8c0d feat: adds kazakh keymaps 2020-10-22 14:03:41 +09:00
Ryan
6c78f80fa1 Partial fix for sendstring_french.h (#10623) 2020-10-13 03:17:11 +11:00
Florian Didron
4018c5daa6 feat: adds user locale contributions 2020-10-09 17:26:47 +09:00
Olivier Li
303fa4f58d Unflip < and > for canadian mutlilingual (#10222)
Co-authored-by: Olivier Li <olivierli@google.com>
2020-09-30 03:49:37 -07:00
Félix Sanz
cb14edb893 Fixed Spanish keymap extra ES_DIAE symbol (#10211)
* Fixed Spanish keymap extra ES_DIAE symbol

`ES_DIAE` should be `S(ES_ACUT)` not `S(ES_GRV)`

* Update quantum/keymap_extras/keymap_spanish.h

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-09-30 03:47:04 -07:00
David Kosorin
94e676d05b Fix Czech keycodes (#9987) 2020-09-30 03:20:48 -07:00
Ryan
b6f9ca3b09 Fix Belgian sendstring properly (#10444) 2020-09-26 14:14:34 +10:00
Drashna Jaelre
9570b1bbb4 Fix Belgian sendstring file (#10443)
Specifically, the `BE_CIRC` is an alt-ed keycode, which means it 
doesn't fit into the 8 bit keycode range...  It should be `BE_SECT`,
as it is already alt-ed by the alt lut.

Confirmed that this change fixes compilation warnings and works 
correctly, on reddit. 
https://www.reddit.com/r/olkb/comments/iywin1/unsigned_conversion_from_int_to_unsigned_char/g6jvfgl/
2020-09-26 05:34:38 +10:00
Olivier Li
9bca381b98 Unflip < and > for canadian mutlilingual (#10222)
Co-authored-by: Olivier Li <olivierli@google.com>
2020-09-06 09:51:38 +10:00
Félix Sanz
69804bb243 Fixed Spanish keymap extra ES_DIAE symbol (#10211)
* Fixed Spanish keymap extra ES_DIAE symbol

`ES_DIAE` should be `S(ES_ACUT)` not `S(ES_GRV)`

* Update quantum/keymap_extras/keymap_spanish.h

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-09-01 08:23:31 +10:00