@ -55,9 +55,8 @@ volatile LockoutStateTypeDef LockoutState = LOCKOUT_STATE_INACTIVE;
//Variables specific to mouse bot detection:
//Variables specific to mouse bot detection:
# if defined (CONFIG_MOUSE_ENABLED) && defined (CONFIG_MOUSE_BOT_DETECT_ENABLED)
# if defined (CONFIG_MOUSE_ENABLED) && defined (CONFIG_MOUSE_BOT_DETECT_ENABLED)
uint32_t LastMouseMoveTime = 0 ;
//Jump detection stuff
//Jump detection stuff
uint32_t LastMouseMoveTime = 0 ;
uint32_t LastMouseMoveBeginTime ;
uint32_t LastMouseMoveBeginTime ;
uint8_t MouseIsMoving = 0 ;
uint8_t MouseIsMoving = 0 ;
@ -66,8 +65,13 @@ volatile LockoutStateTypeDef LockoutState = LOCKOUT_STATE_INACTIVE;
int32_t PreviousSmoothedAcceleration = 0 ;
int32_t PreviousSmoothedAcceleration = 0 ;
uint8_t ConstantAccelerationCounter = 0 ;
uint8_t ConstantAccelerationCounter = 0 ;
//Jiggle detection stuff
uint8_t MouseStopIntervalBinDrainDivideCount = 0 ;
uint8_t MouseStopIntervalBinArray [ MOUSE_BOTDETECT_JIGGLE_BIN_COUNT ] = { 0 } ;
//Debug:
//Debug:
uint8_t ConstantAccelerationCounterMax = 0 ;
uint8_t ConstantAccelerationCounterMax = 0 ;
uint8_t MouseStopIntervalBinArrayPeak = 0 ;
static void Upstream_HID_BotDetectMouse_DoLockout ( void ) ;
static void Upstream_HID_BotDetectMouse_DoLockout ( void ) ;
# endif
# endif
@ -387,6 +391,7 @@ void Upstream_HID_BotDetectMouse(uint8_t* mouseInData)
{
{
uint32_t i ;
uint32_t i ;
uint32_t now = HAL_GetTick ( ) ;
uint32_t now = HAL_GetTick ( ) ;
uint32_t moveDelay ;
uint32_t velocity ;
uint32_t velocity ;
int8_t mouseX ;
int8_t mouseX ;
int8_t mouseY ;
int8_t mouseY ;
@ -402,15 +407,46 @@ void Upstream_HID_BotDetectMouse(uint8_t* mouseInData)
mouseY = mouseInData [ 2 ] ;
mouseY = mouseInData [ 2 ] ;
velocity = ( sqrtf ( ( ( int32_t ) mouseX * mouseX ) +
velocity = ( sqrtf ( ( ( int32_t ) mouseX * mouseX ) +
( ( int32_t ) mouseY * mouseY ) ) ) * MOUSE_BOTDETECT_VELOCITY_MULTIPLIER ; //Multiply floating-point sqrt result to avoid integer rounding errors
( ( int32_t ) mouseY * mouseY ) ) ) * MOUSE_BOTDETECT_VELOCITY_MULTIPLIER ; //Multiply floating-point sqrt result to avoid integer rounding errors
moveDelay = now - LastMouseMoveTime ;
//Did the mouse stop moving?
if ( moveDelay > ( ( MOUSE_BOTDETECT_MOVEMENT_STOP_PERIODS * HID_FS_BINTERVAL ) - ( HID_FS_BINTERVAL / 2 ) ) )
{
//Jiggle detection
if ( velocity ! = 0 )
{
//Add stopped time to jiggle bins
moveDelay = moveDelay % ( MOUSE_BOTDETECT_JIGGLE_BIN_WIDTH_MS * MOUSE_BOTDETECT_JIGGLE_BIN_COUNT ) ; //Wrap stopped time into the array
MouseStopIntervalBinArray [ ( moveDelay / MOUSE_BOTDETECT_JIGGLE_BIN_WIDTH_MS ) ] + + ;
if ( MouseStopIntervalBinArray [ ( moveDelay / MOUSE_BOTDETECT_JIGGLE_BIN_WIDTH_MS ) ] > MOUSE_BOTDETECT_LOCKOUT_JIGGLE_BIN_THRESHOLD )
{
Upstream_HID_BotDetectMouse_DoLockout ( ) ;
}
//Debug:
if ( MouseStopIntervalBinArray [ ( moveDelay / MOUSE_BOTDETECT_JIGGLE_BIN_WIDTH_MS ) ] > MouseStopIntervalBinArrayPeak )
{
MouseStopIntervalBinArrayPeak = MouseStopIntervalBinArray [ ( moveDelay / MOUSE_BOTDETECT_JIGGLE_BIN_WIDTH_MS ) ] ;
}
//Drain jiggle bins at specified rate
MouseStopIntervalBinDrainDivideCount + + ;
if ( MouseStopIntervalBinDrainDivideCount > = MOUSE_BOTDETECT_JIGGLE_BIN_DIVIDER )
{
MouseStopIntervalBinDrainDivideCount = 0 ;
for ( i = 0 ; i < MOUSE_BOTDETECT_JIGGLE_BIN_COUNT ; i + + )
{
if ( MouseStopIntervalBinArray [ i ] > 0 ) MouseStopIntervalBinArray [ i ] - - ;
}
}
}
//Jump detection
//Jump detection
if ( MouseIsMoving )
if ( MouseIsMoving )
{
if ( ( now - LastMouseMoveTime ) > ( ( MOUSE_BOTDETECT_MOVEMENT_STOP_PERIODS * HID_FS_BINTERVAL ) - ( HID_FS_BINTERVAL / 2 ) ) ) //Did the mouse stop moving?
{
{
MouseIsMoving = 0 ;
MouseIsMoving = 0 ;
if ( ( LastMouseMoveTime - LastMouseMoveBeginTime ) < ( ( MOUSE_BOTDETECT_MOVEMENT_STOP_PERIODS * HID_FS_BINTERVAL ) - ( HID_FS_BINTERVAL / 2 ) ) )
if ( ( LastMouseMoveTime - LastMouseMoveBeginTime ) < ( ( MOUSE_BOTDETECT_ JUMP_MINIMUM_TIME * HID_FS_BINTERVAL ) - ( HID_FS_BINTERVAL / 2 ) ) )
{
{
Upstream_HID_BotDetectMouse_DoLockout ( ) ;
Upstream_HID_BotDetectMouse_DoLockout ( ) ;
}
}
@ -422,13 +458,13 @@ void Upstream_HID_BotDetectMouse(uint8_t* mouseInData)
{
{
//Jump detection
//Jump detection
LastMouseMoveTime = now ;
LastMouseMoveTime = now ;
if ( ( MouseIsMoving = = 0 ) & & ( velocity > MOUSE_BOTDETECT_ MOVEMENT _VELOCITY_THRESHOLD) )
if ( ( MouseIsMoving = = 0 ) & & ( velocity > MOUSE_BOTDETECT_ JUMP _VELOCITY_THRESHOLD) )
{
{
MouseIsMoving = 1 ;
MouseIsMoving = 1 ;
LastMouseMoveBeginTime = now ;
LastMouseMoveBeginTime = now ;
}
}
// Look for periods of constant accelera tion
// Constant acceleration detec tion
for ( i = ( MOUSE_BOTDETECT_VELOCITY_HISTORY_SIZE - 1 ) ; i > 0 ; i - - ) //Shuffle down history data
for ( i = ( MOUSE_BOTDETECT_VELOCITY_HISTORY_SIZE - 1 ) ; i > 0 ; i - - ) //Shuffle down history data
{
{
MouseVelocityHistory [ i ] = MouseVelocityHistory [ i - 1 ] ;
MouseVelocityHistory [ i ] = MouseVelocityHistory [ i - 1 ] ;
@ -457,10 +493,10 @@ void Upstream_HID_BotDetectMouse(uint8_t* mouseInData)
( ( PreviousSmoothedAcceleration - smoothedAccelerationMatchError ) < = newSmoothedAcceleration ) )
( ( PreviousSmoothedAcceleration - smoothedAccelerationMatchError ) < = newSmoothedAcceleration ) )
{
{
ConstantAccelerationCounter + + ;
ConstantAccelerationCounter + + ;
// if (ConstantAccelerationCounter > MOUSE_BOTDETECT_TEMPORARY_LOCKOUT_VELOCITY_THRESHOLD)
if ( ConstantAccelerationCounter > MOUSE_BOTDETECT_LOCKOUT_CONSTANT_ACCEL_COUNT )
// {
{
// Upstream_HID_BotDetectMouse_DoLockout();
Upstream_HID_BotDetectMouse_DoLockout ( ) ;
// }
}
//Debug:
//Debug:
if ( ConstantAccelerationCounter > ConstantAccelerationCounterMax ) ConstantAccelerationCounterMax = ConstantAccelerationCounter ;
if ( ConstantAccelerationCounter > ConstantAccelerationCounterMax ) ConstantAccelerationCounterMax = ConstantAccelerationCounter ;
@ -512,6 +548,11 @@ static void Upstream_HID_BotDetectMouse_DoLockout(void)
}
}
ConstantAccelerationCounter = 0 ;
ConstantAccelerationCounter = 0 ;
for ( i = 0 ; i < MOUSE_BOTDETECT_JIGGLE_BIN_COUNT ; i + + )
{
MouseStopIntervalBinArray [ i ] = 0 ;
}
TemporaryLockoutTimeMs = 0 ;
TemporaryLockoutTimeMs = 0 ;
LockoutState = LOCKOUT_STATE_TEMPORARY_ACTIVE ;
LockoutState = LOCKOUT_STATE_TEMPORARY_ACTIVE ;
LED_SetState ( LED_STATUS_FLASH_BOTDETECT ) ;
LED_SetState ( LED_STATUS_FLASH_BOTDETECT ) ;