Mercurial > louis > kiibohd-controller
changeset 44:511d7ad5b38e
Fixing the macro section for the Bud Keypad
| author | Jacob Alexander <triplehaata@gmail.com> |
|---|---|
| date | Mon, 13 Feb 2012 14:04:53 -0500 |
| parents | fe50a5c186bb |
| children | 8a09c4d30e16 |
| files | Macro/buffer/macro.c USB/pjrc/usb_keyboard_debug.c setup.cmake |
| diffstat | 3 files changed, 19 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Macro/buffer/macro.c Mon Dec 19 17:48:47 2011 -0800 +++ b/Macro/buffer/macro.c Mon Feb 13 14:04:53 2012 -0500 @@ -215,7 +215,7 @@ } return 1; */ - /* BudKeypad + // BudKeypad // Is this a bootloader sequence key? if ( !Bootloader_KeyDetected && Bootloader_NextPositionReady @@ -224,12 +224,23 @@ Bootloader_KeyDetected = 1; Bootloader_NextPositionReady = 0; Bootloader_ConditionState++; + erro_dPrint("detect"); } else if ( Bootloader_ConditionState > 0 && scanCode == Bootloader_ConditionSequence[Bootloader_ConditionState - 1] ) { - Bootloader_KeyDetected = 1; + Bootloader_KeyDetected = 0; + Bootloader_NextPositionReady = 1; + erro_dPrint("detect-again!"); } - */ + // Cancel sequence + else + { + Bootloader_KeyDetected = 0; + Bootloader_NextPositionReady = 1; + Bootloader_ConditionState = 0; + erro_dPrint("Arg"); + } + return 0; } @@ -349,7 +360,7 @@ keyPressBufferRead( MODIFIER_MASK, sizeof(MODIFIER_MASK), KEYINDEX_MASK ); // Check for bootloader condition - //if ( Bootloader_ConditionState == sizeof( Bootloader_ConditionSequence ) ) - // jumpToBootloader(); + if ( Bootloader_ConditionState == sizeof( Bootloader_ConditionSequence ) ) + jumpToBootloader(); }
--- a/USB/pjrc/usb_keyboard_debug.c Mon Dec 19 17:48:47 2011 -0800 +++ b/USB/pjrc/usb_keyboard_debug.c Mon Feb 13 14:04:53 2012 -0500 @@ -135,8 +135,8 @@ }; static const uint8_t PROGMEM debug_hid_report_desc[] = { - 0x06, 0x30, 0xFF, // Usage Page 0xFF31 (vendor defined) - //0x06, 0x31, 0xFF, // Usage Page 0xFF31 (vendor defined) + //0x06, 0x30, 0xFF, // Usage Page 0xFF31 (vendor defined) + 0x06, 0x31, 0xFF, // Usage Page 0xFF31 (vendor defined) 0x09, 0x74, // Usage 0x74 0xA1, 0x53, // Collection 0x53 0x75, 0x08, // report size = 8 bits
--- a/setup.cmake Mon Dec 19 17:48:47 2011 -0800 +++ b/setup.cmake Mon Feb 13 14:04:53 2012 -0500 @@ -20,7 +20,7 @@ #| Please the {Scan,Macro,USB,Debug}/module.txt for information on the modules and how to create new ones ##| Deals with acquiring the keypress information and turning it into a key index -set( ScanModule "SonyNEWS" ) +set( ScanModule "BudKeypad" ) ##| Uses the key index and potentially applies special conditions to it, mapping it to a usb key code set( MacroModule "buffer" )