Archived
1
0
Commit Graph

286 Commits

Author SHA1 Message Date
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
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
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
Rowan Decker
7cea6bb88a 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-22 20:27:33 -06:00
Jacob Alexander
ccd52d6b8f Moving MatrixARM header macros to separate file 2014-12-21 07:32:51 -08:00
Jacob Alexander
4a1aeb8af8 Small typos 2014-11-30 19:36:19 -08:00
Jacob Alexander
15bb1a767f Adding KLL define support 2014-11-21 14:58:50 -08:00
Jacob Alexander
355fdc48e0 Adding convenience scripts to build and load manufacturing image via SWD. 2014-11-16 13:03:31 -08:00
Jacob Alexander
f75e9423b5 Fixing layer latch capability.
Latch now activates on key release, and deactivates on next key release.
2014-11-13 00:49:02 -08:00
Jacob Alexander
504058bdb1 Fixing sequences (after NKRO HID descriptor re-design). 2014-11-12 23:33:28 -08:00
Jacob Alexander
c939059c7f Fixing NKRO on Windows 8.1
- Had to re-write descriptor to support Windows 8.1 while still working with Mac OSX
- NKRO keyboard is now more bandwidth intensive as all the keys must be updated at the same time
  (due to 8.1 bug in the HID spec)
2014-11-12 23:04:50 -08:00
Jacob Alexander
774ccc7fe9 Code formatting cleanup. 2014-11-10 23:42:39 -08:00
Jacob Alexander
a7b1d94465 Fixing NKRO modifier bug
- Modifier byte was being cleared after each send (needed for Boot Mode only)
2014-11-10 22:50:54 -08:00
Jacob Alexander
11fb8bd77d Fixing Linux NKRO Delete bug
- Fixed descriptor to not include USB Code 156 (Clear)
- This USB Code affects repeating Delete
2014-11-10 21:02:25 -08:00
Jacob Alexander
1da4903816 Adding FPROT flash protection bit for 4k Bootloader on the mk20dx128vlf5
- Minimum protection size is 4k on the mk20dx128vlf5
2014-11-05 00:12:31 -08:00
Jacob Alexander
9dbd155ebf Fixing Mac OSX USB NKRO
- OSX doesn't properly follow the spec when it comes to padding bits (when using bitfields)
- Everything seems to work when I don't use them
- NKRO tested working on OSX
2014-11-02 23:24:59 -08:00
Jacob Alexander
e251a8be50 Fixing pjrc bug affecting Mac OSX CDC driver
- Also updating usbMuxUart header with most recent keyboard defines
2014-11-01 14:42:55 -07:00
Jacob Alexander
2be0d1393b USB Macro Output sequences now working!
- Tested both with Boot and NKRO modes
2014-10-27 00:26:17 -07:00
Jacob Alexander
705050b74e Updating pin_map for teensy3/3.1 2014-10-26 15:07:44 -07:00
Jacob Alexander
74e38e0797 Adding pinout list. 2014-10-25 23:56:30 -07:00
Jacob Alexander
f2c3cc0082 Fixing bug that locks up the keyboard if shifting to a layer that doesn't exist. 2014-10-15 10:39:39 -07:00
Jacob Alexander
358b1f33bb Adding timeout to virtual serial port writes
- Was causing lock-ups until the serial port was read
- Also checking each of the NKRO key types in each send loop
2014-10-04 14:50:42 -07:00
Jacob Alexander
6e4c28ef84 HUGE AVR RAM optimization (~28%).
- It's possible to get even more, but this is probably as far as I'll go
- PROGMEM is really annoying to use, and makes the code look like ass
- Now the Teensy 2++ should have enough RAM to use PartialMap easily
2014-10-02 22:09:34 -07:00
Jacob Alexander
22abefcf1e Making all the configurable CMake variables externally settable
- Use CMake -D arguments to set variables (so you don't have to edit the CMakeLists.txt file)
2014-10-02 19:30:15 -07:00
Jacob Alexander
ae21a90455 Fixing USB NKRO key buffer bug
- Missing a byte in the array
2014-10-02 19:29:56 -07:00
Jacob Alexander
0cbfe53794 Fixed Linux NKRO bitmap bug.
- Thanks hasu for pointing it out
- Keycode 50 is problematic under Linux, so removing (it's a duplicate keycode anyways)
2014-10-02 01:40:14 -07:00