浏览代码

Fixing USB send rate.

- Only send USB events when something changes (rather than every ms)
simple
Jacob Alexander 9 年前
父节点
当前提交
97b514a9d4
共有 3 个文件被更改,包括 21 次插入1 次删除
  1. 1
    1
      Macro/PartialMap/kll.h
  2. 19
    0
      Output/pjrcUSB/output_com.c
  3. 1
    0
      Output/pjrcUSB/output_com.h

+ 1
- 1
Macro/PartialMap/kll.h 查看文件

@@ -64,7 +64,7 @@ typedef uint16_t nat_ptr_t;
// Default Args (always sent): key state/analog of last key
// Combo Length of 0 signifies end of sequence
//
// ResultMacro.guide -> [<combo length>|<capability index>|<arg1>|<argn>|<capability index>|...|<combo length>|...|0]
// ResultMacro.guide -> [<combo length>|<capability index>|<arg1>|<argn>|<capability index>|...|<combo length>|...|0]
//
// ResultMacroRecord.pos -> <current combo position>
// ResultMacroRecord.state -> <last key state>

+ 19
- 0
Output/pjrcUSB/output_com.c 查看文件

@@ -89,6 +89,10 @@ volatile uint8_t USBKeys_LEDs = 0;
// 1 - NKRO Mode
volatile uint8_t USBKeys_Protocol = 1;

// Indicate if USB should send update
// OS only needs update if there has been a change in state
uint8_t USBKeys_Changed = 0;

// the idle configuration, how often we send the report to the
// host (ms * 4) even when it hasn't changed
uint8_t USBKeys_Idle_Config = 125;
@@ -111,6 +115,10 @@ void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *a
}

// TODO Analog inputs
// Only indicate USB has changed if either a press or release has occured
if ( state == 0x01 || state == 0x03 )
USBKeys_Changed = 1;

// Only send keypresses if press or hold state
if ( stateType == 0x00 && state == 0x03 ) // Release state
return;
@@ -164,6 +172,17 @@ inline void Output_setup()
// USB Data Send
inline void Output_send(void)
{
// Don't send update if USB has not changed
if ( !USBKeys_Changed )
{
// Clear modifiers and keys
USBKeys_Modifiers = 0;
USBKeys_Sent = 0;

return;
}
USBKeys_Changed = 0;

// TODO undo potentially old keys
for ( uint8_t c = USBKeys_Sent; c < USBKeys_MaxSize; c++ )
USBKeys_Array[c] = 0;

+ 1
- 0
Output/pjrcUSB/output_com.h 查看文件

@@ -47,6 +47,7 @@ extern uint8_t USBKeys_Modifiers;
extern uint8_t USBKeys_Array[USB_MAX_KEY_SEND];
extern uint8_t USBKeys_Sent;
extern volatile uint8_t USBKeys_LEDs;
extern uint8_t USBKeys_Changed;

static const uint8_t USBKeys_MaxSize = USB_MAX_KEY_SEND;
extern volatile uint8_t USBKeys_Protocol; // 0 - Boot Mode, 1 - NKRO Mode