Mercurial > louis > kiibohd-controller
changeset 101:d952a1171917
Adding more USB codes and code cleanup
| author | Jacob Alexander <triplehaata@gmail.com> |
|---|---|
| date | Sun, 12 Jan 2014 11:27:10 -0800 |
| parents | a4fca67ec75d |
| children | a9b3520c7892 |
| files | Keymap/usb_keys.h Scan/avr-capsense/scan_loop.c |
| diffstat | 2 files changed, 16 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/Keymap/usb_keys.h Sun Dec 01 23:07:38 2013 -0500 +++ b/Keymap/usb_keys.h Sun Jan 12 11:27:10 2014 -0800 @@ -39,6 +39,10 @@ #define KEY_RIGHT_GUI 0x80 // List of Keycodes +#define KEY_NOEVENT 0 // Event, not a physical key +#define KEY_ERRORROLLOVER 1 // Event, not a physical key +#define KEY_POSTFAIL 2 // Event, not a physical key +#define KEY_ERRORUNDEFINED 3 // Event, not a physical key #define KEY_A 4 #define KEY_B 5 #define KEY_C 6
--- a/Scan/avr-capsense/scan_loop.c Sun Dec 01 23:07:38 2013 -0500 +++ b/Scan/avr-capsense/scan_loop.c Sun Jan 12 11:27:10 2014 -0800 @@ -217,7 +217,7 @@ //#define TERMINAL_6110668_STROBE //#define UNSAVER_STROBE #ifdef KISHSAVER_STROBE - total_strobes = 8; + total_strobes = 9; strobe_map[0] = 2; // Kishsaver doesn't use strobe 0 and 1 strobe_map[1] = 3; @@ -227,8 +227,6 @@ strobe_map[5] = 7; strobe_map[6] = 8; strobe_map[7] = 9; - // XXX - Disabling for now, not sure how to deal with test points yet (without spamming the debug) - total_strobes = 9; strobe_map[8] = 15; // Test point strobe (3 test points, sense 1, 4, 5) #elif defined(TERMINAL_6110668_STROBE) total_strobes = 16; @@ -742,30 +740,31 @@ PORTF = 0; DDRF = 0; - recovery(OFF); - strobe_w(column); + recovery( OFF ); + strobe_w( column ); - hold_sample(OFF); - SET_FULL_MUX(0); + hold_sample( OFF ); + SET_FULL_MUX( 0 ); + // Allow strobes to settle for ( uint8_t i = 0; i < STROBE_SETTLE; ++i ) { getADC(); } - hold_sample(ON); + hold_sample( ON ); uint8_t mux = 0; - SET_FULL_MUX(mux); + SET_FULL_MUX( mux ); getADC(); // throw away; unknown mux. do { - SET_FULL_MUX(mux + 1); // our *next* sample will use this + SET_FULL_MUX( mux + 1 ); // our *next* sample will use this // retrieve current read. buffer[mux] = getADC(); mux++; - } while (mux < 8); + } while ( mux < 8 ); - hold_sample(OFF); - recovery(ON); + hold_sample( OFF ); + recovery( ON ); // turn off adc. ADCSRA &= ~(1 << ADEN);