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.

Sign up for GitHub

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

Jump to bottom

[Keymap] Update to Drashna Keymaps #5594

Merged
merged 55 commits into from Apr 22, 2019
Merged

[Keymap] Update to Drashna Keymaps #5594

merged 55 commits into from Apr 22, 2019

Conversation

drashna
Copy link
Member

@drashna drashna commented Apr 9, 2019 •
edited

Description

Just a bunch of minor updates

Types of Changes

  • Keymap/layout/userspace (addition or update)

Checklist

  • My code follows the code style of this project.
  • I have read the CONTRIBUTING document.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@drashna drashna added the keymap label Apr 9, 2019
noroadsleft
noroadsleft approved these changes Apr 10, 2019
View reviewed changes
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@drashna drashna force-pushed the drashna_keymaps branch 8 times, most recently from acd5c9b to 3dc02e1 Compare April 16, 2019 02:15
noroadsleft
noroadsleft reviewed Apr 17, 2019
View reviewed changes
users/drashna/.gitignore
@@ -0,0 +1,3 @@
secrets.c
secrets.h
drashna_song_list.h
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👀

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're wondering.... it's a better way to manage the files I don't want git including, rather than using the annoying .git/info/exclude file.... and this allows me to maintain a local list of songs that may be copyrighted, and that we don't want in the repo.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I know what the file does. I was more wondering what songs you have in there that you aren't sharing with the rest of us.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably: Baby got back

@drashna drashna force-pushed the drashna_keymaps branch 4 times, most recently from e9be340 to eab8c85 Compare April 20, 2019 17:00
@drashna
Start to standardize macro timer
90f24d5
@drashna
Update Fractal layout
ba61a84 
Specifically, limit the RGB Lighting, since it's too many for the power, and only have the KITT annimation on the front
@drashna
Update Iris keymap to use I2C for transport
fec5494
@drashna
Remove TAP_CODE_DELAY from keyboard in favor of global setting
373ce44
@drashna
Remove Woodpad
41fd0a0 
Since it\'s no longer in my possession
mechmerlin
mechmerlin approved these changes Apr 22, 2019
View reviewed changes
Copy link
Contributor

@mechmerlin mechmerlin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oof

@mechmerlin mechmerlin merged commit a2cec05 into qmk:master Apr 22, 2019
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Apr 26, 2019
@Shinichi-Ohki
Merge branch 'master' of https://github.com/qmk/qmk_firmware
bc5db1c 
* 'master' of https://github.com/qmk/qmk_firmware: (99 commits)
  [Keyboard] Add a new keyboard ADKB96 (qmk#5685)
  test commit
  add RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS; to rgblight_update_dword()
  add RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS; to eeconfig_update_rgblight_default()
  Refactor cospad to current standards and enable support for backlight keycodes (qmk#5582)
  [Keymap] update (mouse emulation, rev 6 compatibility) (qmk#5696)
  [Keyboard] fix project zen rev1 bootloader declaration (qmk#5695)
  [FIX] Misspelled RGB_YELLOW (qmk#5692)
  [Keymap] Fix broken Shift-Insert binding (qmk#5689)
  [Keyboard] forgot to omit k05 from the electrical matrix in hhkb layout (qmk#5684)
  [Keyboard] Fix red an green leds location (qmk#5698)
  Translate docs into Chinese (qmk#5693)
  [Keymap] Fix my userspace RGB bug (qmk#5686)
  Boston meetup 2019 (qmk#5611)
  [Keymap] Update to Drashna Keymaps (qmk#5594)
  fix LIB_SRC and QUANTUM_LIB_SRC for ARM (qmk#5623)
  RGB Matrix Animations: Three/six new reactive effects (wide, cross, nexus) (qmk#5602)
  Fix qmk#3566 use an hardware timer for software PWM stability (qmk#3615)
  added info.json for ymd96 (qmk#4982)
  Define RGB colors (qmk#5300)
  ...
KauyonKais pushed a commit to KauyonKais/qmk_firmware that referenced this pull request Apr 27, 2019
@drashna @KauyonKais
[Keymap] Update to Drashna Keymaps (qmk#5594)
352f632 
* Start to standardize macro timer

* Update Fractal layout

Specifically, limit the RGB Lighting, since it's too many for the power, and only have the KITT annimation on the front

* Update Iris keymap to use I2C for transport

* Remove TAP_CODE_DELAY from keyboard in favor of global setting

* Remove Woodpad

Since it\'s no longer in my possession

* Only enable LTO on AVR boards

* Run matrix_scans while doing startup light

* Run matrix_scan to get split keyboard code synced properly

* Fix rgb mode

* Remove custom debouncing settings

* Make RGB Light Startup Animation optional

* Fix opt def

* Remove extra tap code delay value

* Fix references to keebio boards

* Add support for LP Iris keyboard

* Add backlight code

* Make startup animation optional

* Update gitlab ci script

* Remove port declaration

* Revert avrgcc changes to gitlab ci file

* Don't re-set mods

* Remove MACRO_TIMER define

* Add custom name for crkbd

* Add name for Prime M pad

* Add names for ortho 4x12 boards

* Add some additional handling for rgb init

* Change thumb clusters on ergodox

* Switch Orthodox to I2C

* Fix Space in ergodox keymap

* Use OSL for ergodox layout

* Ugh, can't find a good layout

* Fix typo

* Fix up animation startup

* Cries in AVR

* Fix makefiles for ergodox ez boards

* Add support for "secret songs" in my userspace

* Reset debounce to 5ms for Ergodox EZ

* Fix gitlab CI yaml file

* More crying in AVR

* Cannot use rgb light and rgb matrix at the same time due to the WS2812 rgb matrix PR until the "Coexistance" PR is merged

* Update ODox for split common and i2c

* Add split config

* Impement Split code

* Add support for xscorpion OLED code

* Add OLED display config

* Fix OLED screen font

* Get OLED set up in vertical mode

* Remove old OLED code

* add per key support for crkbd

* Fix split changes

* RGB Tweeaks

* More OLED tweaks

* Fix rotation stuff

* Fix more OLED stuff

* Remove custom Debounce from Ergodox layout since it's no longer needed
foosinn pushed a commit to foosinn/qmk_firmware that referenced this pull request May 6, 2019
@drashna @foosinn
[Keymap] Update to Drashna Keymaps (qmk#5594)
e9e4724 
* Start to standardize macro timer

* Update Fractal layout

Specifically, limit the RGB Lighting, since it's too many for the power, and only have the KITT annimation on the front

* Update Iris keymap to use I2C for transport

* Remove TAP_CODE_DELAY from keyboard in favor of global setting

* Remove Woodpad

Since it\'s no longer in my possession

* Only enable LTO on AVR boards

* Run matrix_scans while doing startup light

* Run matrix_scan to get split keyboard code synced properly

* Fix rgb mode

* Remove custom debouncing settings

* Make RGB Light Startup Animation optional

* Fix opt def

* Remove extra tap code delay value

* Fix references to keebio boards

* Add support for LP Iris keyboard

* Add backlight code

* Make startup animation optional

* Update gitlab ci script

* Remove port declaration

* Revert avrgcc changes to gitlab ci file

* Don't re-set mods

* Remove MACRO_TIMER define

* Add custom name for crkbd

* Add name for Prime M pad

* Add names for ortho 4x12 boards

* Add some additional handling for rgb init

* Change thumb clusters on ergodox

* Switch Orthodox to I2C

* Fix Space in ergodox keymap

* Use OSL for ergodox layout

* Ugh, can't find a good layout

* Fix typo

* Fix up animation startup

* Cries in AVR

* Fix makefiles for ergodox ez boards

* Add support for "secret songs" in my userspace

* Reset debounce to 5ms for Ergodox EZ

* Fix gitlab CI yaml file

* More crying in AVR

* Cannot use rgb light and rgb matrix at the same time due to the WS2812 rgb matrix PR until the "Coexistance" PR is merged

* Update ODox for split common and i2c

* Add split config

* Impement Split code

* Add support for xscorpion OLED code

* Add OLED display config

* Fix OLED screen font

* Get OLED set up in vertical mode

* Remove old OLED code

* add per key support for crkbd

* Fix split changes

* RGB Tweeaks

* More OLED tweaks

* Fix rotation stuff

* Fix more OLED stuff

* Remove custom Debounce from Ergodox layout since it's no longer needed
Timbus pushed a commit to Timbus/qmk_firmware that referenced this pull request Jun 23, 2019
@drashna @Timbus
[Keymap] Update to Drashna Keymaps (qmk#5594)
d08822c 
* Start to standardize macro timer

* Update Fractal layout

Specifically, limit the RGB Lighting, since it's too many for the power, and only have the KITT annimation on the front

* Update Iris keymap to use I2C for transport

* Remove TAP_CODE_DELAY from keyboard in favor of global setting

* Remove Woodpad

Since it\'s no longer in my possession

* Only enable LTO on AVR boards

* Run matrix_scans while doing startup light

* Run matrix_scan to get split keyboard code synced properly

* Fix rgb mode

* Remove custom debouncing settings

* Make RGB Light Startup Animation optional

* Fix opt def

* Remove extra tap code delay value

* Fix references to keebio boards

* Add support for LP Iris keyboard

* Add backlight code

* Make startup animation optional

* Update gitlab ci script

* Remove port declaration

* Revert avrgcc changes to gitlab ci file

* Don't re-set mods

* Remove MACRO_TIMER define

* Add custom name for crkbd

* Add name for Prime M pad

* Add names for ortho 4x12 boards

* Add some additional handling for rgb init

* Change thumb clusters on ergodox

* Switch Orthodox to I2C

* Fix Space in ergodox keymap

* Use OSL for ergodox layout

* Ugh, can't find a good layout

* Fix typo

* Fix up animation startup

* Cries in AVR

* Fix makefiles for ergodox ez boards

* Add support for "secret songs" in my userspace

* Reset debounce to 5ms for Ergodox EZ

* Fix gitlab CI yaml file

* More crying in AVR

* Cannot use rgb light and rgb matrix at the same time due to the WS2812 rgb matrix PR until the "Coexistance" PR is merged

* Update ODox for split common and i2c

* Add split config

* Impement Split code

* Add support for xscorpion OLED code

* Add OLED display config

* Fix OLED screen font

* Get OLED set up in vertical mode

* Remove old OLED code

* add per key support for crkbd

* Fix split changes

* RGB Tweeaks

* More OLED tweaks

* Fix rotation stuff

* Fix more OLED stuff

* Remove custom Debounce from Ergodox layout since it's no longer needed
@kuchosauronad0 kuchosauronad0 mentioned this pull request Oct 28, 2019
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XScorpion2 XScorpion2 XScorpion2 left review comments

@noroadsleft noroadsleft noroadsleft requested changes

@mechmerlin mechmerlin mechmerlin approved these changes

@algernon algernon Awaiting requested review from algernon

@jackhumbert jackhumbert Awaiting requested review from jackhumbert

@ezuk ezuk Awaiting requested review from ezuk

@yanfali yanfali Awaiting requested review from yanfali

@skullydazed skullydazed Awaiting requested review from skullydazed

@fredizzimo fredizzimo Awaiting requested review from fredizzimo

Assignees
No one assigned
Labels
keymap
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@drashna @XScorpion2 @noroadsleft @mechmerlin