Archived
1
0
Commit Graph

72 Commits

Author SHA1 Message Date
Jacob Alexander
5f262ea4b6 Code cleanup
- Changing header file ifndef define to pragma once's
- Removed duplicate output_com.h's
2015-06-14 14:33:40 -07:00
Jacob Alexander
96e785b571 Merge branch 'master' of https://github.com/smasher816/controller into smasher816-master 2015-03-15 18:27:35 -07:00
Jacob Alexander
ed71f7fad5 Initial commit for UARTConnect module
* Keyboard interconnect using two uarts
* Supports daisy chain addressing using a master/slave direction communication scheme

- Still needs more testing
- Functions have been tested alone to be generally working
2015-03-15 16:58:01 -07:00
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
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
7a7b73ca4a Internally fixing typo (ASTERIX to ASTERISK
(Requires a kll update to work correctly)
2015-02-20 21:01:33 -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
8e54672121 Fixing warning messages found using clang. 2014-12-31 19:43:10 -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
15bb1a767f Adding KLL define support 2014-11-21 14:58:50 -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
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
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
c57c2d7a66 Updating USB HID header file.
- Should be everything necessary for the next while
- Adds Consumer and System controls
2014-09-20 23:09:58 -07:00
Jacob Alexander
56062db2c0 Adding a selection of USB Consumer HID codes 2014-09-20 00:19:28 -07:00
Jacob Alexander
97b514a9d4 Fixing USB send rate.
- Only send USB events when something changes (rather than every ms)
2014-09-19 19:11:37 -07:00
Jacob Alexander
9b1e19017f Adding more RAM optimizations
- Split up TriggerMacro and ResultMacro to help the compiler optimize better
- Static RAM usage did not decrease, total flash usage did
2014-09-16 23:29:21 -07:00
Jacob Alexander
37b36fe011 DPH controller now working with the kishsaver and macros
- Earlier RAM optimizations uncovered a bunch of layer/macro bugs
2014-09-16 22:14:01 -07:00
Jacob Alexander
ac98d86762 Fixing first and last element bug for layers. 2014-09-16 17:21:41 -07:00
Jacob Alexander
df82ffeff7 Adding support for layer packing
- Only keep state for the scan code that are available for the layer
- Also properly implemented scan code range checking (was not done before, only worked because the KLL compiler was well behaved)
2014-09-16 17:04:59 -07:00
Jacob Alexander
dd9c018378 Adding support to Macro support to DPH
- Added layout files for 50 key and kishsaver
- Not yet working (some USB issues on AVR to debug)
- Fixed an OSX issue when building AVR
- Cleanup
2014-09-14 19:27:22 -07:00
Jacob Alexander
e0a2a4806b Adding CMake build support for the KLL compiler
- Automatically downloads the kll compiler if not found
- Added capability files to each of the module that currently have them
- Split modules.cmake so kll.cmake could influence build targets (also needs info from modules.cmake)
- Updated .gitignore for kll compiler directory
- Added documentation on how to manipulate layouts using CMakeLists.txt
- Cleanup of old layout files
2014-09-14 15:51:36 -07:00
Jacob Alexander
cb37c82330 Updating PartialLayer code to support varying counter widths.
- For both uC architecture differences and RAM saving
2014-09-11 11:17:17 -07:00
Jacob Alexander
c7934c7224 Adding variable width state variable width.
- Allows for RAM space savings on small microcontrollers at the expense of macro length and number of macros/key assignments
2014-09-11 10:54:50 -07:00
Jacob Alexander
c169097ccf Fixing release state for keys
- Layers were not disabling because function was only called on press/hold
- Disabled layer shift function on key hold
- Fixed the press/hold/release states for other layer capabilities and USB code send
2014-09-10 20:53:30 -07:00
Jacob Alexander
2a6c2a9c78 Preparing for kll compiler usage
- Split layer capability into different parts
- Convenience Shift, Latch, Lock
- Keeping the original capability because it also allows specifically turning layers off and is useful for debugging
2014-09-07 21:10:49 -07:00
Jacob Alexander
121525e2cb Splitting out structures and macros from the generated keymap.
- Preparation to integrating the compiler
2014-08-23 11:32:46 -07:00
Jacob Alexander
b2eaf0c893 All basic macros tested and working!
Tested
------
Single : Single
Single : Combo
Single : Sequence
Combo : Single
Combo : Combo
Combo : Sequence
Sequence : Single
Sequence : Combo
Sequence : Sequence
2014-08-23 10:49:13 -07:00
Jacob Alexander
31a2d75116 Basic Trigger and Result Macros are now working.
- More complex macro not yet tested (long Trigger to long Result)
- Long Trigger Macros not tested yet
2014-08-20 10:53:22 -07:00
Jacob Alexander
d6d792fdf9 Changing decToInt to numToInt (adds support for Hex number interpreter)
- CLI now works with hex or decimal numbers
- Hex requires 0x (technically just x would work too)
2014-08-16 12:07:25 -07:00
Jacob Alexander
eabb1c546a Fixing RAM calculator and reduced actual SRAM usage
- Changed static variables to const that should have been const
- Updated CMake files to prepare for MCHCK custom bootloader
- Changed the USB ID numbers and ID number for bootloader
- Only generate DFU or Teensy binary image, not both
- Fixed RAM and FLASH calculator
- Added missing license in delay.c/h (much of it was taken from Teensy source though I've changed a bunch of it)
- Prepared mk20dx.c for upcoming bootloader addition
- mk20dx.h cleanup
- Reduced the MCHCK based flash size for the application image (bootloader changes requires more flash space)
- Fixed bugs in macro.c
- Added keyHold cli command
- Added show pending events debug message for PartialMap macro module
2014-08-15 10:49:44 -07:00
Jacob Alexander
2f7e3cb117 Adding generic layerToggle and USB Key Output capabilities.
- Macros and Layers are, code-wise, feature complete
2014-08-07 20:03:39 -07:00
Jacob Alexander
51e715f785 Macro processing is now feature complete.
- Basic features only (there are still some extra options that can be added)
- Not tested
- ResultMacro processor is complete
- Layer enabling capability not yet complete
- USB Key output capability not yet complete
2014-08-06 12:18:06 -07:00
Jacob Alexander
34198635b9 Adding TriggerMacro processing.
- Not tested, but basic features should be complete
2014-08-05 11:33:55 -07:00
Jacob Alexander
d6345c307f Initial MatrixARM implementation
- Cleaned up Macro and USB callback naming
- Added security jumper for automated reload (MCHCK based only)
- Added additional LED position
2014-08-01 01:26:25 -07:00
Jacob Alexander
c1f8a2c545 Macro cleanup.
- Preparation for KLL support
2014-07-27 23:15:41 -07:00
Jacob Alexander
4e79452860 Adding layer fall-through lookup
- Updated the Scan module API functions (LED and Analog)
2014-07-26 14:06:19 -07:00
Jacob Alexander
8193687d29 Added layerList and layerState functions
- Added LayerIndex data structure
2014-07-26 12:20:59 -07:00
Jacob Alexander
e8e9bb6c44 Added capSelect function that can arbitrary run a keyboard capability
- Made changes to the capabities/macro data structure to specify the capability arg count in the capability list
- Remove the arg count from the result macro struct (as it is redundant)
2014-07-25 10:53:33 -07:00
Jacob Alexander
e42ae810a3 Adding macroList debug function
- Fixed TriggerMacroNum and ResultMacroNum
2014-07-24 23:42:38 -07:00
Jacob Alexander
f7bacebb26 Added capabilities list debug option
- Changed macro/capabilities data structure to index capabilities rather than specify function pointers
- Used an 8 bit array, this reduced the max number of capabities to 255
	* Shouldn't be an issue, but this can be addressed if the limit is hit...unlikely though
2014-07-24 23:18:38 -07:00
Jacob Alexander
ff05e1ccb7 Basic debug trigger/result macro viewer
- Moderate changes to the trigger and result macro data structures
- The debug macro viewers are nearly equivalent to what the main macro processors will do
2014-07-24 22:22:35 -07:00
Jacob Alexander
8eba0ae354 Adding McHCK flash reload function and some cleanup.
- Requires special string to be compared with the bootloader and VBAT register file
2014-07-19 09:21:35 -07:00
Jacob Alexander
1fd777815b Initial work for partial layers and macros. 2014-07-15 21:29:56 -07:00
Jacob Alexander
89193f807e Initial work for KLL macro support 2014-06-14 11:00:29 -07:00
Jacob Alexander
366f6c9276 Kishsaver is fully working with DPH!
- More keyboard layouts and enhancements to come :D
2014-04-26 01:29:09 -07:00
Jacob Alexander
4c76357912 CLI Formatting cleanup. 2014-04-19 11:31:43 -07:00
Jacob Alexander
8ee8e3cb55 Adding analog.c lib from teensyduino.
- Mostly for reference, you shouldn't include it verbatim in your module.
2014-04-12 21:13:37 -07:00