Merge pull request #591 from felis/fixes

Minor fixes
This commit is contained in:
Kristian Sloth Lauszus 2021-01-24 15:41:06 +01:00 committed by GitHub
commit 8758b2fc25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 8 deletions

View file

@ -65,10 +65,8 @@ protected:
virtual void OnInitBTHID() { virtual void OnInitBTHID() {
PS4Parser::Reset(); PS4Parser::Reset();
enable_sixaxis(); // Make the controller send out the entire output report enable_sixaxis(); // Make the controller send out the entire output report
if (pFuncOnInit) if (!pFuncOnInit)
pFuncOnInit(); // Call the user function setLed(Blue); // Only call this is a user function has not been set
else
setLed(Blue);
}; };
/** Used to reset the different buffers to there default values */ /** Used to reset the different buffers to there default values */

View file

@ -65,7 +65,7 @@ protected:
* @param len The length of the incoming data. * @param len The length of the incoming data.
* @param buf Pointer to the data buffer. * @param buf Pointer to the data buffer.
*/ */
virtual void ParseHIDData(USBHID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf) { virtual void ParseHIDData(USBHID *hid __attribute__((unused)), bool is_rpt_id __attribute__((unused)), uint8_t len, uint8_t *buf) {
if (HIDUniversal::VID == PS4_VID && (HIDUniversal::PID == PS4_PID || HIDUniversal::PID == PS4_PID_SLIM)) if (HIDUniversal::VID == PS4_VID && (HIDUniversal::PID == PS4_PID || HIDUniversal::PID == PS4_PID_SLIM))
PS4Parser::Parse(len, buf); PS4Parser::Parse(len, buf);
}; };

View file

@ -218,7 +218,7 @@ public:
* @param finger 0 = first finger, 1 = second finger. If omitted, then 0 will be used. * @param finger 0 = first finger, 1 = second finger. If omitted, then 0 will be used.
* @return Return the value of the counter, note that it is only a 7-bit value. * @return Return the value of the counter, note that it is only a 7-bit value.
*/ */
uint8_t getTouchCounter(uint8_t finger = 00) { uint8_t getTouchCounter(uint8_t finger = 0) {
return ps5Data.xy.finger[finger].counter; return ps5Data.xy.finger[finger].counter;
}; };

View file

@ -64,8 +64,6 @@ protected:
*/ */
virtual void OnInitBTHID() { virtual void OnInitBTHID() {
XBOXONESParser::Reset(); XBOXONESParser::Reset();
if (pFuncOnInit)
pFuncOnInit(); // Call the user function
}; };
/** Used to reset the different buffers to there default values */ /** Used to reset the different buffers to there default values */