Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master QMK into my copy of master #18

Merged
merged 172 commits into from
Apr 6, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
b1a8faf
[Docs] Japanese translation of docs/keycodes.md (#10192)
s-show Mar 4, 2021
4d41645
Dubba175 (#12077)
drhigsby Mar 4, 2021
7639b5a
[Keymap] josjoha keymap for TheVan Keyboards' Minivan (#8066)
josjoha Mar 4, 2021
e25f052
Fixed the ortho60 and ortho48 matrix layout after testing (#12106)
nblyumberg Mar 4, 2021
2cb0b41
update correct layout name (#12096)
bstiq Mar 4, 2021
d7aa245
dumbpad refactor - adding support for various PCB revisions (#9259)
Mar 5, 2021
54f7708
[Keyboard] NK65 rev 1.4 (#11991)
yiancar Mar 5, 2021
aadea5a
[Keyboard] Monstargear XO87 Solderable support (#11716)
datafx Mar 5, 2021
73b8f85
[Keyboard] Lagrange handwired keyboard (#11374)
dpapavas Mar 5, 2021
52d8cbf
[Keymap] Add 60_ansi_arrow_split_bs_7u_spc layout & keymap (#11329)
mrsendyyk Mar 5, 2021
07fce7b
[Keyboard] add Boston keyboard (#11273)
Mar 5, 2021
09dfc08
add OLED_DRIVER_ENABLE into show_options.mk (#12121)
mtei Mar 5, 2021
b16bfac
added 0xCB/1337 keyboard (#12089)
Conor-Burns Mar 5, 2021
23d6ca9
Remove a few more ifdefs from quantum_keycodes (#12129)
fauxpark Mar 6, 2021
9c94de0
Remove ifdefs for UC and X/XP too (#12131)
fauxpark Mar 6, 2021
86e28b4
Adding Zodiark Split keyboard (#11837)
Aleblazer Mar 6, 2021
788b185
[Keyboard] add Soup10 support (#11921)
Sadeeed Mar 6, 2021
9b85b1b
[Keyboard] bm68rgb (#12128)
peepeetee Mar 6, 2021
1cbf1c6
Enforce minimum versions for jsonschema and MILC (#12141)
skullydazed Mar 6, 2021
08e512a
upload api data to spaces
skullydazed Mar 7, 2021
01b8ef3
Remove stale references to "handwired/ferris"
pierrechevalier83 Mar 5, 2021
0763269
fix CI job: api-data->api_data
skullydazed Mar 7, 2021
8556068
Require `BOOTLOADER = qmk-dfu` for `:bootloader` target (#12136)
fauxpark Mar 7, 2021
86e6be3
minor change to trigger api update
skullydazed Mar 7, 2021
75fd6bd
[Keyboard] Capsunlocked CU80 - added variant's for RGB matrix support…
maz0r Mar 7, 2021
2aa38f5
[Keymap] add crkbd/keymaps/armand1m (#12098)
armand1m Mar 7, 2021
6d8d207
improve detection of community layout support
skullydazed Mar 8, 2021
4f5e0dd
Add BFO-9000 info.json (#12179)
nooges Mar 9, 2021
aed8bac
Fix typo in `get_git_version()` (#12182)
fauxpark Mar 9, 2021
9089244
Add VIA support to doodboard/duckboard_r2 (#12028)
somepin Mar 10, 2021
790f945
Refactor to use led config - Part 6 (#12115)
zvecr Mar 10, 2021
0ad7833
[Keymap] arkag Userspace updated (#12183)
arkag Mar 11, 2021
ea2a7c5
ChibiOS conf upgrade for boston (#12170)
tzarc Mar 12, 2021
88dce24
Remove hex_to_keycode and move tap_random_base64 to send_string.c (#1…
fauxpark Mar 12, 2021
63f9e7e
Enable default features on VIA keymap for Lily58 (#12185)
filterpaper Mar 12, 2021
b8ad5f4
Document LED physical location index for Planck and Preonic (#12147)
filterpaper Mar 12, 2021
5d7ad69
[Bugs] Fix VIA Compiles (#12186)
Xelus22 Mar 12, 2021
225bff2
fix info.json layout name for boardsource/5x12 (#12145)
godders Mar 12, 2021
b96c18c
Hand 88 (#11963)
yiancar Mar 12, 2021
aa73411
Update RGB matrix effects documentation (#12181)
peepeetee Mar 13, 2021
7b7689d
[Keymap] miles2go userspace update, add functions for babblepaste li…
milestogo Mar 14, 2021
45e6bb7
Add Cassette42 (#10562)
monksoffunk Mar 14, 2021
739925c
Add info.json for RGBKB Pan (#12218)
fauxpark Mar 14, 2021
b44bffe
[Keymap] Add yhaliaw keymap for Planck/Rev6.1. (#11318)
yhaliaw Mar 14, 2021
9e1d04f
[Keyboard] Added Adellein Keyboard/PCB (#11547)
DeskDaily Mar 14, 2021
0779c34
Fix keycode mappings for via and ensure they don't change within prot…
xyzz Mar 15, 2021
a18e130
Format code according to conventions (#12244)
github-actions[bot] Mar 15, 2021
2e50b34
Add missing info.json files for keyboards (#12239)
noroadsleft Mar 15, 2021
52b7ebd
M10-A refactor (#12242)
noroadsleft Mar 15, 2021
926389f
Keyboard/grandiceps (#11933)
vattern Mar 15, 2021
469b4b2
Fixes for recent info.json files (#12248)
noroadsleft Mar 15, 2021
cd8497b
add support for Noah AVR PCB (#11563)
kb-elmo Mar 15, 2021
d99806c
Pizza Keyboards Pizza65 addition (#11604)
mm0nte Mar 15, 2021
f75420c
box75: fix key positioning in info.json (#12256)
noroadsleft Mar 16, 2021
e941ae3
[Keyboard] Add YMDK NP24 (ATmega32U4 with 6 RGB LEDs) (#12120)
nomis Mar 17, 2021
554b736
[Keyboard] Added Roses Lite Support (#12173)
Reason0x6 Mar 17, 2021
6af387e
[Keymap] stanrc85 keymap updates (#12184)
stanrc85 Mar 17, 2021
3c4972a
[Keyboard] Fix issue with process_record_kb in Torn (#12189)
ky1ejs Mar 17, 2021
57de02c
[Keyboard] fix bm68rgb default keymap (#12199)
peepeetee Mar 17, 2021
4e8a218
[Keymap] Mojito - removed layer macros (#12201)
Mojitas Mar 17, 2021
e527b37
TKC M0lly refactor (#12227)
fauxpark Mar 17, 2021
563be8c
Add bootmagic support for hub16 and hub20 (#12257)
peepeetee Mar 17, 2021
314ef9d
Pimentoso Paddino02 clean-up (#12263)
noroadsleft Mar 17, 2021
ffc4380
[Keyboard] Add KMAC VIA keymap (#12224)
kaylanm Mar 17, 2021
90f95de
[Keyboard] add via keymap to afternoonlabs breeze keyboard (#12247)
devriesp Mar 17, 2021
163e9b0
[Keyboard] Add barleycorn smd keyboard (#12200)
matthewdias Mar 17, 2021
2376533
[Keyboard] Modification of ErgoArrows info.json (#11980)
Salicylic-acid3 Mar 17, 2021
5381943
[Keyboard] add oled and encoder function to lck75 (#11825)
lyso1 Mar 17, 2021
8a2d3a8
[Keyboard] Add support for ortho4exent (#11699)
tszaboo Mar 17, 2021
3bc7f46
[Keymap] Add userspace rverst (#12205)
rverst Mar 17, 2021
6e79767
[Keymap] jumper149 keymap for the dztech/dz65rgb (#12142)
jumper149 Mar 17, 2021
f490777
[Keyboard] Add handwired/bolek keyboard (#12234)
klausweiss Mar 17, 2021
cc84831
Adding Keyboard: GMMK Pro (#12030)
GloriousThrall Mar 17, 2021
9331c22
XT converter cleanup (#12264)
fauxpark Mar 18, 2021
9807225
[CI] Format code according to conventions (#12277)
github-actions[bot] Mar 18, 2021
ed44636
Aleblazer Zodiark touch-up (#12279)
noroadsleft Mar 18, 2021
c833b77
Fixed keymap names of Noah AVR (#12265)
kb-elmo Mar 18, 2021
a5576f9
[Keyboard] Add Pachi (#12132)
Xelus22 Mar 18, 2021
69eca63
`qmk doctor`: Don't run udev checks under WSL (#12231)
fauxpark Mar 18, 2021
8dfe37a
Sirius UniGo66 touch-up (#12280)
noroadsleft Mar 19, 2021
0ab88f5
[Keyboard] Vanana, Vaguette Lite, and Waaffle (#11441)
noclew Mar 20, 2021
217e3a5
Boston: correct LAYOUT macro data (#12282)
noroadsleft Mar 20, 2021
c5b0366
Fix Kira80 license headers (#12303)
kb-elmo Mar 21, 2021
e1a7027
use layout aliases when processing info.json (#12333)
skullydazed Mar 23, 2021
d4a8123
Update readme.md on quefrency (#12276)
cyanpencil Mar 23, 2021
be257b6
Add Sinc Rev. 2 (#12138)
nooges Mar 23, 2021
d395c81
Configurator fixes for handwired/concertina/64key (#12316)
veikman Mar 23, 2021
7b07ce3
Add UC-1 keypad (#11926)
duoshock Mar 24, 2021
7814950
Fix Uni660 linker errors (#12341)
fauxpark Mar 24, 2021
2882ee9
Configurator bugfix for GMMK Pro (#12353)
noroadsleft Mar 24, 2021
6edcbdc
[Keyboard] YMDK YM68 (#12352)
noroadsleft Mar 24, 2021
723d9af
Add info.json for handwired/datahand (#12320)
fauxpark Mar 24, 2021
299008b
Add support for qmk_configurator style aliases (#11954)
skullydazed Mar 24, 2021
b7870ae
Workaround for recent changes to mouse keycodes (#12367)
zvecr Mar 24, 2021
653ecf9
More Tap Dance docs improvements (#12358)
fauxpark Mar 24, 2021
97a7363
[Keyboard] Preserve signedness from opt_encoder_handler for scroll da…
sbuller Mar 25, 2021
54b80ec
[CI] Format code according to conventions (#12363)
github-actions[bot] Mar 25, 2021
1ed48c7
add valor_frl_tkl info.json (#12359)
Xelus22 Mar 25, 2021
e7cb7bc
Roses Lite layout macro touch-up (#12357)
noroadsleft Mar 25, 2021
c59fb1b
feat(keymaps): Changes to crkbd/keymaps/armand1m layout and README.md…
armand1m Mar 25, 2021
eae7343
Move `API_SYSEX_MAX_SIZE` out of `config_common.h` (#12302)
fauxpark Mar 25, 2021
a888057
Fix a small typo in cli_commands.md (#12379)
rcorre Mar 25, 2021
1bb6d8d
Fix USER_PRINT on avr/atsam (#12269)
zvecr Mar 25, 2021
8b39ae1
add equator (#12369)
swiftrax Mar 25, 2021
1fbee7c
(Re)Fixing K-type RGB lighting (#12084)
Andrew-Fahmy Mar 25, 2021
be771e5
Added wilba.tech WT60-H3 (#12354)
wilba Mar 25, 2021
038d911
Added wilba.tech WT65-G2 (#12360)
wilba Mar 25, 2021
a74846a
Added wilba.tech WT60-H2 (#12348)
wilba Mar 25, 2021
3e60997
Add a `qmk format-json` command that will format JSON files (#12372)
skullydazed Mar 25, 2021
1d706bd
handwired/bolek: correct key object order (#12356)
noroadsleft Mar 25, 2021
eac9ee8
Improve upon the 'Caveats' section of the Layers and Mod-Tap document…
purdeaandrei Mar 25, 2021
ef87259
update shell.nix (#12295)
andresilva Mar 25, 2021
cf74046
ISO Layouts fix (#12319)
mm0nte Mar 25, 2021
dd0a352
added twelvekey (#12281)
kb-elmo Mar 25, 2021
3fc710e
Add XT65 keyboard (#11998)
kopibeng Mar 25, 2021
95c74ae
add via support for bm68rgb (#12275)
peepeetee Mar 25, 2021
572395a
TKC GodSpeed75: add RGB LED support (#12278)
TerryMathews Mar 25, 2021
8e820cd
Fix handling multiples of the same MIDI note (fixes bug brought up in…
jakobkg Mar 25, 2021
6276f54
Add suspend wake functions for The Mark:65's RGB Matrix (#12245)
filterpaper Mar 25, 2021
c4d0501
Add Daisy, a macropad with dual rotary encoders + update Scarlet read…
ghostseven Mar 25, 2021
2cd684f
add massdrop/alt/hlmtre keymap, add .exe to gitignore (#12191)
hlmtre Mar 25, 2021
29c82cf
Add RGB Matrix suspend wake functions to BM40 (#12246)
filterpaper Mar 25, 2021
b5a12fa
[Keymap] ANAVI Macro Pad 2 add git keymap (#12212)
leon-anavi Mar 25, 2021
81c51ec
[Keymap] Update keyboards/helix/pico/keymaps/mtei/keymap.c (#12188)
mtei Mar 25, 2021
f3f444c
Add Nix Studio OXALYS80 Keyboard (#12118)
sendz Mar 25, 2021
a5ecd4e
Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same (…
takai Mar 25, 2021
b664db3
Removed unused RGBLED_TIMER_TOP and F_CPU macros from quantum/rgbligh…
mtei Mar 25, 2021
0eabb01
Minor improvements to BM68RGB (#12156)
filterpaper Mar 25, 2021
666623d
ADNS-5050 / Ploopy Nano / Ploopy Mini Trackballs (#11994)
ploopyco Mar 25, 2021
816f2f9
Fix Kinetic speed condition (#12139)
xnuk Mar 25, 2021
5c14427
fix permissive hold when both PERMISSIVE_HOLD_PER_KEY and TAPPING_TER…
purple-rw Mar 25, 2021
0a056cf
Format code according to conventions (#12380)
github-actions[bot] Mar 25, 2021
9f1608a
Add unison v04 keyboard (#11982)
jpskenn Mar 25, 2021
34205f5
Add new Keyboard: SENDYYeah Bevi (#12011)
sendz Mar 25, 2021
57475ca
Fix issues when manually shifting characters and Auto Shift (#12083)
drashna Mar 25, 2021
aa2b4a6
[docs] Add IO Warning to WSL section of Getting Started (#12384)
Nebrethar Mar 26, 2021
f028dbf
Minor typo in comments Colemak DM-MK -> DH-MK (#10721)
AvdN Mar 26, 2021
8af7200
Pull Request for babyV keyboard (#12112)
joedinkle Mar 26, 2021
a866fbf
handwired/rs60: use LAYOUT_ortho_5x12 directly (#12397)
noroadsleft Mar 27, 2021
5dc7951
add utf-8 encoding to the open() call (#12388)
skullydazed Mar 27, 2021
ae59a51
Added the 64_ansi (GK64) layout to DZ60 (#12378)
kb-elmo Mar 29, 2021
64551a8
Allow for clang-format up to v20. (#12407)
tzarc Mar 30, 2021
8a950a7
Format code according to conventions (#12437)
github-actions[bot] Mar 30, 2021
c5ddada
Remove leftover old implementations of the lily58 split code. (#12442)
tzarc Mar 31, 2021
ac0ba83
change BM68 RGB USB Device descriptor device name (#12418)
peepeetee Apr 1, 2021
12f3087
qmk doctor: Display macOS and Windows versions, and add WSL warning f…
fauxpark Apr 2, 2021
cd981ec
`qmk doctor`: Fix WSL /mnt check (#12466)
fauxpark Apr 2, 2021
43d74d7
[Keyboard] Add CherryB Studio Keyboards (#11475)
lunaticwhat Apr 2, 2021
6592f83
[Keymap] for Ibm m122 (#11704)
dsanchezseco Apr 2, 2021
619885b
[Keyboard] Add Lumberjack keyboard (#12124)
peej Apr 3, 2021
63445be
[Keyboard] Add FoldKB (#12255)
nooges Apr 3, 2021
0232941
[Keyboard] Added VIA support to dmqdesign/spin (#12300)
adamkraus6 Apr 3, 2021
caca894
[Keymap] remove kc layout from levinson jyh keymap (#12301)
yamad Apr 3, 2021
f0dc206
[Keyboard] Update sixkeyboard VID/PID (#12345)
dayofdoom Apr 3, 2021
70540a1
[Keyboard] Added RAMA WORKS KARA (#12346)
wilba Apr 3, 2021
4caeb64
[Keyboard] Added wilba.tech WT70-JB (#12347)
wilba Apr 3, 2021
6876263
[Keyboard] KBD67 Hotswap VIA Support (#12351)
mechmerlin Apr 3, 2021
8b98e67
[Keyboard] Add pkb65 keyboard (#12230)
chrisquocmai Apr 3, 2021
cd96377
[Keyboard] Add GON NerD TKL VIA keymap (#12309)
kaylanm Apr 3, 2021
8d3581a
[Keymap] Remove kc keymap from khord chocopad keymap (#12409)
khord Apr 3, 2021
79a87a9
[Keymap] Fixing userspace `rverst` (#12422)
rverst Apr 3, 2021
a7920ac
keymaps: fix kinesis default keymap progrm/reset keycode (#12429)
stapelberg Apr 3, 2021
59c8672
kingly_keys/ave: move RGBLight config to keyboard level (#12457)
noroadsleft Apr 3, 2021
4b9f557
[CI] Format code according to conventions (#12468)
github-actions[bot] Apr 3, 2021
7d33d1b
Added Epoch80 (#12307)
kb-elmo Apr 3, 2021
a3cd129
3 new LED effect animations (#9827)
TurtleHunter Apr 3, 2021
d91938c
[nix] Use niv and poetry2nix to more easily manage dependencies (#11181)
purcell Apr 3, 2021
41f649c
fix line endings
skullydazed Apr 3, 2021
4e2ab3a
Remove `wave` from requirements-dev.txt (#12387)
excitablesnowball Apr 3, 2021
60e1910
Add WSL specific logic for avrdude device detection (#12392)
zvecr Apr 3, 2021
49dc332
[Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows …
mtei Apr 3, 2021
e0614e4
Disarray ProductID change (#12440)
SneakboxKB Apr 4, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add Nix Studio OXALYS80 Keyboard (qmk#12118)
* Initial commit of OXALYS80 firmware

* Remove comments

* Add new return in info.json

* Fix pin output init for scroll lock indicator

* Update keyboards/nix_studio/oxalys80/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nix_studio/oxalys80/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nix_studio/oxalys80/oxalys80.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nix_studio/oxalys80/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nix_studio/oxalys80/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nix_studio/oxalys80/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nix_studio/oxalys80/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Delete keymaps config.h

* Update keyboards/nix_studio/oxalys80/config.h

Co-authored-by: Sendy Aditya Suryana <sendy.suryana@go-jek.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
  • Loading branch information
3 people committed Mar 25, 2021
commit f3f444c1df58f85c3720f98eeda3641bc8eddc59
80 changes: 80 additions & 0 deletions keyboards/nix_studio/oxalys80/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/* Copyright 2021 Nix Studio
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID 0x6E78
#define PRODUCT_ID 0x3830
#define DEVICE_VER 0x0001
#define MANUFACTURER Nix Studio
#define PRODUCT OXALYS80


/* key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 9

/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 }
#define UNUSED_PINS

/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

#define BACKLIGHT_PIN B7
// #define BACKLIGHT_BREATHING
#define BACKLIGHT_LEVELS 3

/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5

/* define if matrix has ghost (lacks anti-ghosting diodes) */
//#define MATRIX_HAS_GHOST

/* number of backlight levels */

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

#define RGB_DI_PIN B3
#ifdef RGB_DI_PIN
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 24
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 200
#define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
#endif

#define LED_CAPS_LOCK_PIN E6
#define LED_SCROLL_LOCK_PIN B2
#define LED_PIN_ON_STATE 0
Loading