Commit Graph

235 Commits (940358ed4f5cdb9ff6b6a21e2fd9b3f0c35a4347)

Author SHA1 Message Date
Jack Humbert 98f0807359 increase leader seq size to 5 9 years ago
Jack Humbert 649b33d778 Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)
* fixes from tmk's repo

* rename keyboard to keyboards
9 years ago
Jack Humbert e329729d3a adds fuse settings for atmega32u4, fixes keymap_extras includes 9 years ago
Jack Humbert 1a0bac8bcc Warning reductions (#430)
Warning reductions
9 years ago
Jack Humbert 80c8705419 reduces rgblight warnings, integrates completely (#428) 9 years ago
Jack Humbert a8375fa15a updates all config.h and Makefiles to correct references, text 9 years ago
Jack & Erez 76076db725 [Jack & Erez] Fixes Space Cadet right shift 9 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 008c8d54a0 adds power_up to quantum's matrix file 9 years ago
Jack Humbert b70248fa21 addresses #369 9 years ago
Jack Humbert d9e4dad0a8 Makefile redo & other features (#395)
* .build containment implemented

* no destructive variable setting - builds in either folder

* make from 3 places

* cleans before each build
* make from root with keyboard=keyboard, keymap=keymap
* make from keyboard/keyboard with keymap=keymap
* make from keymaps/keymap
* only implemented on planck

* adds color diag to avr-gcc

* makefiles for all plancks, clean-up

* quick build-all makefile for plancks

* reformatting of make output (colors)

* color toggle, tmk path corrections

* correct if statement for color

* move config.h to main makefile, updates preonic, atomic

* format update, all keyboards targets

* makefile optional for build all target, alps and arrow_pad updated

* alps updated

* make planck default, trying out travis recipe for all-keyboards

* all-keymaps target, different travis recipe

* updates alps64

* updates keyboards to new format

* updates clue* projects

* all projects updated, specialise EZ .hex, let .hex through

* updates travis

* automatically find root, keyboard, keymap

* silent echo, cleaned-up mass make output

* updates all keyboards' .hex files except EZ

* Rename Bantam44.c to bantam44.c

* Rename Bantam44.h to bantam44.h

* nananana

* adds six key keyboard

* does same to ez as rest

* updates send_string example

* brings ergodox_ez up to date

* updates template/new project script

* adds sixkeyboard

* adds readme for sixkeyboard

* adds sixkeyboard to travis

* filenames, gitignore mess

* define clock prescaler stuff manually

* make quick, size test example

* documentation and dfu-no-build
9 years ago
Eric Tang 794aed37a0 Improve string sending (#376) 9 years ago
Jack Humbert 4635b44533 new line/tab in send_string 9 years ago
Jack Humbert 1c9f33c06a adds send_string functionality (string macros) 9 years ago
Jack Humbert a53bc24c4d makes .SILENT (less verbose) by default - override with VERBOSE=1
also took out some @echo newlines to make things a bit cleaner
9 years ago
Jack Humbert 17977a7e24 process_record implementation (non-breaking for process_action ATM) 9 years ago
Jack Humbert 38987d4c15 updates quantum template to prevent backlight conflicts 9 years ago
Jack Humbert de57799530 brings alps64 up-to-date (needs testing) 9 years ago
Jack Humbert 209ee3cd05 removes duplicate double quote and odd whitespace 9 years ago
Nathan Sharfi 9d6debd9b2 Add double quote for everyone; update Zweihander 9 years ago
Erez Zukerman 8bc69afc63 [Erez & Jack] Optimizes shift_interrupted array 9 years ago
Erez Zukerman 1237025963 [Erez & Jack] Packages Space Cadet shifts into keycodes 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
Eric Tang 1ae6011cef Clean up #343's code (#348) 9 years ago
Eric Tang aaa758f1d3 Optimize matrix scanning (#343) 9 years ago
purpleP 0275d444d7 fixed small bug with AUDIO_ENABLED (#339) 9 years ago
Jack Humbert b732b79b49 adapts unicode to quantum.c (#333)
* Unicode

to have unicode input you need to:

- set your OS input method to UNICODE if needed
- enable unicode in your makefile
- copy the action_function from
keyboard/planck/keymaps/unicode/unicode.c to your keymap.c
set the target OS method in your keymap.c: void matrix_init_user() {
set_unicode_mode(UC_OSX); } you can then switch when you want with:
set_unicode_mode(UC_OSX); set_unicode_mode(UC_LNX);
set_unicode_mode(UC_WIN);
put some unicode codes in your keymap like so: UC(0x0061)
I did change the bit mask in quantum/keymap_common.c and .h
I’m afraid we will need uint32 to get a total support for all unicode
tables or relocate the handler as @mbarkhau did.

* rearranges keycode values, hooks-up unicode

* removes extra lalt ref

* adds unicode shortcuts and example
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
heartsekai 465aabe11d Added Swiss-German keymap. (#335) 9 years ago
Jack Humbert fde477a927 updates midi functionality (#331)
* 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

* splits up process_action to allow independent processing of actions

* moves midi stuff to quantum.c

* adds additional scales for midi
9 years ago
Jack Humbert bf5c2ccee5 splits process_action up to handle records separately (#329)
* 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

* splits up process_action to allow independent processing of actions

* merging?
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
Erez Zukerman 1a8c0dd22d Leader key implementation (#326)
* 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

* updates process_action functions to return bool
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
Jack Humbert 684793360c quantum accommodates more than 16 columns 9 years ago
Erez Zukerman 2ce9644caa Merge pull request #311 from adiabatic/ergodox-zweihander-osx
Add KC_LABK and KC_RABK (< and >)
9 years ago
Nathan Sharfi 08f3142463 Add KC_LABK and KC_RABK (< and >) 9 years ago
Erez Zukerman 9bb368a5fb [Jack & Erez] Defines MOD_HYPR and MOD_MEH 9 years ago
Erez Zukerman f293bf2340 [Jack & Erez] Removes duplicate reference, sorts whitespace 9 years ago
Jack Humbert 41b3e399b1 adds keycode shortcuts for OSL and OSM 9 years ago
Tom Duckering d4520cd3ac Referencing the hex file (#309)
Seems that this is a typo. When I used the hex file it worked so presuming that means it's right ;)
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 0656f2fa10 moves backlight functionality to keyboard files and updates template makefile
previously there were two backlight.c files (bad)
9 years ago
Jack Humbert 66e0323881 removes extra voices, updates .hex files 9 years ago
Jack Humbert e024c11f7a actually resolves conflicts in rgblight.c 9 years ago
Jack Humbert c37d52d213 resolves conflicts in rgblight.c
# Conflicts:
#	quantum/rgblight.c
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
James ‘Twey’ Kay 7ccfaf750d Add a keymap_extras header for Plover 9 years ago
Eric Tang eb09c450de Fix typo (#276) 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
Erez Zukerman a8fd65d86f Merge pull request #265 from sboesebeck/master
ErgodoxLayoutGenerator used
9 years ago
Jack Humbert e89b806b85 converts tabs to spaces 9 years ago
Jack Humbert 73228f5e5d restructures audio, begins voicing 9 years ago
Jack Humbert 2e60054951 fade envelope 9 years ago
Jack Humbert 2e303b40ae start of envelope function 9 years ago
Jack Humbert 7d1a683607 sounds for plover layout 9 years ago
Jack Humbert b0635e58eb delay isn't the problem here 9 years ago
Stephan Bösebeck 13244a259c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 9 years ago
Jack Humbert de4690593c fixed startup audio with a 500ms delay 9 years ago
Jack Humbert 462601f5e8 breaking changes - restructuring audio.c a little 9 years ago
Stephan Bösebeck 6ff5e10592 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 9 years ago
Jack Humbert fd49dfe5cb vibrato and polyphony paratmeters 9 years ago
Jack Humbert a2f31c886f getting ready for getters and setters 9 years ago
Jack Humbert 78b3a88154 merging in #262 9 years ago
Jack Humbert e49712b559 note sliding - on right now 9 years ago
Stephan Bösebeck 9cc39156f7 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 9 years ago
IBNobody 82ec81660e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into personal_atomic_planck 9 years ago
IBNobody ef73ab6628 Notes Bugfix 9 years ago
Jack Humbert 89a78f4a11 audio fixes 9 years ago
Jack Humbert 5a15c113d7 Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 9 years ago
IBNobody 5c98ad5960 Added extra songs, LED indicator notes 9 years ago
Jack Humbert d94960be5b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 9 years ago
Jack Humbert e0ab1dcf4c merging 9 years ago
Jack Humbert ce463ef424 audio fixes 9 years ago
Stephan Bösebeck 6d40f7c506 added new experimental layout - works with ErgodoxLayoutGenerator 9 years ago
IBNobody 23231fa577 Converted goodbye to notes, fixed eighth dotted note macro 9 years ago
IBNobody 3103ea542f Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck 9 years ago
IBNobody d5b72e7bde Fixed many compiler warnings related to print being disabled 9 years ago
a0-c 90289aa53f __attribute__ ((weak)) added to led_set
__attribute__ ((weak)) added to led_set
9 years ago
IBNobody c940e87235 fixed single note play copy/paste bug 9 years ago
Jack Humbert 319fbe344b Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 9 years ago
IBNobody 29e495be2a Added trimble and tempo adjustments! 9 years ago
IBNobody 943b5b7709 Adding folding to #if, etc 9 years ago
Jack Humbert a67d425f4d planck default layout updates 9 years ago
Jack Humbert e7b9959819 no need for length of play_notes array with macro 9 years ago
IBNobody 45f10b4c4b Fixed how note arrays are used. 9 years ago
Jack Humbert 8bbd064cf5 changes to play_notes, goodbye 9 years ago
Jack Humbert 41cc35425a rests between notes as an argument 9 years ago
Jack Humbert 8f4ce501eb Merge pull request #260 from IBNobody/personal_atomic_planck
Atomic TLC and musical note freqs for audio
9 years ago
IBNobody 4aea806aa8 Adding Musical Notes 9 years ago
Jack Humbert c83aa16f1d fixes audio prescaler to emit correct freq 9 years ago
Jack Humbert ab19ebd08a MAGIC functionality, AG swap in default layout 9 years ago