Commit Graph

592 Commits (691be16b236a93d2a8d22455d64f6f0f2153fbbd)

Author SHA1 Message Date
Jack Humbert 63c16f4b63
ARM audio fixes, stack size increase (#2365)
* fix up arm audio implementation

* chibios stack size inc

* get one channel working

* update for chibios
2018-02-08 14:39:40 -05:00
Fred Sundvik 30b90de7c9 Send usb wakeup through ChibiOS 2018-02-07 17:16:01 -05:00
Fred Sundvik 6a9617b1c6 Update ChibiOS to 17.6.3 2018-02-07 17:16:01 -05:00
Kenneth Aloysius 9303b42e69 Update personal layouts, free up matrix_scan_user for JJ40 (#2319)
* Add NIU Mini keymap from Planck keymap

* Remove old keymap files

* Fix README, removed Planck references

* Add default layout, move Planck layout to separate folder

* Update README

* Add my XD60 keymap

* Change RShift to slash

* Fix keymap: stuck on MO(1)

* Move RESET to Fn+Enter

* Add: RGB saturation cycle

* Add numpad layer to keymap

* Fix last case

* Cleanup Mechmini keymap. Once the custom RGB function is defined, there is no need to manually handle RGB code.

* Change default to KEYMAP_MIT, not KEYMAP_OFFSET

* Add custom RGB code for JJ40

* Reset Mechmini advertised power draw to 500. Will have to test actual maximum power draw later.

* RGB working on JJ40.

* Fix: saturation increase/decrease flipped

* Add new directory for my custom keymap with RGB keycodes

* Swap LAlt and LGUI

* Update JJ40 max power draw with measured value

* Update: fun40 rules.mk to enable underglow; earlier failed Travis CI

* Fix: init RGB LEDs on boot. Also added HHKB-like keymap for XD60.

* Super rudimentary backlight test, init RGB LEDs on boot

* Backlighting works - stays on for now

* Toggling working

* Now can override backlight.c functions. Problem was functions in backlight.c weren't called before due to a lack of matrix_scan_quantum() in matrix.c

* Timers not working

* Delete global.h

* Cleanup

* Compiles

* Good sign: LEDs stop working again

* Handle timer1 overflow

* Progress: fix: forgot to init

* Backlighting fully working now except breathing.

* Revert keymap to original keycodes

* Update XD60 keymap README

* Update JJ40 keymap with backlight toggles

* Breathing working just fine.

* Update references

* Add backlight_set() call

* Cleanup code to disable backlight

* Fix: does not compile

* Fix: missing call to rgblight_task.

* Testing with BACKLIGHT_BREATHING

* Cleanup

* Cleanup comments

* More commenting cleanup.

* Do not enable BACKLIGHT_BREATHING by default

* Update XD60 keymap

* Update: move matrix_scan_kb out from matrix.c to jj40.c (kb-level)

* Cleanup for PR

* Fix conflict in readme.md for NIU mini

* Restore original power consumption figure

* Fix: matrix_scan_user() now has to be defined in the keymaps

* Add weak `matrix_scan_user` so it does not have to be defined in keymap

* Add weak matrix_init_user()
2018-02-02 01:30:47 -05:00
Erin Call 904b1b3f99 Use perl directly instead of grep -P
BSD grep (the one on OSX) lacks a -P flag. The grep -P command thus
fails and prints a usage message to the terminal. This fixes that.
2018-02-02 01:10:57 -05:00
skullydazed 9bfaf66792
Always copy the firmware file to the root qmk_firmware directory (#2314)
* Always copy the firmware file to the root qmk_firmware directory

* remove circular dependency
2018-01-28 11:11:28 -08:00
Fred Sundvik a14d539ad6 Revert back to normal sleeping wait behaviour for STM32 2018-01-21 01:10:16 -08:00
Fred Sundvik 510a8d3339 Fix compiler settings for MCUs with floating point 2018-01-21 01:10:16 -08:00
Kenneth Aloysius 365b863578 Backlighting for JJ40 and underglow initialisation code (#2260)
* Cleanup Mechmini keymap. Once the custom RGB function is defined, there is no need to manually handle RGB code.

* Change default to KEYMAP_MIT, not KEYMAP_OFFSET

* Add custom RGB code for JJ40

* Reset Mechmini advertised power draw to 500. Will have to test actual maximum power draw later.

* RGB working on JJ40.

* Fix: saturation increase/decrease flipped

* Add new directory for my custom keymap with RGB keycodes

* Swap LAlt and LGUI

* Update JJ40 max power draw with measured value

* Update: fun40 rules.mk to enable underglow; earlier failed Travis CI

* Fix: init RGB LEDs on boot. Also added HHKB-like keymap for XD60.

* Super rudimentary backlight test, init RGB LEDs on boot

* Backlighting works - stays on for now

* Toggling working

* Now can override backlight.c functions. Problem was functions in backlight.c weren't called before due to a lack of matrix_scan_quantum() in matrix.c

* Timers not working

* Delete global.h

* Cleanup

* Compiles

* Good sign: LEDs stop working again

* Handle timer1 overflow

* Progress: fix: forgot to init

* Backlighting fully working now except breathing.

* Revert keymap to original keycodes

* Update XD60 keymap README

* Update JJ40 keymap with backlight toggles

* Breathing working just fine.

* Update references

* Add backlight_set() call

* Cleanup code to disable backlight

* Fix: does not compile

* Fix: missing call to rgblight_task.

* Testing with BACKLIGHT_BREATHING

* Cleanup

* Cleanup comments

* More commenting cleanup.

* Do not enable BACKLIGHT_BREATHING by default
2018-01-18 16:02:32 -05:00
Danny Nguyen fe8942e55c Add -e to enable interpretation of escape characters 2018-01-12 12:35:03 -05:00
Balz Guenat 4931510ad3 backlight breathing overhaul (#2187)
* add breathing to bananasplit

* backlight breathing overhaul

* fix the backlight_tick thing.

* fix for vision_division backlight

* fix a few keymaps and probably break breathing for some weirdly set-up boards.

* remove BL_x keycodes because they made unreasonable assumptions

* some fixes for BL keycodes

* integer cie lightness scaling

* use cie lightness for non-breathing backlight and make breathing able to reach true max brightness
2018-01-01 17:47:51 -05:00
fauxpark b3bcafcc4b Unsign key argument in add_key_to_report 2017-12-19 09:25:26 -05:00
Colin T.A. Gray bad839e6ac make 'layer_state_set' visible to user code 2017-12-15 13:23:30 -05:00
Colin T.A. Gray 3aec9a4354 fixes 'layer_state_cmp' when layer is '1' (aka layer 0, aka layer 1<<0) 2017-12-15 13:23:30 -05:00
Colin T.A. Gray 1620d78e73 helper to compare current layer_state to user layer
Performs the same bit comparison that the layer_move
functions perform
2017-12-08 16:09:47 -05:00
Jack Humbert 9fdc276260
Updates bootloader settings, adds file size check (#2029)
* pull fuse settings for bootloader jump

* fix 32a chips

* make automatic bootloader selection optional

* quantify bootloaders

* fixs #164, speeds up dfu reset

* fix for chips w/o usb

* missing an n

* fix bootloader sizes, use words for addresses

* fix bmini, pearl, and [[ issue, make things quiet

* ignore avr errors on arm for now

* update settings for the light

* document bootloader stuff

* add bootloader title
2017-11-27 23:08:21 -05:00
Colin T.A. Gray 3e2fd64279 I found a typo! 2017-11-22 11:40:46 -05:00
Seebs 39d3d92364 Allow multiple process_record() calls per scan
This is particularly relevant for, e.g., the ergodox EZ and
other keyboards with slow scan rates. Without changing the API or
behavior of individual process_record() calls, we allow a
configuration flag to make multiple calls in a single scan.

This will probably have miniscule effects on non-steno users,
and it's not enabled by default for any keyboards. Added note
about it to ergodox README.

Signed-off-by: seebs <seebs@seebs.net>
2017-11-21 00:20:52 -05:00
Jack Humbert f5a9758cea
Adds serial number string to USB descriptors (#1996)
* add serial number string to usb descriptors

* better name for serial number
2017-11-17 11:53:46 -05:00
Jack Humbert ec3e065f0d
QMK DFU bootloader generation (#2009)
* adds :bootloader target

* update planck and preonic revisions

* remove references to .h files for planck

* update preonic keymap

* only add keyboard.h files that exist

* add production target

* hook things up with the new lufa variables

* update rules for planck/preonic

* back backlight key turn of status led when pressed

* add manufacturer/product strings to bootloader
2017-11-14 16:11:29 -05:00
Takayuki Matsubara 27ee425892 add pgm_read_dword for Infinity ErgoDox
avoid the following error when `UNICODEMAP_ENABLE = yes`:

```
quantum/process_keycode/process_unicodemap.c:52:21: error: implicit declaration of function 'pgm_read_dword'
```
2017-11-06 12:09:54 -05:00
Jack Humbert cf9f6bbd91 adds per-layer rgb color option to ez 2017-11-06 08:38:36 -05:00
Jack Humbert fe56fffe7d
Adds .qmk file type as a target for QMK Toolbox (#1084)
* adds .qmk file type as a target

* adds info.json with vendor and product

* add files for qmk info script

* add layout file for planck

* ignore .qmk files

* more settings

* update rules for avr and chibios

* update .qmk generation for info.json and inheritence
2017-11-01 20:01:45 -04:00
Rob Rogers 2d77f9cbb9 Fix pointing device feature 2017-10-31 20:59:55 -04:00
tsankuanglee 04b9b62bdc RETRO_TAPPING (#1922)
* add RETRO_TAP: tap anyway, even after TAP_TERM, if no interruption

* consistent variable name

* add option doc

* change name for consistency

* make RETRO_TAPPING default to off
2017-10-31 11:15:22 -04:00
Takayuki Matsubara 7b65b7e948 fix Logical Maximum to be recognized as 255 instead of -1
SEE ALSO: https://github.com/qmk/qmk_firmware/issues/312
2017-10-31 11:12:06 -04:00
Phil Hagelberg 0f5928fdf4 Fix avrdude message to not mention any specific device model. 2017-10-16 09:54:17 -10:00
Benjamin Dengler ba4b3d9d72 Added BLE support for USB-USB converter. (#1824)
* Added BLE support to USB-USB converter

* Added readme

* Removed images and Makefile
2017-10-15 15:04:03 -10:00
Jack Humbert 800ec55dfc Make arguments redo, subproject elimination (#1784)
* redo make args to use colons, better folder structuring system [skip ci]

* don't put spaces after statements - hard lessons in makefile development

* fix-up some other rules.mk

* give travis a chance

* reset KEYMAPS variable

* start converting keyboards to new system

* try making all with travis

* redo make args to use colons, better folder structuring system [skip ci]

* don't put spaces after statements - hard lessons in makefile development

* fix-up some other rules.mk

* give travis a chance

* reset KEYMAPS variable

* start converting keyboards to new system

* try making all with travis

* start to update readmes and keyboards

* look in keyboard directories for board.mk

* update visualizer rules

* fix up some other keyboards/keymaps

* fix arm board ld includes

* fix board rules

* fix up remaining keyboards

* reset layout variable

* reset keyboard_layouts

* fix remainging keymaps/boards

* update readmes, docs

* add note to makefile error

* update readmes

* remove planck keymap warnings

* update references and docs

* test out tarvis build stages

* don't use stages for now

* don't use stages for now
2017-10-14 11:32:19 -10:00
Jesper Brix Rosenkilde 966e2660cf Add option to reverse PS2 mouse axes and scrolling 2017-10-10 07:20:17 -10:00
Joe Martin b91ffba4be #1792 added in waits from tmk for locking switches
fixes #1792
2017-10-10 07:15:41 -10:00
Snipeye ee13228486 Generic Pointing Device (#1767) 2017-10-06 07:13:08 -10:00
Fred Sundvik 25285a1c5a Don't process keycodes on the slave 2017-09-30 06:22:02 -10:00
skullydazed 5fd68266f5 Clueboard 60% support (#1746)
* initial clueboard_60 support

* LED lighting support

* fix the clueboard->clueboard_66 rename

* Add layout support to clueboard_60

* Fix the 60_iso layout so it's actually iso

* add a default keymap for AEK layout

* fix clueboard_17

* Fixup the ISO layouts

* Fix the `wait_ms()/wait_us()` definitions for chibios

* Fix up the wait_ms/wait_us hack. Reduce stack size.

* Add a missing #include "wait.h"

* commit files that should have already been comitted
2017-09-29 16:17:30 -07:00
Wilba6582 85c3c5926c Force Raw HID interface number to 1 always (#1669) 2017-09-06 10:33:00 -07:00
Jack Humbert ba2ad57ca8 add rule shortcut via @samwho's suggesion 2017-08-27 12:53:35 -04:00
Jack Humbert 677b89768b add bin targets - closes #1648, fixes #1647 2017-08-27 12:11:59 -04:00
Jack Humbert c3c07eff51 update building for .hex, secrets moving 2017-08-21 21:57:46 -04:00
Joe Wasson bae1144a9f Fix compilation error when NO_ACTION_LAYER is defined. 2017-08-20 11:51:57 -04:00
Joe Wasson bdc0880ca5 Add compile error if too many endpoints are defined for the ATmega32U4. 2017-08-20 11:51:57 -04:00
Danny Nguyen 71d1c02a9b Add message to avrdude script that it can't used within WSL currently 2017-08-16 20:47:43 -04:00
Balz Guenat 5bff9d6181 cleanup usb-usb converter code 2017-08-15 23:14:41 -04:00
Balz Guenat 2aa5e44640 some major steps toward making the usb-usb converter work 2017-08-15 23:14:41 -04:00
Martin Sandiford c622423668 Remove floating point calculation in mouse move. Saves approx 650 bytes if no other floating point used. 2017-08-15 19:51:06 -04:00
That-Canadian 26650731d1 Added "EECONFIG_HANDEDNESS" to the eeconfig.h , because when RGB was enabled it was overwritting the old EECONFIG_HANDEDNESS address (10), so it is now on a non-conflicting addres (14).
Updated MiniDox split_util.h and eeprom files to reflect this change.

I recommend adding this to any split board that used these files, my changes will not effect them currently.
2017-08-13 14:24:04 -04:00
Jack Humbert 26d348b6d1 move version info to the top of the output 2017-08-08 16:06:45 -04:00
Jack Humbert 5210f94a56 add version to make output 2017-08-08 16:06:45 -04:00
Danny Nguyen e0caf94323 Move avrdude flashing script from individual keyboard rules.mk to common location and improve script.
Port detection script is now more informative and better handles first time flashing of a Pro Micro
2017-08-03 20:56:21 -04:00
Joe Wasson f30f12ec81 Add support for GeminiPR steno protocol.
This protocol breaks out "duplicate" keys into their own entry in the packet so that more complicated logic can be done on the software side, including support for additional languages and alternative theories.
2017-07-27 16:10:36 -04:00
Jack Humbert 6ed8ce4f59 Merge pull request #1491 from fredizzimo/msys2
Add support for msys2 build environment
2017-07-13 14:24:26 -04:00
Fred Sundvik 7f67abd7d7 Fix bitfield problem when compiling in native mingw 2017-07-11 22:05:01 +03:00
Jack Humbert 42d5a324eb Start mvoing hardware drivers to /drivers/ (#1433)
* start driver isolation

* update nyquist and orthodox boards

* update atreus62

* move drivers to avr

* update avr conditional
2017-07-10 11:18:47 -04:00
Fred Sundvik ba405cfbb4 Don't search for TEENSY_LOADER_CLI if it's already defined 2017-07-10 09:00:18 -04:00
Fred Sundvik 7ea8753b72 Don't run dfu-programmer unless specified as a target
This introduces a grep dependency, which I believe we didn't have
before, but it should be available and installed by default on all the
supported systems.
2017-07-10 09:00:18 -04:00
Fred Sundvik 4087d6da0d Add wait support for tests 2017-07-08 21:59:51 -04:00
Fred Sundvik 4e69a8bda6 Add basic timing support, and SFT_T tests
Also expose some bugs...
2017-07-08 21:59:51 -04:00
Jack Humbert 4b37030ad0 update lufa implementation 2017-07-07 12:06:59 -04:00
Jack Humbert 39ece81979 delete old lufa 2017-07-07 11:56:51 -04:00
Jack Humbert 23df3016e8 Merge pull request #1405 from cquiroz/oneshot-mods-timeout
Oneshot mods timeout
2017-06-20 11:40:10 -04:00
Fred Sundvik 0f163c0028 Add todo to timer.c 2017-06-19 00:24:32 +03:00
Fred Sundvik 6a76192fa4 Fix problems with undefined inlines in debug mode 2017-06-18 21:22:22 +03:00
Fred Sundvik fb95d86b39 Move functions for adding keys from to reports to report.h 2017-06-18 21:22:22 +03:00
Fred Sundvik 017458a07b Move functionality from action_util to report
The functions also takes report_kebyoard_t parameters, so that they can
be used elsewhere.
2017-06-18 21:22:22 +03:00
Fred Sundvik c588fca06c Empty bootloader_jump 2017-06-18 21:22:22 +03:00
Fred Sundvik d29906cb64 Emulate eeprom 2017-06-18 21:10:42 +03:00
Fred Sundvik f646f00b93 Rename native to test 2017-06-18 21:10:42 +03:00
Fred Sundvik 83509adc3a Add empty timer functions 2017-06-18 21:10:42 +03:00
Fred Sundvik 26eb97a4a8 Empty implementation of bootloader, suspend and timer 2017-06-18 21:10:42 +03:00
Fred Sundvik fdfd48e8c8 Fix program mem functionality 2017-06-18 21:10:42 +03:00
Fred Sundvik efaf0e830b Empty implementation of wait 2017-06-18 21:10:42 +03:00
Carlos Quiroz 74d752b531 Remove noisy debug line 2017-06-18 12:17:51 -04:00
Carlos Quiroz 3ab0f4d9e5 Deactivate oneshot mods once timedout 2017-06-18 12:17:51 -04:00
Jack Humbert 51a86b85f3 Merge pull request #1361 from fredizzimo/ergodox_infinity_backlight
Add Ergodox Infinity backlight support
2017-06-18 10:15:02 -04:00
Fred Sundvik ec88a0b3cc Make sure that the backlight level is within the right range 2017-06-16 02:05:38 +03:00
Adam Bell 4ab61344f5 Adding permissive_hold 2017-06-03 10:28:46 -04:00
Jack Humbert 4549b0417e Merge pull request #1342 from priyadi/adafruit-mouse-buttons
Adafruit Feather BLE / BLE Friend mouse buttons support
2017-05-30 12:10:45 -04:00
Jack Humbert b6c60333e4 Re-enable mouse buttons 2017-05-29 13:21:38 -04:00
Priyadi Iman Nurcahyo f0fc2db4e2 Adafruit Feather BLE / BLE Friend mouse buttons support 2017-05-29 18:17:21 +07:00
Jack Humbert 453877422b Merge pull request #1327 from Dbroqua/master
Added Integration of IBM Trackpoint
2017-05-26 18:32:43 -04:00
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
2017-05-26 21:58:43 +01:00
dbroqua 81e85a1a4e - Added integration of IBM Trackpoint 2017-05-26 20:35:31 +02:00
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.
2017-05-19 17:24:47 -07:00
Jeremiah 25c6ca750f added comments and made function name clearer 2017-05-14 15:36:44 -07:00
Jeremiah 84395e8a04 whoops 2017-05-14 09:36:50 -07:00
Jeremiah b9b2244b82 faster, less bits :) 2017-05-14 08:01:01 -07:00
Jeremiah 63d9698d5c faster and less bits... again 2017-05-13 19:07:05 -07:00
Jeremiah 37f6f92765 faster and less bits 2017-05-13 18:24:43 -07:00
Jeremiah 7b7e285a98 should be using matrix_row_t 2017-05-13 17:22:38 -07:00
Jeremiah acd3e97b83 a bit smaller 2017-05-13 17:01:27 -07:00
Jeremiah 99877cdff3 a bit smaller 2017-05-13 16:57:23 -07:00
Jeremiah b9895771ed improvements 2017-05-13 13:19:28 -07:00
Jeremiah 849ed5a6a0 anti-ghost improvement for older keyboards with empty spots in matrix 2017-05-13 08:51:20 -07:00
Nephiel bd2c0b9648 Call led_set for layer action events to update LEDs on layer changes 2017-05-10 19:26:39 +02:00
Fred Sundvik 18b4d24cc3 Add possibility to override the command to execute when flashing 2017-04-29 23:45:27 +03:00
Fred Sundvik d68294615f Add make option for allowing warnings 2017-04-13 16:12:55 +03:00
Fred Sundvik 07fc34e962 Fix warnings when ACTION_ONESHOT is disabled 2017-04-13 16:00:29 +03:00
Fred Sundvik abda6ff7bb Include host.h from suspend.c 2017-04-13 16:00:29 +03:00
Fred Sundvik 737c1fe641 Make MOUSEKEY_MOVE_MAX and MOUSEKEY_WHEEL_MAX configurable
Kitten_paw/ickerwx was doing that
2017-04-13 16:00:29 +03:00
Fred Sundvik f39e9928eb Enable warnings as errors 2017-04-13 16:00:29 +03:00
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
2017-04-09 18:34:59 +03:00
Jack Humbert 3448d5d487 Merge pull request #1132 from akatrevorjay/pr/dfu-serial
Allow to specify serial to dfu-util flash
2017-03-31 18:28:26 -04:00
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.
2017-03-30 19:08:15 -07:00
Zay950 2366ebfbbd Merge branch 'master' into to_push 2017-03-29 12:00:38 -07:00
Jack Humbert 7e37daa2ce Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes
Flesh out MIDI support
2017-03-28 09:26:54 -04:00
Jack Humbert 216f669276 Merge pull request #1098 from lambdalisue/tapping-force-hold
Add TAPPING_FORCE_HOLD to regulate behaviour
2017-03-28 09:24:22 -04:00
Travis La Marr 43eee52cba Add BLE and EZKey module defines.
Also restored serial init back to original location. Was getting junk data.
2017-03-24 17:14:57 -04:00
Travis La Marr b4ac0598fa Readd bluetooth output direction on standard key input. 2017-03-24 15:55:02 -04:00
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.
2017-03-24 12:53:55 -04:00
Trevor Joynson (trevorj) 515b4dd1f7 Allow to specify serial to dfu-util flash 2017-03-02 18:26:26 -08:00
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
2017-02-25 15:02:43 -08:00
Phong Nguyen d0b4dcc82c Removes redundant {} which cause build failure when DEBUG_ACTION is set 2017-02-25 19:50:46 +07:00
Gabriel Young dd8f8e6bae implement modulation 2017-02-19 16:43:02 -08:00
Gabriel Young e405ab4bc6 initial implementation of polyphony using variable length array of notes on 2017-02-19 16:41:59 -08:00
Jack Humbert 7bef285553 Merge pull request #1101 from priyadi/layer_state_set_kb
Add weak layer_state_set_kb hook
2017-02-14 21:33:04 -05:00
Priyadi Iman Nurcahyo bd8d717f1f Fix bug fix attempt 2017-02-15 05:25:08 +07:00
Priyadi Iman Nurcahyo d96175937b Bug fix & added default_layer_state_set_kb 2017-02-15 05:20:15 +07:00
Priyadi Iman Nurcahyo d369bfb83a Add layer_state_set_kb hook 2017-02-15 05:02:15 +07:00
lambdalisue 64f9779fe5 Add TAPPING_FORCE_HOLD to regulate behaviour
See #889 for the detail.
2017-02-14 14:12:54 +09:00
Priyadi Iman Nurcahyo c68e596f32 Implement faux-clicky feature 2017-02-13 08:03:07 +07:00
Priyadi Iman Nurcahyo aaa58a8d79 Supress warnings from ps2_mouse.h 2017-02-12 00:13:36 +07:00
Jack Humbert 42ea912fde Merge pull request #1062 from luizribeiro/fix-win
Fix V-USB bug on Windows 10
2017-02-07 13:49:10 -05:00
Jack Humbert c0c69a1a7c Merge pull request #1068 from adzenith/master
Minor cleanup
2017-02-07 13:27:41 -05:00
Jack Humbert 3c7fa0acc1 Merge pull request #1046 from LukeSilva/master
Add Tapping Macros to QMK
2017-02-07 13:18:47 -05:00
Jack Humbert 0c2b6951a6 Merge pull request #1057 from priyadi/selectable_output
Implement runtime selectable output (USB or BT)
2017-02-07 13:12:29 -05:00
Jack Humbert b6ffda4849 Merge pull request #1010 from SjB/oneshot_timeout_fix
oneshot timeout would only timeout after an event.
2017-02-06 18:57:23 -05:00
Nikolaus Wittenstein 06d21009b2 Minor cleanup 2017-02-05 19:55:27 -05:00
Luiz Ribeiro a3da586505 Fix V-USB bug on Windows 10 2017-02-01 21:57:44 -05:00
Priyadi Iman Nurcahyo 98f9a2e6df Fix wrong include 2017-02-01 20:18:52 +07:00
Priyadi Iman Nurcahyo 2bef8b5b88 Limit outputselect to AVR only for now 2017-02-01 19:37:52 +07:00
Priyadi Iman Nurcahyo 72e95809a1 Move outputselect to parent dir to satisfy non LUFA keyboards 2017-02-01 17:55:13 +07:00
Priyadi Iman Nurcahyo d8a9c63c26 Implement runtime selectable output (USB or BT) 2017-02-01 05:07:05 +07:00
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
2017-01-29 13:01:47 -05:00
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.
2017-01-28 18:42:35 +11:00
Luke Silva 87bc36253d Fix documentation for TMK actions 2017-01-26 22:44:22 +11:00
Jack Humbert 71137deba2 Merge pull request #1014 from SjB/lcd_mods_status
added mods status bit to visualizer.
2017-01-24 00:34:55 -05:00
Luiz Ribeiro 9ce38cbccf Simplified and polished a bit the code changes on tmk_core 2017-01-21 17:18:05 -05:00
Luiz Ribeiro f7462aaa61 Got ps2avrGB to work with the V-USB protocol 2017-01-21 12:55:19 -05:00
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.
2017-01-17 21:57:32 -05:00
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.
2017-01-15 23:29:24 -05:00
Jack Humbert 460bf008f5 Merge pull request #973 from Wilba6582/keycode_refactor
Keycode refactor
2016-12-30 11:07:17 -05:00
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
2016-12-29 12:13:30 +02:00
Wilba6582 d8a608f3ff Keycode refactor 2016-12-29 18:28:48 +11:00
Wilba6582 a305da2bc9 Fixes issue #900 2016-12-20 02:46:50 +11:00
Kyle Smith 83e613ad23 Allow power consumption to be set per-keyboard. 2016-12-14 23:29:33 -05:00
Jack Humbert f2e5ca25db Merge pull request #944 from priyadi/negmousefix
Allow negative values for mouse movements
2016-12-12 00:46:59 -05:00
Priyadi Iman Nurcahyo 434b286032 Allow negative values for mouse movements 2016-12-10 19:40:44 +07:00
Priyadi Iman Nurcahyo 901f29e3aa The adafruit BLE C++ code requires -std=c++11 2016-12-10 04:08:08 +07:00
Jack Humbert c87d039839 Merge pull request #921 from Wilba6582/raw_hid
Initial version of Raw HID interface
2016-12-05 00:13:37 -05:00
Priyadi Iman Nurcahyo 07d29b7d29 syntax error fix 2016-12-05 01:22:40 +07:00
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.
2016-12-05 01:21:17 +07:00
Jack Humbert d0c667c790 Merge pull request #931 from OferPlesser/feature/improve-ps2-mouse
Improving ps/2 mouse
2016-12-03 10:13:11 -05:00
Ofer Plesser f0768f8be9 Forgot to use define in delay instead of hardcoded number 2016-12-03 13:41:56 +02:00
Ofer Plesser 9f41544e1d Added back PS2_MOUSE_INIT_DELAY define 2016-12-03 13:09:42 +02:00
ofples d639e08a31 Refactored and improved ps2 mouse feature 2016-12-03 13:05:02 +02:00
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.
2016-12-02 22:46:23 -08:00
Jack Humbert 78f8fe361f Merge pull request #915 from wez/ble_3
Add support for Adafruit BLE modules
2016-12-02 13:14:04 -05:00
Jack Humbert ead68248c5 Merge pull request #913 from wez/ble_1
Tidy up atomicity in timer.c and ring_buffer.h
2016-12-02 13:12:19 -05:00
Wilba6582 fe001d46fd Initial version of Raw HID interface 2016-12-01 00:44:54 +11:00
Jack Humbert 6e0f994950 Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7 2016-11-28 23:51:07 -05:00
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.
2016-11-27 23:49:44 -08:00
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.
2016-11-27 22:58:34 -08:00
Jack Humbert 7edac212c8 separated into api files/folder 2016-11-26 15:38:44 -05:00
Jack Humbert 7a1eca784f Merge pull request #903 from priyadi/ps2_init_delay
Make PS2 init delay configurable.
2016-11-26 01:34:49 -05:00
Priyadi Iman Nurcahyo 9a071f051c Make PS2 init delay configurable. Some devices are not fully powered up
after 1s.
2016-11-26 13:24:53 +07:00
Jack Humbert f25596b8dc rgblight fixes 2016-11-23 21:28:12 -05:00
Jack Humbert cefa8468fb travis pls 2016-11-23 20:16:38 -05:00
Jack Humbert 2e23689b8e converted to new format 2016-11-23 18:52:02 -05:00
Wilba6582 cf3926a8e1 Fixed NO_SUSPEND_POWER_DOWN handling 2016-11-23 19:45:50 +11:00
Jack Humbert 3d7aaa31e4 converted to 8bit messages 2016-11-23 00:30:06 -05:00
Wilba6582 5893f0fa1f Fixed NO_SUSPEND_POWER_DOWN handling 2016-11-23 16:22:57 +11:00
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
2016-11-22 18:41:37 -05:00
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
2016-11-22 22:12:57 +01:00
Jack Humbert 6390033e86 cleaning up midid 2016-11-21 20:14:16 -05:00
Jack Humbert 664c0a036b cleaning up new code 2016-11-21 19:50:55 -05:00
Jack Humbert 27ebacb15d merging lets_split 2016-11-21 19:18:47 -05:00
Jack Humbert c1037b1dc0 working with helper, qmk_helper_windows@05b0105 2016-11-21 18:05:06 -05:00
Jack Humbert b57cf3c0c8 more structure to the package 2016-11-21 12:54:06 -05:00
Jack Humbert 161bd5596b midi back and forth 2016-11-18 22:22:24 -05:00
Jack Humbert 3774a7fcda rgb light through midi 2016-11-17 17:42:14 -05:00
Jack Humbert 530dd3377e animations, midi, etc 2016-11-15 13:18:10 -05:00
Jack Humbert e9f7487518 mostly working 2016-11-13 23:02:38 -05:00
Zach Nielsen 59bef40aab Keep unicode's input_mode through a power cycle 2016-11-10 12:14:54 -08:00
IBNobody 4c6960835c Refactoring Matrix scanning 2016-10-28 16:24:20 -05:00
IBNobody 508eddf8ba Fixing Debounce - WIP 2016-10-28 14:21:38 -05:00
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.
2016-10-23 23:00:43 -05:00
IBNobody 78767bf208 Fix #770, Fix #779 2016-09-28 20:26:41 -05:00
Didier Loiseau d430999047 Fix issue #772 Meh and Hyper not working 2016-09-23 01:20:49 +02:00
IBNobody cb1ac2a3ed Fixed NO_PRINT / USER_PRINT conflict warning. 2016-09-12 20:20:31 -05:00
shela e25ae23287 fix number of NKRO keys
32byte report = 1byte modifiers + 31byte keys
31byte * 8bit * 1key/bit = 248keys
2016-09-10 23:47:33 +09:00
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).
2016-09-07 23:50:58 -05:00
IBNobody 558f3ec1eb Use keyboard config for nkro (#7)
* removing nkro references - wip

* changed NKRO to be defined by keymap_config
2016-09-06 23:19:01 -05:00
IBNobody 16e706214f Change NKRO size fron 16 bytes to 32 bytes. 2016-09-06 14:59:12 -05:00
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.
2016-09-04 23:26:49 +03:00
Fred Sundvik 03b1d142f2 Add -p parameter to mkdir
So that it's created even when there's a deeper structure
2016-08-27 21:57:49 +03:00
Fred Sundvik 42baa6cf43 Disable map file creation when building tests
It causes strange linker warnings on cygwin.
2016-08-27 21:57:49 +03:00
Fred Sundvik c692fd1d55 More common settings for unit tests and keyboards 2016-08-27 21:57:49 +03:00
Fred Sundvik 8a9aac6e32 Rules for compiling and linking google test 2016-08-27 21:57:49 +03:00
Fred Sundvik cff26bc484 Merge branch 'master' into fix_line_endings 2016-08-27 21:01:46 +03:00
Fred Sundvik a5b1af4999 Normalize line endings 2016-08-27 18:40:50 +03:00
Fred Sundvik 2e3834edea Merge remote-tracking branch 'upstream/master' into makefile_overhaul 2016-08-24 10:37:02 +03:00
Jack Humbert a920548471 Merge pull request #677 from SmackleFunky/master
Virtual Serial Port - and a Layout that uses that virtual serial port for Plover
2016-08-23 11:05:26 -04:00
Jason Green 7009112752 move to ergodox-ez only 2016-08-23 07:04:55 +00:00
Fred Sundvik 8f2af3c6bc Merge branch 'master' into makefile_overhaul 2016-08-23 09:38:05 +03:00
Jack Humbert fb4452c2f5 Merge pull request #671 from Talljoe/one-hand
Add native one-handed support
2016-08-23 00:29:46 -04:00
Jason Green 80d10bef07 Added USB Virtual Serial support 2016-08-23 04:16:35 +00:00
Joe Wasson 8090f6b499 Improve one-hand support by adding more actions and tap keys. 2016-08-20 17:46:53 -07:00
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.
2016-08-20 17:46:53 -07:00
Fred Sundvik fd2f957a1a Normalize line endings 2016-08-20 17:59:18 +03:00
Fred Sundvik 48f8ab1ae2 Fix the clean target
It now properly cleans all the outputs
2016-08-20 12:44:04 +03:00
Fred Sundvik 3442e216dc Move bootloader_defs include to build_keyboard
Also fix it for subprojects
2016-08-20 03:56:42 +03:00
Fred Sundvik 9028a412ea Add output specific config file 2016-08-20 03:56:41 +03:00
Fred Sundvik 33fbd3be36 Output specific include paths 2016-08-20 03:56:40 +03:00
Fred Sundvik 3aac4e95c9 More general system for generating several outputs 2016-08-20 03:56:39 +03:00
Fred Sundvik dd8c1a7659 Don't add VERSION as a define
To avoid full recompilation when the git commit hash changes.
2016-08-20 03:56:33 +03:00
Fred Sundvik 60c6e79ecb Move git submodule check and version generation to main Makefile 2016-08-20 03:56:32 +03:00
Fred Sundvik cc2df445ab Remove unneded code from tmk_core/rules.mk 2016-08-20 03:56:31 +03:00
di0ib 8fab141a02 Convert hex to bin
For flashing via alternative methods like LUFA MassStorage bootloader.
2016-08-07 20:58:59 -10:00
Fred Sundvik a0dc622199 Remove the quick commands and add proper clean 2016-07-31 14:17:32 +03:00
Fred Sundvik d5a947b324 Also depend on the gcc version 2016-07-31 13:49:04 +03:00
Fred Sundvik 84bfb19554 Force compilation and linking when options changes 2016-07-31 13:42:04 +03:00
Fred Sundvik e58e9af2ab More reliable .d file generation
Also generated inside the obj dir instead of separate deps folder.
2016-07-31 13:36:30 +03:00
Fred Sundvik f11a0275a8 Enable vpath seraching for source files only 2016-07-31 13:24:25 +03:00
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.
2016-07-29 21:09:30 +03:00
Fred Sundvik e01b4c3fd9 Most ergodox keymaps compiles on Infinity
There are linker errors due to missing led funcitonality though
2016-07-29 20:48:20 +03:00
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
2016-07-28 16:32:37 -04:00
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>
2016-07-27 08:53:05 +02:00
Joe Wasson f9956c2aac Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled. 2016-07-24 12:56:28 -07:00
Jack Humbert fc9f128648 Merge pull request #522 from exiva/extrakey-macfix
Fix OS X Recognizing keyboard as Mouse/Tablet
2016-07-21 20:57:54 -04:00
Travis La Marr d48a4cf1eb Fix OS X Recognizing keyboard as Mouse/Tablet
Modified the LUFA USB HID Descriptor to change the logical/usage
minimums for System Control from 0x01 (Mouse) to 0x81 (System Power
Down), this fixes OS X recognizing the Planck as having a mouse and
tablet, even with mousekeys off.
2016-07-15 10:41:32 -04:00
Travis La Marr 0b8c448b30 Make DFU wait for bootloader
Added a loop for waiting for the keyboard to be put in bootloader mode,
rather than failing out. Makes building keymaps easier.
2016-07-15 10:28:23 -04:00
Fred Sundvik 6911ead027 Use order only prerequisites to avoid re-linking
The prerequisites at the start of the build process are order-only
so that the trget don't link again. Also added as a dependency to
the compilation to force the messages to be printed at the start
2016-07-08 23:19:48 +03:00
Fred Sundvik e8e300d5c4 Fix name of makefile dep files
The files can't start with a .dot, as the wildcard function wont
find them. So this is fixed by removing the BUILD_DIR from the
name.
2016-07-08 22:59:09 +03:00
Fred Sundvik 1e3db59097 Fix the link target 2016-07-08 18:18:33 +03:00
Fred Sundvik ccebceeb6f Don't run git describe for ever file that is built 2016-07-08 17:44:41 +03:00
Fred Sundvik b86b0480d5 Speed up compilation by not using recusive make
The cleaning is done outside the targets, by checking the
requested target name.
2016-07-08 17:20:37 +03:00
Fred Sundvik a2eae81927 Fix IS_CONSUMER macro 2016-07-07 20:04:27 +03:00
Fred Sundvik 0bfb608615 Remove unhandled KC_BTLD, RESET should be used instead 2016-07-07 19:56:55 +03:00
Jack Humbert ad43d450ca Merge pull request #490 from fredizzimo/integrate_visualizer
Integrate visualizer for ChibiOS and Infinity Ergodox
2016-07-07 09:59:33 -04:00
Fred Sundvik bcbd8f1c50 Add suspend support to the ChibiOS visualizer 2016-07-07 14:22:45 +03:00
Fred Sundvik 7229751ba9 Fix visualizer crash at startup
Visualizer and serial link initialized in the wrong order.
The LED_ENABLED define wasn't set properly
uGfx is always initialized
2016-07-07 14:01:20 +03:00
Fred Sundvik 07d0d5cbe4 Makefile fixes and update of Visualizer 2016-07-07 12:46:10 +03:00
Jack Humbert a4bf46f9b1 default keymap, reset sorted out for now, added serial to makefile 2016-07-06 22:48:19 -04:00
Jack Humbert c88207884b Merge branch 'master' into lets-split-support 2016-07-06 18:05:50 -04:00
Fred Sundvik e5726b017a Add setting of the master side to the makefile 2016-07-06 16:06:53 +03:00
Fred Sundvik 4b45deb652 Enable serial_link support for ChibiOS 2016-07-06 16:06:53 +03:00
Jack Humbert 22ad6459b1 Merge branch 'master' into lets-split-support 2016-07-05 23:40:58 -04:00
Jack Humbert d707738616 i2c working 2016-07-05 23:27:10 -04:00
Fred Sundvik f9a6e34c28 Add dfu-util command for programming
Also add .bin generation, which is needed for dfu-util.
2016-07-05 19:28:17 +03:00
Jack Humbert 8e88d55bfd reverts #343 for the most part (#474) 2016-07-04 11:45:58 -04:00
fredizzimo 1b319151aa Add warning when submodules are not updated (#469)
* Add warning when submodules are not updated

* Sh compatible syntax for dirty submodule check
2016-07-01 21:57:59 -04:00