Commit Graph

32 Commits (30f22d450da19c65584e6deb8515a1fa5b074e07)

Author SHA1 Message Date
Zay950 2366ebfbbd Merge branch 'master' into to_push 8 years ago
skullydazed 23839b8c6d Clarify the quantum license (#1042)
* Clarify the license for files we have signoff on

* Update against the currently signed off files

* Remove unused and not clearly licensed headers

* Replace an #endif I accidentally removed while resolving merge conflicts
8 years ago
Jack Humbert 7e37daa2ce Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes
Flesh out MIDI support
8 years ago
Dylan Khor 683754bce8 added custom tones 8 years ago
Gabriel Young 0734f56940 add debug messages to audio 8 years ago
Jack Humbert 1ac5dc9e52 fix travis and reduce warnings 8 years ago
Jack Humbert 2fa36e38cf initial subatomic keymap (text) 8 years ago
Jack Humbert 438a5d685b limit voices by default, add some drums 8 years ago
Jack Humbert 06c64bbff3 rgb clean-up, api clean-up 8 years ago
Jack Humbert 0edfe55bfe re-enable audio and extrakeys 8 years ago
Zach Nielsen 4c0aa02b2e Missed some stuff. Added a song (stole it from reddit). 8 years ago
JeeBak Kim 7d0345ef25 Add IN_LIKE_FLINT song 8 years ago
Jack Humbert 215c2119af Implements subprojects and updates projects for this (#459)
* non-working commit

* working

* subprojects implemented for planck

* pass a subproject variable through to c

* consolidates clueboard revisions

* thanks for letting me know about conflicts..

* turn off audio for yang's

* corrects starting paths for subprojects

* messing around with travis

* semicolon

* travis script

* travis script

* script for travis

* correct directory (probably), amend files to commit

* remove origin before adding

* git pull, correct syntax

* git checkout

* git pull origin branch

* where are we?

* where are we?

* merging

* force things to happen

* adds commit message, adds add

* rebase, no commit message

* rebase branch

* idk!

* try just pull

* fetch - merge

* specify repo branch

* checkout

* goddammit

* merge? idk

* pls

* after all

* don't split up keyboards

* syntax

* adds quick for all-keyboards

* trying out new script

* script update

* lowercase

* all keyboards

* stop replacing compiled.hex automatically

* adds if statement

* skip automated build branches

* forces push to automated build branch

* throw an add in there

* upstream?

* adds AUTOGEN

* ignore all .hex files again

* testing out new repo

* global ident

* generate script, keyboard_keymap.hex

* skip generation for now, print pandoc info, submodule update

* try trusty

* and sudo

* try generate

* updates subprojects to keyboards

* no idea

* updates to keyboards

* cleans up clueboard stuff

* setup to use local readme

* updates cluepad, planck experimental

* remove extra led.c [ci skip]

* disable power up for now

* config files updates

* makefile updates

* .h file updates, config tuning

* disable audio for yang
8 years ago
Jack Humbert db32864ce7 Cleans up quantum/keymap situation, removes extra lufa folders (#416)
* sorts out keycodes

* move midi around

* remove mbed

* replaces keymap with qmk/keymap_common

* fixes keymap.h

* keymap, config, quantum rearrange

* removes unneeded lufa stuff
9 years ago
Jack Humbert 287eb7ad14 Converted audio play functions to *_user (#349)
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* Added music and audio toggles to Quantum.c

* Redid the audio callbacks

* Adjusted default planck layout to use the user tone naming

* tabs to spaces

* Rewrote the ALL recipe to allow for faster parallel make

* tabs to spaces

* Renamed custom event functions to be 'startup_user' and 'shutdown_user'. Also moved the prototypes around.

* Tweaked pvc atomic layout to work with the pvc planck.

* updates midi scale calling
9 years ago
Jack Humbert 0428214b90 adds music and audio toggles (#337)
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* Added music and audio toggles to Quantum.c

* Redid the audio callbacks

* music/audio_on_user
9 years ago
Jack Humbert 15719f3574 adds a sequencer to the music mode (#330)
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* Merge branch 'master' into process-record
9 years ago
Jack Humbert 3f02637f4d Backlight Breathing for Planck and Atomic
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* adds backlight pulse to planck
9 years ago
IBNobody 83e1cc241e Clarified audio.c (#302)
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs
9 years ago
Jack Humbert 66e0323881 removes extra voices, updates .hex files 9 years ago
Jack Humbert bf56838fe9 adds freq LUT for future use 9 years ago
Jack Humbert 140b97a1cd adds delayed vibrato 9 years ago
Jack Humbert e7b6bb641c updates default voice, prunes voices 9 years ago
Jack Humbert a718c53fe7 adds more voice harmonics 9 years ago
Jack Humbert a8086126fe Merge remote-tracking branch 'origin/master'
# Conflicts:
#	quantum/audio/voices.c
9 years ago
Jack Humbert b1900c8dde adds fifth and fourth down voices 9 years ago
IBNobody 082a0f313d fixed compiler warnings (#273) 9 years ago
Jack Humbert 7b3f212500 adds more voices, fixes macro redefines 9 years ago
Eric Tang 620ac4b260 Update functions used to write to EEPROM 9 years ago
Jack Humbert 9828aba2a1 adds multiple voices and the ability to iterate/deiterate between them 9 years ago
Jack Humbert e89b806b85 converts tabs to spaces 9 years ago
Jack Humbert 73228f5e5d restructures audio, begins voicing 9 years ago