diff options
| author | tmk <nobody@nowhere> | 2013-04-20 00:46:48 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-04-20 00:46:48 +0900 |
| commit | 2fc681b4f768484c2ba5cfa22662bf4c09586e57 (patch) | |
| tree | ead46c28553b5225699d36e416b10ef2c129ae70 /protocol/iwrap/main.c | |
| parent | 246031b6471a364f082c0eb4a0fb858821ae767b (diff) | |
| parent | 663027751831eb0e80d64c90aaf82d2921533aed (diff) | |
Merge branch 'iwrap5'
Diffstat (limited to 'protocol/iwrap/main.c')
| -rw-r--r-- | protocol/iwrap/main.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/protocol/iwrap/main.c b/protocol/iwrap/main.c index ac83280f13..3abdce8dfc 100644 --- a/protocol/iwrap/main.c +++ b/protocol/iwrap/main.c @@ -25,6 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "keyboard.h" #include "matrix.h" #include "host.h" +#include "action.h" #include "iwrap.h" #ifdef PROTOCOL_VUSB # include "vusb.h" @@ -40,7 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. static void sleep(uint8_t term); static bool console(void); -static uint8_t console_command(uint8_t c); +static bool console_command(uint8_t c); static uint8_t key2asc(uint8_t key); @@ -108,10 +109,13 @@ static void init_vusb(void) void change_driver(host_driver_t *driver) { + /* host_clear_keyboard_report(); host_swap_keyboard_report(); host_clear_keyboard_report(); host_send_keyboard_report(); + */ + clear_keyboard(); _delay_ms(1000); host_set_driver(driver); } @@ -168,6 +172,7 @@ int main(void) if (host_get_driver() == vusb_driver()) vusb_transfer_keyboard(); #endif + // TODO: depricated if (matrix_is_modified() || console()) { last_timer = timer_read(); sleeping = false; @@ -176,6 +181,7 @@ int main(void) iwrap_check_connection(); } + // TODO: suspend.h if (host_get_driver() == iwrap_driver()) { if (sleeping && !insomniac) { _delay_ms(1); // wait for UART to send @@ -201,11 +207,6 @@ static void sleep(uint8_t term) WD_SET(WD_OFF); } -ISR(WDT_vect) -{ - // wake up -} - static bool console(void) { // Send to Bluetoot module WT12 @@ -244,12 +245,12 @@ static bool console(void) } } -uint8_t command_extra() +bool command_extra(uint8_t code) { - return console_command(key2asc(host_get_first_key())); + return console_command(key2asc(code)); } -static uint8_t console_command(uint8_t c) +static bool console_command(uint8_t c) { switch (c) { case 'h': |