di0ib/controller
Archived
1
0
Fork 0
Code Releases Activity

Fixing the macro section for the Bud Keypad

Browse Source
This commit is contained in:
Jacob Alexander 2012-02-13 14:04:53 -05:00
parent e3fc873cba
commit ea284c03f0
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Macro/buffer/macro.c
View File

@ -215,7 +215,7 @@ int scancodeMacro( uint8_t scanCode )
} }
return 1; return 1;
*/ */
/* BudKeypad // BudKeypad
// Is this a bootloader sequence key? // Is this a bootloader sequence key?
if ( !Bootloader_KeyDetected if ( !Bootloader_KeyDetected
&& Bootloader_NextPositionReady && Bootloader_NextPositionReady
@ -224,12 +224,23 @@ int scancodeMacro( uint8_t scanCode )
Bootloader_KeyDetected = 1; Bootloader_KeyDetected = 1;
Bootloader_NextPositionReady = 0; Bootloader_NextPositionReady = 0;
Bootloader_ConditionState++; Bootloader_ConditionState++;
erro_dPrint("detect");
} }
else if ( Bootloader_ConditionState > 0 && scanCode == Bootloader_ConditionSequence[Bootloader_ConditionState - 1] ) 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; return 0;
} }
@ -349,7 +360,7 @@ inline void process_macros(void)
keyPressBufferRead( MODIFIER_MASK, sizeof(MODIFIER_MASK), KEYINDEX_MASK ); keyPressBufferRead( MODIFIER_MASK, sizeof(MODIFIER_MASK), KEYINDEX_MASK );
// Check for bootloader condition // Check for bootloader condition
//if ( Bootloader_ConditionState == sizeof( Bootloader_ConditionSequence ) ) if ( Bootloader_ConditionState == sizeof( Bootloader_ConditionSequence ) )
// jumpToBootloader(); jumpToBootloader();
} }

4
USB/pjrc/usb_keyboard_debug.c
View File

@ -135,8 +135,8 @@ static const uint8_t PROGMEM keyboard_hid_report_desc[] = {
}; };
static const uint8_t PROGMEM debug_hid_report_desc[] = { static const uint8_t PROGMEM debug_hid_report_desc[] = {
0x06, 0x30, 0xFF, // Usage Page 0xFF31 (vendor defined) //0x06, 0x30, 0xFF, // Usage Page 0xFF31 (vendor defined)
//0x06, 0x31, 0xFF, // Usage Page 0xFF31 (vendor defined) 0x06, 0x31, 0xFF, // Usage Page 0xFF31 (vendor defined)
0x09, 0x74, // Usage 0x74 0x09, 0x74, // Usage 0x74
0xA1, 0x53, // Collection 0x53 0xA1, 0x53, // Collection 0x53
0x75, 0x08, // report size = 8 bits 0x75, 0x08, // report size = 8 bits

2
setup.cmake
View File

@ -20,7 +20,7 @@
#| Please the {Scan,Macro,USB,Debug}/module.txt for information on the modules and how to create new ones #| 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 ##| 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 ##| Uses the key index and potentially applies special conditions to it, mapping it to a usb key code
set( MacroModule "buffer" ) set( MacroModule "buffer" )