Commit Graph

414 Commits (master)

Author SHA1 Message Date
Jack Humbert 453877422b Merge pull request #1327 from Dbroqua/master
Added Integration of IBM Trackpoint
8 years ago
yiancar fa1b92fbb1 Use variable to disable usb check at startup
Adds a define variable which when defined disables the usb startup
check. Modified the makefile to separate above define from bluetooth
dependancy
8 years ago
dbroqua 81e85a1a4e - Added integration of IBM Trackpoint 8 years ago
jerryen 9c284786e7 Workaround for the macOS caps lock delay (#1308)
* Add 80ms delay for KC_CAPS when used as a tap key

Workaround for the macOS caps lock delay

* Revert "Increase TAPPING_TERM for the Clueboard"

This reverts commit a74e69e9fa.
8 years ago
Jeremiah 25c6ca750f added comments and made function name clearer 8 years ago
Jeremiah 84395e8a04 whoops 8 years ago
Jeremiah b9b2244b82 faster, less bits :) 8 years ago
Jeremiah 63d9698d5c faster and less bits... again 8 years ago
Jeremiah 37f6f92765 faster and less bits 8 years ago
Jeremiah 7b7e285a98 should be using matrix_row_t 8 years ago
Jeremiah acd3e97b83 a bit smaller 8 years ago
Jeremiah 99877cdff3 a bit smaller 8 years ago
Jeremiah b9895771ed improvements 8 years ago
Jeremiah 849ed5a6a0 anti-ghost improvement for older keyboards with empty spots in matrix 8 years ago
Nephiel bd2c0b9648 Call led_set for layer action events to update LEDs on layer changes 8 years ago
Fred Sundvik 18b4d24cc3 Add possibility to override the command to execute when flashing 8 years ago
Fred Sundvik d68294615f Add make option for allowing warnings 8 years ago
Fred Sundvik 07fc34e962 Fix warnings when ACTION_ONESHOT is disabled 8 years ago
Fred Sundvik abda6ff7bb Include host.h from suspend.c 8 years ago
Fred Sundvik 737c1fe641 Make MOUSEKEY_MOVE_MAX and MOUSEKEY_WHEEL_MAX configurable
Kitten_paw/ickerwx was doing that
8 years ago
Fred Sundvik f39e9928eb Enable warnings as errors 8 years ago
Fred Sundvik 6039a4f6ed Empty implementation of has_onshot_mods_timed_out
When the timeout is zero or not defined, the function now returns false.
Fixes a linker error when the visualizer is enabled
8 years ago
Jack Humbert 3448d5d487 Merge pull request #1132 from akatrevorjay/pr/dfu-serial
Allow to specify serial to dfu-util flash
8 years ago
Travis La Marr eedb767279 Add RN42 Bluetooth module support
Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS.
8 years ago
Zay950 2366ebfbbd Merge branch 'master' into to_push 8 years ago
Jack Humbert 7e37daa2ce Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes
Flesh out MIDI support
8 years ago
Jack Humbert 216f669276 Merge pull request #1098 from lambdalisue/tapping-force-hold
Add TAPPING_FORCE_HOLD to regulate behaviour
8 years ago
Travis La Marr 43eee52cba Add BLE and EZKey module defines.
Also restored serial init back to original location. Was getting junk data.
8 years ago
Travis La Marr b4ac0598fa Readd bluetooth output direction on standard key input. 8 years ago
Travis La Marr ddc036b69e Refactor Bluetooth Handling
Refactored Bluetooth support to make adding new Bluetooth modules
easier in the future.

* Remove `OUT_BLE` key from QMK's keymap. `OUT_BT` is all we need now
as there's no difference anymore.
* Made BLUETOOTH_ENABLE build option legacy as not to break existing
keymaps (Falls back to existing EZ Key support if on)
* Removed `ADAFRUIT_BLE_ENABLE` build option
* Created new build option `BLUETOOTH` with module option (Currently
`AdafruitEZKey` & `AdafruitBLE`)
* Moved all LUFA bluetooth key/mouse events under `BLUETOOTH_ENABLE`
ifdef with selected modules output.
8 years ago
Trevor Joynson (trevorj) 515b4dd1f7 Allow to specify serial to dfu-util flash 8 years ago
Gabriel Young 525be99ee9 Split MIDI functionality into MIDI_BASIC and MIDI_ADVANCED
MIDI_ENABLE = no

   text	   data	    bss	    dec	    hex	filename
      0	  17080	      0	  17080	   42b8	satan_midi.hex

MIDI_ENABLE = yes
MIDI_BASIC undefined
MIDI_ADVANCED undefined

   text	   data	    bss	    dec	    hex	filename
      0	  19494	      0	  19494	   4c26	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_BASIC
MIDI_ADVANCED undefined

   text	   data	    bss	    dec	    hex	filename
      0	  19788	      0	  19788	   4d4c	satan_midi.hex

MIDI_ENABLE = yes
MIDI_BASIC undefined
#define MIDI_ADVANCED

   text	   data	    bss	    dec	    hex	filename
      0	  20846	      0	  20846	   516e	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_BASIC
#define MIDI_ADVANCED

   text	   data	    bss	    dec	    hex	filename
      0	  21140	      0	  21140	   5294	satan_midi.hex
8 years ago
Phong Nguyen d0b4dcc82c Removes redundant {} which cause build failure when DEBUG_ACTION is set 8 years ago
Gabriel Young dd8f8e6bae implement modulation 8 years ago
Gabriel Young e405ab4bc6 initial implementation of polyphony using variable length array of notes on 8 years ago
Jack Humbert 7bef285553 Merge pull request #1101 from priyadi/layer_state_set_kb
Add weak layer_state_set_kb hook
8 years ago
Priyadi Iman Nurcahyo bd8d717f1f Fix bug fix attempt 8 years ago
Priyadi Iman Nurcahyo d96175937b Bug fix & added default_layer_state_set_kb 8 years ago
Priyadi Iman Nurcahyo d369bfb83a Add layer_state_set_kb hook 8 years ago
lambdalisue 64f9779fe5 Add TAPPING_FORCE_HOLD to regulate behaviour
See #889 for the detail.
8 years ago
Priyadi Iman Nurcahyo c68e596f32 Implement faux-clicky feature 8 years ago
Priyadi Iman Nurcahyo aaa58a8d79 Supress warnings from ps2_mouse.h 8 years ago
Jack Humbert 42ea912fde Merge pull request #1062 from luizribeiro/fix-win
Fix V-USB bug on Windows 10
8 years ago
Jack Humbert c0c69a1a7c Merge pull request #1068 from adzenith/master
Minor cleanup
8 years ago
Jack Humbert 3c7fa0acc1 Merge pull request #1046 from LukeSilva/master
Add Tapping Macros to QMK
8 years ago
Jack Humbert 0c2b6951a6 Merge pull request #1057 from priyadi/selectable_output
Implement runtime selectable output (USB or BT)
8 years ago
Jack Humbert b6ffda4849 Merge pull request #1010 from SjB/oneshot_timeout_fix
oneshot timeout would only timeout after an event.
8 years ago
Nikolaus Wittenstein 06d21009b2 Minor cleanup 8 years ago
Luiz Ribeiro a3da586505 Fix V-USB bug on Windows 10 8 years ago
Priyadi Iman Nurcahyo 98f9a2e6df Fix wrong include 8 years ago
Priyadi Iman Nurcahyo 2bef8b5b88 Limit outputselect to AVR only for now 8 years ago
Priyadi Iman Nurcahyo 72e95809a1 Move outputselect to parent dir to satisfy non LUFA keyboards 8 years ago
Priyadi Iman Nurcahyo d8a9c63c26 Implement runtime selectable output (USB or BT) 8 years ago
SjB 45e0d09414 moved oneshot cancellation code outside of process_record.
The oneshot cancellation code do not depend on the
action_tapping_process and since process_record get called via the
action_tapping_process logic moved the oneshot cancellation code into
the action_exec function just before the action_tapping_process call
8 years ago
Luke Silva a3357d078e Add support for various tapping macros
A macro key can now be easily set to act as a modifier on hold, and
press a shifted key when tapped. Or to switch layers when held, and
again press a shifted key when tapped.

Various other helper defines have been created which send macros when
the key is pressed, released and tapped, cleaning up the
action_get_macro function inside keymap definitions.

The layer switching macros require a GCC extension - 'compound
statements enclosed within parentheses'. The use of this extension is
already present within the macro subsystem of this project, so its use
in this commit should not cause any additional issues.

MACRO_NONE had to be cast to a (macro_t*) to suppress compiler
warnings within some tapping macros.
8 years ago
Luke Silva 87bc36253d Fix documentation for TMK actions 8 years ago
Jack Humbert 71137deba2 Merge pull request #1014 from SjB/lcd_mods_status
added mods status bit to visualizer.
8 years ago
Luiz Ribeiro 9ce38cbccf Simplified and polished a bit the code changes on tmk_core 8 years ago
Luiz Ribeiro f7462aaa61 Got ps2avrGB to work with the V-USB protocol 8 years ago
SjB 9eb8d05246 added mods status bit to visualizer.
Since we can't read the real_mods and oneshot_mods static variable
directly within the update_user_visualizer_state
function (Threading and serial link). We are know storing the mods
states in the visualizer_keyboard_status_t structure. We can now
display the status of the modifier keys on the LCD display.
8 years ago
SjB 6f44ca7a59 oneshot timeout would only timeout after an event.
After setting a ONESHOT_TIMEOUT value, the oneshot layer state would
not expire without an event being triggered (key pressed). The reason
was that in the process_record function we would return priort to
execute the process_action function if it detected a NOEVENT cycle. The
process_action contained the codes to timeout the oneshot layer state.
The codes to clear the oneshot layer state have been move just in
front of where we check for the NOEVENT cycle in the process_record
function.
8 years ago
Jack Humbert 460bf008f5 Merge pull request #973 from Wilba6582/keycode_refactor
Keycode refactor
8 years ago
Fred Sundvik dd685eceb2 API Sysex fixes
Fix memory leaks by using stack instead of malloc
Reduce memory usage by having less temporary bufffers
Remove warnings by adding includes
Decrease code size by 608 bytes (mostly due to not linking malloc)
More robust handling of buffer overflows
8 years ago
Wilba6582 d8a608f3ff Keycode refactor 8 years ago
Wilba6582 a305da2bc9 Fixes issue #900 8 years ago
Kyle Smith 83e613ad23 Allow power consumption to be set per-keyboard. 8 years ago
Jack Humbert f2e5ca25db Merge pull request #944 from priyadi/negmousefix
Allow negative values for mouse movements
8 years ago
Priyadi Iman Nurcahyo 434b286032 Allow negative values for mouse movements 8 years ago
Priyadi Iman Nurcahyo 901f29e3aa The adafruit BLE C++ code requires -std=c++11 8 years ago
Jack Humbert c87d039839 Merge pull request #921 from Wilba6582/raw_hid
Initial version of Raw HID interface
8 years ago
Priyadi Iman Nurcahyo 07d29b7d29 syntax error fix 8 years ago
Priyadi Iman Nurcahyo d059624bfb Implemented weak ps2_mouse_init_user()
There are a lot of PS/2 commands, some are vendor/device specific, so we
provide a weak ps2_mouse_init_user() to be implemented in each keyboard
that need it.
8 years ago
Jack Humbert d0c667c790 Merge pull request #931 from OferPlesser/feature/improve-ps2-mouse
Improving ps/2 mouse
8 years ago
Ofer Plesser f0768f8be9 Forgot to use define in delay instead of hardcoded number 8 years ago
Ofer Plesser 9f41544e1d Added back PS2_MOUSE_INIT_DELAY define 8 years ago
ofples d639e08a31 Refactored and improved ps2 mouse feature 8 years ago
Wez Furlong 044fa3ff85 Connect the adafruit ble code to the lufa main loop
There are now 3 potential locations to send HID reports:

1. USB
2. The bluefruit easy key
3. Adafruit BLE

Generally speaking, if USB is connected then we should prefer to
send the reports there; it is generally the best channel for this.

The bluefruit module has no feedback about bluetooth connectivity
so the code must speculatively send reports over both USB and bluetooth.

The BLE module has connectivity feedback.  In general we want to
prefer to send HID reports over USB while connected there, even
if BLE is connected.  Except that it is convenient to force them
over BLE while testing the implementation.

This policy has been extracted out into a where_to_send function
which returns a bitmask of which of the channels should be used.
8 years ago
Jack Humbert 78f8fe361f Merge pull request #915 from wez/ble_3
Add support for Adafruit BLE modules
8 years ago
Jack Humbert ead68248c5 Merge pull request #913 from wez/ble_1
Tidy up atomicity in timer.c and ring_buffer.h
8 years ago
Wilba6582 fe001d46fd Initial version of Raw HID interface 8 years ago
Jack Humbert 6e0f994950 Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7 8 years ago
Wez Furlong 712476cd28 Add support for Adafruit BLE modules
This implements some helper functions that allow sending key reports
to an SPI based Bluetooth Low Energy module, such as the Adafruit
Feather 32u4 Bluefruit LE.

There is some plumbing required in lufa.c to enable this; that
is in a follow-on commit.
8 years ago
Wez Furlong be4e75423a Tidy up atomicity in timer.c and ring_buffer.h
Adopt the macros for saving/restoring the interrupt state
that are provided by the avr gcc environment.

Removing intialization of the timer value; this shaves off
a few bytes because globals are default initialized to zero.
8 years ago
Jack Humbert 7edac212c8 separated into api files/folder 8 years ago
Jack Humbert 7a1eca784f Merge pull request #903 from priyadi/ps2_init_delay
Make PS2 init delay configurable.
8 years ago
Priyadi Iman Nurcahyo 9a071f051c Make PS2 init delay configurable. Some devices are not fully powered up
after 1s.
8 years ago
Jack Humbert f25596b8dc rgblight fixes 8 years ago
Jack Humbert cefa8468fb travis pls 8 years ago
Jack Humbert 2e23689b8e converted to new format 8 years ago
Wilba6582 cf3926a8e1 Fixed NO_SUSPEND_POWER_DOWN handling 8 years ago
Jack Humbert 3d7aaa31e4 converted to 8bit messages 8 years ago
Wilba6582 5893f0fa1f Fixed NO_SUSPEND_POWER_DOWN handling 8 years ago
Jack Humbert 2b3a3ca678 Merge pull request #898 from PureSpider/backlight-fix
Set backlight status to on if it's at maximum brightness already and the brightness increase keybind is used
8 years ago
PureSpider d37becc0a9 Set backlight status to on if it's at maximum brightness already and the brightness increase keybind is used
Before it was turned on but the status wasn't set to on, so you had to
push the backlight toggle bind twice to turn it off again
8 years ago
Jack Humbert 6390033e86 cleaning up midid 8 years ago
Jack Humbert 664c0a036b cleaning up new code 8 years ago
Jack Humbert 27ebacb15d merging lets_split 8 years ago
Jack Humbert c1037b1dc0 working with helper, qmk_helper_windows@05b0105 8 years ago
Jack Humbert b57cf3c0c8 more structure to the package 8 years ago
Jack Humbert 161bd5596b midi back and forth 8 years ago
Jack Humbert 3774a7fcda rgb light through midi 8 years ago
Jack Humbert 530dd3377e animations, midi, etc 8 years ago
Jack Humbert e9f7487518 mostly working 8 years ago
Zach Nielsen 59bef40aab Keep unicode's input_mode through a power cycle 8 years ago
IBNobody 4c6960835c Refactoring Matrix scanning 8 years ago
IBNobody 508eddf8ba Fixing Debounce - WIP 8 years ago
IBNobody 17170ba76d Fixed some large keyboard bugs
Fixed some bugs relating to keyboards with more than 16 columns. Also
added the ability to mask off keyboard matrix bits.
8 years ago
IBNobody 78767bf208 Fix #770, Fix #779 8 years ago
Didier Loiseau d430999047 Fix issue #772 Meh and Hyper not working 8 years ago
IBNobody cb1ac2a3ed Fixed NO_PRINT / USER_PRINT conflict warning. 8 years ago
shela e25ae23287 fix number of NKRO keys
32byte report = 1byte modifiers + 31byte keys
31byte * 8bit * 1key/bit = 248keys
8 years ago
IBNobody fe2aed0d1c Added User Print - A "light" console out option (#8)
User print disables the normal print messages in the body of QMK/TMK
code and is meant as a lightweight alternative to NOPRINT. Use it when
you only want to do a spot of debugging but lack flash resources for
allowing all of the codebase to print (and store their wasteful
strings).
8 years ago
IBNobody 558f3ec1eb Use keyboard config for nkro (#7)
* removing nkro references - wip

* changed NKRO to be defined by keymap_config
8 years ago
IBNobody 16e706214f Change NKRO size fron 16 bytes to 32 bytes. 8 years ago
Fred Sundvik 13f3c73386 Fix the ldflags.txt and obj.txt checks
There was a minor typo, which caused the files to not be generated
and therefore the elf files were always linked.
8 years ago
Fred Sundvik 03b1d142f2 Add -p parameter to mkdir
So that it's created even when there's a deeper structure
8 years ago
Fred Sundvik 42baa6cf43 Disable map file creation when building tests
It causes strange linker warnings on cygwin.
8 years ago
Fred Sundvik c692fd1d55 More common settings for unit tests and keyboards 8 years ago
Fred Sundvik 8a9aac6e32 Rules for compiling and linking google test 8 years ago
Fred Sundvik cff26bc484 Merge branch 'master' into fix_line_endings 8 years ago
Fred Sundvik a5b1af4999 Normalize line endings 8 years ago
Fred Sundvik 2e3834edea Merge remote-tracking branch 'upstream/master' into makefile_overhaul 8 years ago
Jack Humbert a920548471 Merge pull request #677 from SmackleFunky/master
Virtual Serial Port - and a Layout that uses that virtual serial port for Plover
8 years ago
Jason Green 7009112752 move to ergodox-ez only 8 years ago
Fred Sundvik 8f2af3c6bc Merge branch 'master' into makefile_overhaul 8 years ago
Jack Humbert fb4452c2f5 Merge pull request #671 from Talljoe/one-hand
Add native one-handed support
8 years ago
Jason Green 80d10bef07 Added USB Virtual Serial support 8 years ago
Joe Wasson 8090f6b499 Improve one-hand support by adding more actions and tap keys. 8 years ago
Joe Wasson dd37860160 Add one-hand support.
This adds an action, `ACTION_SWAP_HANDS`, that swaps the the keys on the keyboard across a keymap-defined hemisphere in order to support one-hand typing without requiring a separate one-handed layer. See updated `doc/keymap.md` for more information.
8 years ago
Fred Sundvik fd2f957a1a Normalize line endings 8 years ago
Fred Sundvik 48f8ab1ae2 Fix the clean target
It now properly cleans all the outputs
8 years ago
Fred Sundvik 3442e216dc Move bootloader_defs include to build_keyboard
Also fix it for subprojects
8 years ago
Fred Sundvik 9028a412ea Add output specific config file 8 years ago
Fred Sundvik 33fbd3be36 Output specific include paths 8 years ago
Fred Sundvik 3aac4e95c9 More general system for generating several outputs 8 years ago
Fred Sundvik dd8c1a7659 Don't add VERSION as a define
To avoid full recompilation when the git commit hash changes.
8 years ago
Fred Sundvik 60c6e79ecb Move git submodule check and version generation to main Makefile 8 years ago
Fred Sundvik cc2df445ab Remove unneded code from tmk_core/rules.mk 8 years ago
di0ib 8fab141a02 Convert hex to bin
For flashing via alternative methods like LUFA MassStorage bootloader.
8 years ago
Fred Sundvik a0dc622199 Remove the quick commands and add proper clean 9 years ago
Fred Sundvik d5a947b324 Also depend on the gcc version 9 years ago
Fred Sundvik 84bfb19554 Force compilation and linking when options changes 9 years ago
Fred Sundvik e58e9af2ab More reliable .d file generation
Also generated inside the obj dir instead of separate deps folder.
9 years ago
Fred Sundvik f11a0275a8 Enable vpath seraching for source files only 9 years ago
Fred Sundvik bf1c865c7a Speed up ChibiOS keymap compilation
By sharing the external library object files between the whole
keyboard, instead of re-compiling them for each keymap.
9 years ago
Fred Sundvik e01b4c3fd9 Most ergodox keymaps compiles on Infinity
There are linker errors due to missing led funcitonality though
9 years ago
Jack Humbert 16f8426fe2 Merge pull request #573 from algernon/f/make-all-stop-on-error
tmk_core/rules.mk: Make PRINT_ERROR* stop on error
9 years ago
Gergely Nagy dd77054790 tmk_core/rules.mk: Make PRINT_ERROR* stop on error
Instead of `&& false`, explicitly `exit 1` to make the rules using these macros
fail. This fixes #571, and likely breaks Travis badly.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
9 years ago
Joe Wasson f9956c2aac Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled. 9 years ago
Jack Humbert fc9f128648 Merge pull request #522 from exiva/extrakey-macfix
Fix OS X Recognizing keyboard as Mouse/Tablet
9 years ago