Commit Graph

609 Commits (89357b96d40f6f8189da09c3d15131e22991ed4c)

Author SHA1 Message Date
Fred Sundvik d5e7603d55 Remove extra serial_link subdirectory 9 years ago
Fred Sundvik c5bf090d16 Remove CGreen make files 9 years ago
Fred Sundvik 3ac52b2e76 Remove serial_link .gitignore and .gitmodules 9 years ago
Jack Humbert 3577e26fd9 fix/annotate wait_us lines 9 years ago
Fred Sundvik 639cdd363e Add 'quantum/serial_link/' from commit 'a20d513e3cdacbf6e0e70a80402497ad10166434'
git-subtree-dir: quantum/serial_link
git-subtree-mainline: 7d28d6a7bc
git-subtree-split: a20d513e3c
9 years ago
Jack Humbert 421ff74e0c Merge pull request #471 from Chipairon/patch-1
Fix for '~' in spanish layout
9 years ago
Smilliam 6b0c9cc905 fixed indentation. 9 years ago
Smilliam 1412076df6 Allow Space Cadet state to be canceled by alternate Shift key
Allows you to press RSHIFT to cancel the insertion of a "(" when holding down LSHIFT. Alternatively, allows you to press LSHIFT to cancel the insertion of a ")" when holding down RSHIFT. This change enables you to renege from outputting a character should you press a shift key erroneously.
9 years ago
Jack Humbert 8e88d55bfd reverts #343 for the most part (#474) 9 years ago
Rubén Díaz-Jorge 132c047469 Fix for '~' in spanish layout 9 years ago
fredizzimo 4d4f7684e6 Add ChibiOS support for QMK (#465)
* Modularity and gcc warnings fixes.

* Add ChibiOS support (USB stack + support files).

* Make usb_main more USB_DRIVER #define independent.

* Move chibios to tool.

* Implement jump-to-bootloader.

* Small updates.

* Fix bootloader-jump compiling.

* Move AVR specific sleep_led.c into avr.

* Add basic sleep_led for chibios.

* Update chibios README.

* NKRO fixes.

* Rename some Makefile defines.

* Move STM32 bootloader address config to separate .h file.

* Add ARM Teensies bootloader code.

* Fix chibios/usb_main GET_REPORT handing.

* Add missing #include to keymap.c.

* Make bootmagic.c code portable (_delay_ms -> wait_ms).

* Move declaration of keymap_config.

Should really not declare variables in .h files - since it's included
in different .c files, a proper linker then complains that the same
variable is declared more than once (once for each .c file that the
offending .h is included in).

* Add eeprom support for chibios/kinetis.

* Rename chibios example keyboard.

* Move chibios/cortex selection to local Makefiles.

* Chibios: use WFI in idle. WIP suspend stuff.

* ChibiOS/kinetis: sending remote wakeup.

* ChibiOS/STM32: send remote wakeup.

* Fix report size of boot protocol.

* Fix drop key stroke

Keyboard report should be checked if its transfer finishs successfully.
Otherwise key stroke can be missing when other key event occurs
before the last report transfer is done.

Boot protocol 10ms interval probably causes this problem in case
it receives key events in a row within the period. NKRO protocol
suffers less or nothing due to its interval 1ms.

* Chibios/usb_main: rename a variable for clarity.

* Add correct chibios/bootloader_jump for infinity KB.

* ChibiOS: make reset request more CMSISy.

* Chibios: Add breathing sleep LED on Kinetis MCUs.

* ChibiOS: Update infinity bootloader code to match updated ChibiOS.

* ChibiOS: prettify/document sleep_led code.

* Chibios: Remove the wait in the main loop.

* Add maple mini code.

* Do timeout when writing to CONSOLE EP queue.

Fixes TMK bug #266.

* Chibios: add 'core/protocol' to the makefiles' search path.

* Chibios: Update to new USB API.

* Chibios: add more guards for transmitting (fix a deadlock bug).

* Add update for chibios in README

* Chibios: Fix a HardFault bug (wait after start).

* Chibios: cleanup usb_main code.

* Chibios: Revert common.mk change (fix AVR linking problem).

* core: Fix chibios user compile options

Compile options can be defined in project Makefile such as UDEFS, UADEFS, UINCDIR, ULIBDIR and ULIBS.

* Sysv format for ChibiOS arm-none-eabi-size

Some new patches to ChibiOS puts heap as it's own section. So the
berkeley format is now useless, as the heap will be included in the
BSS report. The sysv format displays the bss size correctly.

* Fix hard-coded path of CHIBIOS

* Add support for new version of ChibiOS and Contrib

The Kinetis support has moved to a separate Contrib repository in
the newest version of Chibios. There has also been some structure
changes. So this adds support for those, while maintaining back-
wards compability.

* Update ChibiOS instructions

* Chibios: implement sleep LED for STM32.

* Chibios: Update the main chibios README.

* Chibios: fix STM32_BOOTLOADER_ADDRESS name.

* Chibios: make the default bootloader_jump redefinable (weak).

* Chibios: disable LTO (link-time optimisation).

With LTO enabled, sometimes things fail for mysterious reasons
(e.g. bootloader jump on WF with LEDs enabled), just because the
linker optimisation is too aggressive.

* Chibios: add default location for chibios-contrib.

* ChibiOS: update mk to match chibios/master.

* ChibiOS: update instructions.md.

* Add chibi_onekey example.

* Add comments to chibi_onekey Makefile.

* Rename some Makefile defines.

* Move STM32 bootloader address config to separate .h file.

* Rename chibios example keyboard.

* Move chibios/cortex selection to local Makefiles.

* Add Teensy LC onekey example.

* Chibios: use WFI in idle. WIP suspend stuff.

* Update chibi/teensy instructions.

* Update chibios/Teensy instructions.

* Add infinity_chibios

* Add keymap_hasu.c

* Infinity_chibios: select correct bootloader_jump.

* Infinity_chibios: improve comments.

* Add generic STM32F103C8T6 example.

* Add maple mini code.

* STM32F103x fixes.

* Add maple mini pinout pic.

* Chibios: updates for 3.0.4 git.

* Chibios: rename example stm32_onekey -> stm32_f072_onekey.

* Chibios: add makefiles for Teensy 3.x examples.

* Chibios: update Teensy 3.x instructions.

* Chibios: Tsy LC is cortex-m0plus.

* Chibios: add more guards for transmitting (fix a deadlock bug).

* Change README for chibios

* Chibios: update examples to current chibios git.

Match the changes in mainline chibios:
 - update chconf.h
 - update supplied ld scripts structure
 - update Teensy instructions (switch to official
    chibios and introduce contrib)

* Add ChibiOS and ChibiOS-Contrib submodules

Also fix the makefile path for them.

* Moves chibios keyboards to keyboards folder

* First version of ChibiOS compilation

Only the stm32_f072_onkey keyboard is ported at the moment. It
compiles, but still doesn't link.

* More chibios fixes

It now compiles without warnings and links

* Move the teensy_lc_onekey to the keyboards folder

* Clean up the make file rule structure

* Remove keymap_fn_to_action

* Update more ChibiOS keyboards to QMK

Most of them does not compile at the moment though.

* Use older version of Chibios libraries

The newest ones have problems with compilation

* Remove USB_UNCONFIGURED event

It isn't present in the older version of ChibiOS

* Fix the infinity_chibios compilation

* Fix potentially uninitialized variable

* Add missing include

* Fix the ChibiOS makefile

* Fix some Chibios keyboard compilation

* Revert the rules.mk file back to master version

* Combine the chibios and AVR makefiles

With just the required overrides in the respective platform
specific one.

* Slight makefile restrucuring

Platform specific compiler options

* Move avr specific targets out of the main rules

* Fix ChibiOS objcopy

The ChibiOS objcopy needs different parameters, so the parameters
are moved to the corresponding platform rule file

* Fix the objcopy for real this time

The comands were moved around, so chibios used avr and the ohter
way around.

Also change the objsize output format

* Fix the thumb flags

* Fix the infinity hasu keymap

* Per platform cpp flags

* Add gcc-arm-none-eabi package to travis

* Add arm-none-eabi-newlib to travis

* Fix the name of the libnewlib-arm-none-eabi lib

* Fix the ChibiOS paths

So that they are properly relative, and builds don't generate
extra folders

* Fix the board path of stm32_f103_onekey

* Only consider folders with Makefiles as subproject
9 years ago
Jack Humbert 8125cdb88c gets rid of rand warning [skip ci] 9 years ago
Jack Humbert 60fd885a6e rand supports other chips 9 years ago
Jack Humbert 197f152dee adds random base64 character generator 9 years ago
Jack Humbert 65faab3b89 Moves features to their own files (process_*), adds tap dance feature (#460)
* 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]

* audio and midi moved over to separate files

* chording, leader, unicode separated

* consolidate each [skip ci]

* correct include

* quantum: Add a tap dance feature (#451)

* quantum: Add a tap dance feature

With this feature one can specify keys that behave differently, based on
the amount of times they have been tapped, and when interrupted, they
get handled before the interrupter.

To make it clear how this is different from `ACTION_FUNCTION_TAP`, lets
explore a certain setup! We want one key to send `Space` on single tap,
but `Enter` on double-tap.

With `ACTION_FUNCTION_TAP`, it is quite a rain-dance to set this up, and
has the problem that when the sequence is interrupted, the interrupting
key will be send first. Thus, `SPC a` will result in `a SPC` being sent,
if they are typed within `TAPPING_TERM`. With the tap dance feature,
that'll come out as `SPC a`, correctly.

The implementation hooks into two parts of the system, to achieve this:
into `process_record_quantum()`, and the matrix scan. We need the latter
to be able to time out a tap sequence even when a key is not being
pressed, so `SPC` alone will time out and register after `TAPPING_TERM`
time.

But lets start with how to use it, first!

First, you will need `TAP_DANCE_ENABLE=yes` in your `Makefile`, because
the feature is disabled by default. This adds a little less than 1k to
the firmware size. Next, you will want to define some tap-dance keys,
which is easiest to do with the `TD()` macro, that - similar to `F()`,
takes a number, which will later be used as an index into the
`tap_dance_actions` array.

This array specifies what actions shall be taken when a tap-dance key is
in action. Currently, there are two possible options:

* `ACTION_TAP_DANCE_DOUBLE(kc1, kc2)`: Sends the `kc1` keycode when
  tapped once, `kc2` otherwise.
* `ACTION_TAP_DANCE_FN(fn)`: Calls the specified function - defined in
  the user keymap - with the current state of the tap-dance action.

The first option is enough for a lot of cases, that just want dual
roles. For example, `ACTION_TAP_DANCE(KC_SPC, KC_ENT)` will result in
`Space` being sent on single-tap, `Enter` otherwise.

And that's the bulk of it!

Do note, however, that this implementation does have some consequences:
keys do not register until either they reach the tapping ceiling, or
they time out. This means that if you hold the key, nothing happens, no
repeat, no nothing. It is possible to detect held state, and register an
action then too, but that's not implemented yet. Keys also unregister
immediately after being registered, so you can't even hold the second
tap. This is intentional, to be consistent.

And now, on to the explanation of how it works!

The main entry point is `process_tap_dance()`, called from
`process_record_quantum()`, which is run for every keypress, and our
handler gets to run early. This function checks whether the key pressed
is a tap-dance key. If it is not, and a tap-dance was in action, we
handle that first, and enqueue the newly pressed key. If it is a
tap-dance key, then we check if it is the same as the already active
one (if there's one active, that is). If it is not, we fire off the old
one first, then register the new one. If it was the same, we increment
the counter and the timer.

This means that you have `TAPPING_TERM` time to tap the key again, you
do not have to input all the taps within that timeframe. This allows for
longer tap counts, with minimal impact on responsiveness.

Our next stop is `matrix_scan_tap_dance()`. This handles the timeout of
tap-dance keys.

For the sake of flexibility, tap-dance actions can be either a pair of
keycodes, or a user function. The latter allows one to handle higher tap
counts, or do extra things, like blink the LEDs, fiddle with the
backlighting, and so on. This is accomplished by using an union, and
some clever macros.

In the end, lets see a full example!

```c
enum {
 CT_SE = 0,
 CT_CLN,
 CT_EGG
};

/* Have the above three on the keymap, TD(CT_SE), etc... */

void dance_cln (qk_tap_dance_state_t *state) {
  if (state->count == 1) {
    register_code (KC_RSFT);
    register_code (KC_SCLN);
    unregister_code (KC_SCLN);
    unregister_code (KC_RSFT);
  } else {
    register_code (KC_SCLN);
    unregister_code (KC_SCLN);
    reset_tap_dance (state);
  }
}

void dance_egg (qk_tap_dance_state_t *state) {
  if (state->count >= 100) {
    SEND_STRING ("Safety dance!");
    reset_tap_dance (state);
  }
}

const qk_tap_dance_action_t tap_dance_actions[] = {
  [CT_SE]  = ACTION_TAP_DANCE_DOUBLE (KC_SPC, KC_ENT)
 ,[CT_CLN] = ACTION_TAP_DANCE_FN (dance_cln)
 ,[CT_EGG] = ACTION_TAP_DANCE_FN (dance_egg)
};
```

This addresses #426.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>

* hhkb: Fix the build with the new tap-dance feature

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>

* tap_dance: Move process_tap_dance further down

Process the tap dance stuff after midi and audio, because those don't
process keycodes, but row/col positions.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>

* tap_dance: Use conditionals instead of dummy functions

To be consistent with how the rest of the quantum features are
implemented, use ifdefs instead of dummy functions.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>

* Merge branch 'master' into quantum-keypress-process

# Conflicts:
#	Makefile
#	keyboards/planck/rev3/config.h
#	keyboards/planck/rev4/config.h

* update build script
9 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
9 years ago
Jack Humbert 00dcac7270 updates planck macros to keycodes, prototype fn_actions 9 years ago
Jack Humbert b68b722325 updates ez's matrix to spec 9 years ago
Jack Humbert 13bb6b4b7f Backlight abstraction and other changes (#439)
* redoes matrix pins, abstracts backlight code for B5,6,7

* slimming down keyboard stuff, backlight breathing implemented

* don't call backlight init when no pin

* cleans up user/kb/quantum calls, keyboard files

* fix pvc atomic

* replaces CHANNEL with correct var in breathing

* removes .hexs, updates readmes, updates template

* cleans-up clueboards, readmes to lowercase

* updates readme
9 years ago
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
Jack Humbert 86169833c5 updates to preonic default, music mode integrated 9 years ago
Jack Humbert 142ce47698 added keymap_extras to path 9 years ago
Jack Humbert 0b0ec82427 eeprom reset tool 9 years ago
Jack Humbert 0faa18eab9 audio enable stored in eeprom 9 years ago
IBNobody 8f85117aa9 Added Audio to my Atomic 9 years ago
Jack Humbert ee2ee7f4f0 audio note length fixes 9 years ago
Jack Humbert bb0836c620 the spacessss 9 years ago
Jack Humbert 63462bf8c1 changing up the makefile a bit 9 years ago
IBNobody 2900b48845 Added parenthesis to midi macro. 9 years ago
IBNobody 3755ef5ddb Compiler Warnings / Atomic TLC
Corrected compiler warnings for a number of issues.  Gave Atomic some
TLC.
9 years ago
skullY 97f8f37876 Fixup RGBLIGHT support for clueboard2 9 years ago
Erez Zukerman 9cfc74c35b [Erez & Jack] Makes tri-layer available across Quantum 9 years ago
Jack Humbert 976d0a327b add silent notes 9 years ago
Didier Loiseau aa5eb49edd BÉPO over CSA: GR2A-shifted characters in AltGr layer
- define aliases for all GR2A-shifted characters
- use the available characters in BÉPO over CSA AltGr layer
9 years ago
Didier Loiseau 3a91ddb074 Use CSA_ as prefix for Canadian Multilingual key aliases
CM is already used for Colemak.
9 years ago
Didier Loiseau 911222892e BÉPO over CSA: GR2A characters in AltGr layer
- define aliases for all GR2A characters (unshifted)
- use the available characters in the BÉPO over CSA AltGr layer
9 years ago
Didier Loiseau 7840e69bfa BÉPO over CSA: AltGr layer
- implemented the most useful characters:
  - all French characters + €
  - common programmer characters
- other keys implemented as KC_NO to avoid mistyping a character
  from a lower layer
- AltGr+Shift not supported (yet)
9 years ago
Didier Loiseau a7cef2ca0a Initial BÉPO over CSA with Shift layer
Initial implementation of the BÉPO layout
for use with the Canadian Multilingual Standard layout
(a.k.a. CSA / ACNOR layout) on the OS-side.
- support all bépo characters from the default and shifted layers
9 years ago
Stephan Bösebeck aee8715815 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 9 years ago
Stephan Bösebeck dbd4ab3457 fixed de_osx prefix in keymap include to avoid conflicts 9 years ago
Jack Humbert e7377dc24b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 9 years ago
Jack Humbert ac0729787f preonic update 9 years ago
Noah Andrews 95fba250ef Updated several keyboard folders to use new keymap naming scheme 9 years ago
Jack Humbert 8bbc1dcf4f Merge pull request #219 from IBNobody/master
Master
9 years ago
IBNobody 1d13aa933b Minor Tweaks and Documentation
Fixed compiler warning by including bootloader.h in keymap_common.c.

Changed FORCE_NKRO to only be applied if NKRO_ENABLE is defined.

Added extra documentation to the template config.h
9 years ago
Jack Humbert fd9e5d1510 Merge pull request #214 from cdlm/action-hook
Add per-event user hook function
9 years ago
Damien Pollet 2181be029e Add action-preprocessing hook to keyboard template 9 years ago
IBNobody 577971ab07 Magic Key Overrides / Keyboard Lock / Forced NKRO
Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock
option to template / Added forced NKRO option to template (disabled by
default)
9 years ago
IBNobody 3d56ec052e Fixed extra semicolons.
Fixed extra semicolons.
9 years ago
IBNobody 10491ba21f Fixed LED Function Calls
Fixed LED indicator function calls to match how the matrix init function
calls are formatted.
9 years ago
IBNobody ec62d9e85c Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h
9 years ago
yoyoerx baeffd99da Pull request 190 resolution with 'qmk/master' for merge 9 years ago
IBNobody eba9a7d74d Adding LED function pointers 9 years ago
Jack Humbert 35393fa9dc Merge pull request #194 from DidierLoiseau/bépo-keymap-header
Keymap header for the BÉPO layout
9 years ago
Daniel Kriesten bfc6eca44a fixes an obvious typo to have DE_LCBR produce { 9 years ago
Didier Loiseau 7c33f8493f Keymap header for the BÉPO layout 9 years ago
yoyoerx 641859df84 Addressed void* return warning in all keymaps 9 years ago
Noah Andrews ee1b94045e Remove extraneous comma 9 years ago
plgruener 4ca4322501 update neo keymap 9 years ago
Kévin Letord 4a19cc054d Fix FR_RCBR declaration in keymap_french.h 9 years ago
Keller-Laminar 233af3a41c Include Dvorak underscore and plus keys.
There were previously no Dvorak specific underscore and plus key codes. For a keyboard like the Planck which has layers directly to shifted versions of special character keys you were unable to produce those characters using the Lower layer.
9 years ago
Vincent Pochet 1934e8a270 Add extra keymap for swiss french keyboard 9 years ago
Jack Humbert a6414eb257 Merge pull request #145 from gerbercj/feature/atreus_astar
Add support for Atreus running on A-Star
9 years ago
Chris Gerber 47dcec2945 Add support for Atreus running on A-Star 9 years ago
joar 2f7cda63d0 Norwegian Colemak Ergodox and Norwegian key definitions 9 years ago
Jack Humbert e6a2c77fde README changes 9 years ago
Wojciech Siewierski 65b41e2e59 Use boolean AND instead of bitwise (possible typo)
Fortunately seems harmless.
9 years ago
Erez Zukerman 3c683aa9f2 Fixes CM_SCLN and updates docs for Colemak 9 years ago
Fernando Mendonca c29ad125a7 Fix 2 macros in the Nordic keymap
By testing I found out that, at least on Linux using the Swedish layout,
two macros present on this file were wrong, for the backslash and pipe
keys. Jack helped me find the correct combination for the backslash and
that led me to the right one for pipe.
9 years ago
Jack Humbert 7d6716bede audio on reset 9 years ago
Jack Humbert 0a71166a2d missing file 9 years ago
Yang Liu 2647c7cd84 fix bugs in animation effects 9 years ago
Yang Liu ba9ac457b2 Integrate WS2812 code into quantum core 9 years ago
Jack Humbert 24f2698fba changes to the template 9 years ago
Jack Humbert 5143c59bdf Merge branch 'audio' of https://github.com/jackhumbert/tmk_keyboard into smarkefile 9 years ago
Jack Humbert 544a49329c Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into smarkefile 9 years ago
Jack Humbert c753bfcc14 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into audio 9 years ago
Jack Humbert a820533ab7 keymap.c changes, disable grep stuff 9 years ago
Jack Humbert eb61700912 better integrations 9 years ago
plgruener da09312dd5 complete keymap_german.h (all alphanumerics)
add 'DE_'-prefixed aliases for all alphanumerics, so it becomes
immediatly obvious which layout we are assuming.
9 years ago
Peter Eichinger 48eb980c2a Add defines for CtrlAltGui modifiers 9 years ago
Jack Humbert dfe7004bc5 new keymap folder structure and makefile magic 9 years ago
Jack Humbert 4faddd3449 working 9 years ago
Jack Humbert 6e3c36360e sounds 9 years ago
Stephan Bösebeck e44c30f203 using keymap_german_osx.h more, adding macros for CTRL/CMD-V combination 9 years ago
Jack Humbert 4c100dbbef note seq, start-up beeps, function beeps 9 years ago
Jack Humbert 0f867796de timer 3 9 years ago
Jack Humbert 29de37d5c0 pwm audio 9 years ago
Sébastien Pérochon 48eff6dd89 quantum: Add French keymap for OSX (keymap_french_osx) 9 years ago
Matthias Schmitt 7b7870bae1 Add neo2 keymap and neo2 ergodox layout 9 years ago
Matthias Schmitt 6c15dac7db Add Ctrl-Shift tap modifier 9 years ago
Matthias Schmitt 3dbcad51d1 Add german keymap and german ergodox layout 9 years ago
Jack Humbert 11d6e66979 atomic hex 9 years ago
Erez Zukerman 407f41cd9a [Jack & Erez] Adds standalone versions of Hyper and Meh 9 years ago
Erez Zukerman f5ec585ed8 [Erez & Jack] Adds Meh key (Hyper without Win/Cmd) 9 years ago
Jack Humbert 6485c7d7da nkro info 9 years ago
Jack Humbert eb2795b4d6 atomic up-to-date 9 years ago
Jack Humbert 39915b1748 homebrew instructions 9 years ago
Erez Zukerman 4b0c54324a Adds Hyper key, tweaks ErgoDox EZ default keymap 9 years ago
Jack Humbert 8643e01286 merging 9 years ago
Jack Humbert 1fb8b4ce3a changes 9 years ago
Erez Zukerman d3db8d62f6 More work on ErgoDox EZ default keymap 9 years ago
Erez Zukerman 2739aa8d78 Initial working version of ErgoDox EZ layout using new syntax 9 years ago
Jack Humbert 18da1e6801 layer tap, mod tap 9 years ago
Jack Humbert d9f08e6177 toggle and hold-tap action shortcuts 9 years ago
Jack Humbert 6f3141965e new project script 9 years ago
Erez Zukerman 0c47e8b008 [Jack & Erez] Comments + tiny updates and cleanup 9 years ago
Jack Humbert cc1c32671e fixed makefile, added MO DF shortcuts 9 years ago
Jack Humbert 35a81f5b8b added ergodox 9 years ago
Jack Humbert 46e7fb2d3c quantum separated 9 years ago