Mercurial > louis > kiibohd-controller
diff main.c @ 125:8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
- Code should be working, but much is untested
- All of the old modules will need to update and use the new DefaultMap keymap
- There might still be some naming conflicts with some Scan Modules
| author | Jacob Alexander <haata@kiibohd.com> |
|---|---|
| date | Sun, 06 Apr 2014 11:49:27 -0700 |
| parents | 0c5d1fe99302 |
| children | e08d7b586ea3 |
line wrap: on
line diff
--- a/main.c Tue Apr 01 01:16:53 2014 -0700 +++ b/main.c Sun Apr 06 11:49:27 2014 -0700 @@ -141,22 +141,21 @@ pinSetup(); // Enable CLI - init_cli(); + CLI_init(); - // Setup Output Module - output_setup(); + // Setup Modules + Output_setup(); + Macro_setup(); + //scan_setup(); // Setup ISR Timer for flagging a kepress send to USB usbTimerSetup(); - // Setup the scanning module - //scan_setup(); - // Main Detection Loop while ( 1 ) { // Process CLI - process_cli(); + CLI_process(); // Acquire Key Indices // Loop continuously until scan_loop returns 0 @@ -165,14 +164,14 @@ sei(); // Run Macros over Key Indices and convert to USB Keys - process_macros(); + Macro_process(); // Send keypresses over USB if the ISR has signalled that it's time if ( !sendKeypresses ) continue; // Send USB Data - output_send(); + Output_send(); // Clear sendKeypresses Flag sendKeypresses = 0;