Archived
1
0
Commit Graph

309 Commits

Author SHA1 Message Date
Rowan Decker
2922fce0f7 Merge remote-tracking branch 'upstream/master' 2015-03-08 20:17:39 -07:00
Rowan Decker
1392571bd7 Fix whitespace
Use a consistent standard - Tabs in front for indenting, spaces after for anything else. This way everything stays nice and lined up while also letting users change there prefered indent level. Most of the new files from Haata where already in this format.
2015-03-08 18:40:01 -07:00
Jacob Alexander
aeaaaaa468 Merge pull request #25 from smasher816/master
Set DFU bootloader name
2015-03-08 17:33:29 -07:00
Rowan Decker
a6fdeb47ea Merge branch 'master' of https://github.com/smasher816/controller 2015-03-08 17:29:25 -07:00
Rowan Decker
ef8a8c5daa Set DFU bootloader name
Fixes #22

Each (dfu) interface may have more than one a ltsetting each with their own index and name. According to the DFU_1.1 pdf section 4.2.3, "* Alternate settings can be used by an application to access additional memory segments. In this case,
it is suggested that each alternate setting employ a string descriptor to indicate the target memory
segment; e.g., 'EEPROM'." Whether or not we end up using multiple memory segments it is still good to have a descriptive name incase there are other dfu devices connected.

Edit: Fixed previous indentation
2015-03-08 17:23:48 -07:00
Rowan Decker
dbf2b1ca26 Set DFU bootloader name
Fixes #22

Each (dfu) interface may have more than one a ltsetting each with their own index and name. According to the DFU_1.1 pdf section 4.2.3, "* Alternate settings can be used by an application to access additional memory segments. In this case,
it is suggested that each alternate setting employ a string descriptor to indicate the target memory
segment; e.g., 'EEPROM'." Whether or not we end up using multiple memory segments it is still good to have a descriptive name incase there are other dfu devices connected.
2015-03-08 16:59:34 -07:00
Jacob Alexander
55346314b8 Adding additional case statements for SET_FEATURE and CLEAR_FEATURE
- Ignoring (which is done by default)
- Device, Interface and Endpoint variants
2015-03-07 00:50:42 -08:00
Jacob Alexander
b2dfd63d4b Fixing Mac OSX freeze on wake-up bug
- CLEAR_FEATURE unset is currently causing the keyboarod to freeze
- Though not ideal, it seems harmless to ignore this USB Control Packet
- Tested working on a Mac Mini (Yosemite)
2015-03-07 00:34:14 -08:00
Jacob Alexander
733201d39b Fixing compiler errors for usbMuxUart Output module
- Removing (currently) redundant usbMuxUart capabilities.kll file
- Issues were due to the recent AddModule cmake function addition
2015-03-06 23:37:09 -08:00
Jacob Alexander
ae6daa0e5c Adding DebounceThrottleDiv define to slow down the debounce rate.
By default:
DebounceThrottleDiv = 0;
This is the default infinity behaviour right now (may be changed in the future).

Increasing DebounceThrottleDiv will increase the scan rate divider.
DebounceThrottleDiv = 1; # Scans half as much
DebounceThrottleDiv = 2; # Scans a quarter as much
DebounceThrottleDiv = 3; # Scans an eigth as much
etc.

For ARM based uCs (like the Infinity) the maximum divider is 32.
2015-03-06 22:18:15 -08:00
Jacob Alexander
a959011faa Adding dfu-suffix signing support to build system
- If dfu-suffix is not found, a warning is given and the binary is not signed
- Unsigned binaries are still ok with the latest version of dfu-util
2015-03-02 01:58:53 -08:00
Jacob Alexander
f07e9342dd Fixing releasing Function key and holding layered key
- Pressed key will remain on the same layer until released
  regardless of the layer changes that happen in the meantime
2015-03-01 21:05:40 -08:00
Jacob Alexander
a737e36b3b Merge pull request #20 from Garoth/master
README package name correction
2015-03-01 00:28:48 -08:00
Andrei Thorp
3c1b5790e3 README package name correction
Signed-off-by: Andrei Thorp <athorp@evernote.com>
2015-03-01 00:21:01 -08:00
Jacob Alexander
bf3b06aa22 Adding list of modified files to the cli version command. 2015-02-28 23:50:13 -08:00
Jacob Alexander
a9c5898ba5 Adding configurable DebounceDivThreshold
Can be specified from any .kll file

DebounceDivThreshold = 0xFFFFFFFF
Sets to max debounce, default is 0xFFFF.
The 0xFFFFFFFF is about a 2x longer debounce
The max requires more ram (as it uses 32 bit variables instead of 16).

Added support for submodule capabilities files.
2015-02-28 22:13:17 -08:00
Jacob Alexander
0ec5e6d9c2 Adding missing NL's for Cons and Sys Control debug 2015-02-23 22:25:46 -08:00
Jacob Alexander
2b972a2a70 Merge pull request #16 from victorluft/bugfix/consumer_code_release
clear buffers on Consumer/System Control release
2015-02-23 22:13:39 -08:00
Victor Luft
595319c511 clear buffers on Consumer/System Control release
fixes #15
2015-02-23 18:29:01 -08:00
Jacob Alexander
a3b80b0f2a Adding keymap configuration section to the README. 2015-02-22 14:14:55 -08:00
Jacob Alexander
d4300009ce Updating kll invocation arguments for readability.
- Removing old cli arguments
2015-02-21 23:23:18 -08:00
Jacob Alexander
53f2731960 Merge pull request #14 from aclowes/master
Add instructions for using Homebrew
2015-02-21 13:12:21 -08:00
Jacob Alexander
7597fea053 Adding outputDebug command
- Displays all of the bytes sent via USB
- Different display mode for NKRO and Boot modes
2015-02-21 13:06:28 -08:00
aclowes
987550568f Add instructions for using Homebrew 2015-02-21 15:45:12 -05:00
Jacob Alexander
7a7b73ca4a Internally fixing typo (ASTERIX to ASTERISK
(Requires a kll update to work correctly)
2015-02-20 21:01:33 -08:00
Jacob Alexander
a423cb90be Adding convenience build target for testing out kll compiler changes. 2015-02-16 13:27:42 -08:00
Jacob Alexander
053afcc4fd Merge branch 'smasher816-master' 2015-02-15 00:44:09 -08:00
Rowan Decker
8d4adb41ec Check for needed programs
Check for dfu-util and screen before using them. Also aborts if
teensy_loader_cli compilation fails.

Uses the type builtin to determine if a command exists. See here:
https://gist.github.com/sdelmas/7377271
2015-02-12 19:42:01 -08:00
Rowan Decker
88ace02e51 Merge remote-tracking branch 'upstream/master' 2015-02-12 19:37:19 -08:00
Jacob Alexander
368b9e3694 Merge pull request #7 from mythmon/markdown-readme
Convert README to Markdown format.
2015-02-11 23:10:00 -08:00
Mike Cooper
0f6f9aa33f Convert README to Markdown format.
This makes it render nicely on GitHub's website, as well as having a
consistent plain-text format that should be familiar to many.
2015-02-11 22:22:12 -08:00
Jacob Alexander
10aad1f3af Updating load scripts with command line arguments
- Fastload option (allows for remote flashing)
- Autoscreen option initiates screen after successfully loading the firmware
2015-02-09 16:01:27 -08:00
Jacob Alexander
9e3d3aaca4 Initial code for USB cable detection
- Currently actual detection commented out due to issues
2015-02-09 13:21:23 -08:00
Jacob Alexander
762e75d875 Adding some convenience scripts used in manufacturing. 2015-02-09 13:15:25 -08:00
Jacob Alexander
7c4e31277c Disabling automatic refresh of kll repo unless specifically enabled
cmake -DREFRESH_KLL=1 ..
2015-02-09 12:14:45 -08:00
Jacob Alexander
1e9f55a0bf Updating setup.cmake files to use Module hierarchy implicitly
- Added AddModule CMake function which simplifies specifying module requirements
2015-01-25 17:55:28 -08:00
Jacob Alexander
c9b1769608 More mk20dx256vlh7 preparation. 2015-01-25 17:55:28 -08:00
Jacob Alexander
e95f3752f0 Fixing pinout 2015-01-25 17:55:28 -08:00
Jacob Alexander
b4f8fd0fa1 LEDs now doing something :D 2015-01-25 17:55:28 -08:00
Jacob Alexander
7dfca9cc3e Initial I2C work for ISSI IS31FL3731 2015-01-25 17:55:28 -08:00
Jacob Alexander
b2539041ee More preparation for mk20dx256vlh7 2015-01-10 19:55:28 -08:00
Jacob Alexander
2c7542e2e7 Fixing device bricking bug
- When loading a garbage image onto the device, the chip hangs
  and refuses to jump to the bootloader and start dfu

Fix
- Check if chip was in locked state and jump to dfu
- Check if watchdog timer fired and jump to dfu
2015-01-10 19:53:46 -08:00
Jacob Alexander
8e54672121 Fixing warning messages found using clang. 2014-12-31 19:43:10 -08:00
Jacob Alexander
621d8736e7 Adding experimental clang compiler support for arm-none-eabi
- Currently builds larger binaries than gcc (RAM)
2014-12-31 19:42:16 -08:00
Jacob Alexander
f5a1e1bcf5 Preparing for mk20dx256vlh7
- Not ready yet
- Will require some more changes to Lib/mk20dx.c
2014-12-31 17:13:44 -08:00
Jacob Alexander
40b5665930 Updating the Linux README information. 2014-12-31 15:58:28 -08:00
Jacob Alexander
a4b7ff7f0c Updating the README to resolve code sourcery issue. 2014-12-31 13:42:21 -08:00
Jacob Alexander
e687c04387 Adding more CMake log information. 2014-12-31 13:42:00 -08:00
Jacob Alexander
d00c034cbf Re-Adding previous defaultMap.kll used for early Infinity PCBs 2014-12-28 20:08:33 -08:00
Rowan Decker
9df455424e Add Missing Backslash key
Fix an off by one error causing most keys to be shifted one to the
right, due to the missing backslash (\) key in the top row.
2014-12-28 20:08:33 -08:00