Commit Graph

289 Commits (3a1ee48cda5f185ebb3a4f989b389edf029992bb)

Author SHA1 Message Date
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 8 years ago
Fred Sundvik d5a947b324 Also depend on the gcc version 8 years ago
Fred Sundvik 84bfb19554 Force compilation and linking when options changes 8 years ago
Fred Sundvik e58e9af2ab More reliable .d file generation
Also generated inside the obj dir instead of separate deps folder.
8 years ago
Fred Sundvik f11a0275a8 Enable vpath seraching for source files only 8 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.
8 years ago
Fred Sundvik e01b4c3fd9 Most ergodox keymaps compiles on Infinity
There are linker errors due to missing led funcitonality though
8 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
8 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>
8 years ago
Joe Wasson f9956c2aac Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled. 8 years ago
Jack Humbert fc9f128648 Merge pull request #522 from exiva/extrakey-macfix
Fix OS X Recognizing keyboard as Mouse/Tablet
8 years ago
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.
8 years ago
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.
8 years ago
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
8 years ago
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.
8 years ago
Fred Sundvik 1e3db59097 Fix the link target 8 years ago
Fred Sundvik ccebceeb6f Don't run git describe for ever file that is built 8 years ago
Fred Sundvik b86b0480d5 Speed up compilation by not using recusive make
The cleaning is done outside the targets, by checking the
requested target name.
8 years ago
Fred Sundvik a2eae81927 Fix IS_CONSUMER macro 8 years ago
Fred Sundvik 0bfb608615 Remove unhandled KC_BTLD, RESET should be used instead 8 years ago
Jack Humbert ad43d450ca Merge pull request #490 from fredizzimo/integrate_visualizer
Integrate visualizer for ChibiOS and Infinity Ergodox
8 years ago
Fred Sundvik bcbd8f1c50 Add suspend support to the ChibiOS visualizer 8 years ago
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
8 years ago
Fred Sundvik 07d0d5cbe4 Makefile fixes and update of Visualizer 8 years ago
Jack Humbert a4bf46f9b1 default keymap, reset sorted out for now, added serial to makefile 8 years ago
Jack Humbert c88207884b Merge branch 'master' into lets-split-support 8 years ago
Fred Sundvik e5726b017a Add setting of the master side to the makefile 8 years ago
Fred Sundvik 4b45deb652 Enable serial_link support for ChibiOS 8 years ago
Jack Humbert 22ad6459b1 Merge branch 'master' into lets-split-support 8 years ago
Jack Humbert d707738616 i2c working 8 years ago
Fred Sundvik f9a6e34c28 Add dfu-util command for programming
Also add .bin generation, which is needed for dfu-util.
8 years ago
Jack Humbert 8e88d55bfd reverts #343 for the most part (#474) 8 years ago
fredizzimo 1b319151aa Add warning when submodules are not updated (#469)
* Add warning when submodules are not updated

* Sh compatible syntax for dirty submodule check
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 a8b55f8c85 Test all subprojects with travis (#464)
* tests all subprojects

* too many paren
9 years ago
Jack Humbert 2d80eee6b8 test handwired boards 9 years ago