specchioriflesso/USB_Host_Shield_2.0
1
Fork 0
mirror of https://github.com/felis/USB_Host_Shield_2.0.git synced 2024-03-22 11:31:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make button click state public and disable debug printing by default

Browse source
This commit is contained in:
Kristian Sloth Lauszus 2016-02-26 01:13:20 +01:00
parent 267f330ed7
commit 29c98503d1
2 changed files with 20 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
examples/HID/SRWS1/SRWS1.cpp
View file

@ -17,18 +17,6 @@
#include "SRWS1.h" #include "SRWS1.h"
enum DPADEnum {
DPAD_UP = 0x0,
DPAD_UP_RIGHT = 0x1,
DPAD_RIGHT = 0x2,
DPAD_RIGHT_DOWN = 0x3,
DPAD_DOWN = 0x4,
DPAD_DOWN_LEFT = 0x5,
DPAD_LEFT = 0x6,
DPAD_LEFT_UP = 0x7,
DPAD_OFF = 0xF,
};
void SRWS1::ParseHIDData(USBHID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf) { void SRWS1::ParseHIDData(USBHID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf) {
if (HIDUniversal::VID != STEELSERIES_VID || HIDUniversal::PID != STEELSERIES_SRWS1_PID) // Make sure the right device is actually connected if (HIDUniversal::VID != STEELSERIES_VID || HIDUniversal::PID != STEELSERIES_SRWS1_PID) // Make sure the right device is actually connected
return; return;
@ -40,9 +28,15 @@ void SRWS1::ParseHIDData(USBHID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf)
Notify(PSTR(" "), 0x80); Notify(PSTR(" "), 0x80);
} }
} }
#else #endif
memcpy(&srws1Data, buf, min(len, sizeof(srws1Data))); memcpy(&srws1Data, buf, min(len, sizeof(srws1Data)));
static SRWS1DataButtons oldButtonState;
if (srws1Data.btn.val != oldButtonState.val) { // Check if anything has changed
buttonClickState.val = srws1Data.btn.val & ~oldButtonState.val; // Update click state variable
oldButtonState.val = srws1Data.btn.val;
}
#if 0
if (srws1Data.leftTrigger) { if (srws1Data.leftTrigger) {
Serial.print(F("L2: ")); Serial.print(F("L2: "));
Serial.println(srws1Data.leftTrigger); Serial.println(srws1Data.leftTrigger);
@ -74,21 +68,6 @@ void SRWS1::ParseHIDData(USBHID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf)
if (srws1Data.btn.speedLimiter) Serial.println(F("Speed Limiter")); if (srws1Data.btn.speedLimiter) Serial.println(F("Speed Limiter"));
if (srws1Data.btn.rightGear) Serial.println(F("Right gear")); if (srws1Data.btn.rightGear) Serial.println(F("Right gear"));
static SRWS1DataButtons buttonClickState, oldButtonState;
if (srws1Data.btn.val != oldButtonState.val) { // Check if anything has changed
buttonClickState.val = srws1Data.btn.val & ~oldButtonState.val; // Update click state variable
oldButtonState.val = srws1Data.btn.val;
}
if (buttonClickState.lights) {
buttonClickState.lights = 0; // Clear event
static uint16_t leds = 0;
leds = leds << 1 | 1;
if (leds == 0xFFFF)
leds = 0; // Clear LEDs variable
setLeds(leds); // Note: disable the strobe light effect
}
if (srws1Data.assists) Serial.println(srws1Data.assists); if (srws1Data.assists) Serial.println(srws1Data.assists);
if (srws1Data.steeringSensitivity) Serial.println(srws1Data.steeringSensitivity); if (srws1Data.steeringSensitivity) Serial.println(srws1Data.steeringSensitivity);
if (srws1Data.assistValues) Serial.println(srws1Data.assistValues); if (srws1Data.assistValues) Serial.println(srws1Data.assistValues);

13
examples/HID/SRWS1/SRWS1.h
View file

@ -23,6 +23,18 @@
#define STEELSERIES_VID 0x1038 #define STEELSERIES_VID 0x1038
#define STEELSERIES_SRWS1_PID 0x1410 #define STEELSERIES_SRWS1_PID 0x1410
enum DPADEnum {
DPAD_UP = 0x0,
DPAD_UP_RIGHT = 0x1,
DPAD_RIGHT = 0x2,
DPAD_RIGHT_DOWN = 0x3,
DPAD_DOWN = 0x4,
DPAD_DOWN_LEFT = 0x5,
DPAD_LEFT = 0x6,
DPAD_LEFT_UP = 0x7,
DPAD_OFF = 0xF,
};
union SRWS1DataButtons { union SRWS1DataButtons {
struct { struct {
uint8_t dpad : 4; uint8_t dpad : 4;
@ -68,6 +80,7 @@ public:
}; };
void setLeds(uint16_t leds); void setLeds(uint16_t leds);
SRWS1Data srws1Data; SRWS1Data srws1Data;
SRWS1DataButtons buttonClickState;
private: private:
void ParseHIDData(USBHID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf); // Called by the HIDUniversal library void ParseHIDData(USBHID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf); // Called by the HIDUniversal library