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

Applied @xxxajk's formatting.

Browse source
This commit is contained in:
Dennis Frett 2021-02-05 10:43:02 +01:00
parent df0a711a3a
commit 17cb44b5a2
3 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
MiniDSP.cpp
View file

@ -14,45 +14,45 @@
#include "MiniDSP.h" #include "MiniDSP.h"
void MiniDSP::ParseHIDData(USBHID *hid __attribute__((unused)), bool is_rpt_id __attribute__((unused)), uint8_t len, uint8_t *buf) { void MiniDSP::ParseHIDData(USBHID *hid __attribute__ ((unused)), bool is_rpt_id __attribute__ ((unused)), uint8_t len, uint8_t *buf) {
constexpr uint8_t StatusInputCommand[]{0x05, 0xFF, 0xDA}; constexpr uint8_t StatusInputCommand[]{0x05, 0xFF, 0xDA};
// Only care about valid data for the MiniDSP 2x4HD. // Only care about valid data for the MiniDSP 2x4HD.
if (HIDUniversal::VID != MINIDSP_VID || HIDUniversal::PID != MINIDSP_PID || len <= 4 || buf == nullptr) if(HIDUniversal::VID != MINIDSP_VID || HIDUniversal::PID != MINIDSP_PID || len <= 4 || buf == nullptr)
return; return;
// Check if this is a status update. // Check if this is a status update.
// First byte is the length, we ignore that for now. // First byte is the length, we ignore that for now.
if (memcmp(buf + 1, StatusInputCommand, sizeof(StatusInputCommand)) == 0) { if(memcmp(buf + 1, StatusInputCommand, sizeof (StatusInputCommand)) == 0) {
// Parse data. // Parse data.
// Response is of format [ length ] [ 0x05 0xFF 0xDA ] [ volume ] [ muted ]. // Response is of format [ length ] [ 0x05 0xFF 0xDA ] [ volume ] [ muted ].
const auto newVolume = buf[sizeof(StatusInputCommand) + 1]; const auto newVolume = buf[sizeof (StatusInputCommand) + 1];
const auto newIsMuted = (bool)buf[sizeof(StatusInputCommand) + 2]; const auto newIsMuted = (bool)buf[sizeof (StatusInputCommand) + 2];
// Update status. // Update status.
volume = newVolume; volume = newVolume;
muted = newIsMuted; muted = newIsMuted;
// Call callbacks. // Call callbacks.
if (pFuncOnVolumeChange != nullptr && newVolume != volume) if(pFuncOnVolumeChange != nullptr && newVolume != volume)
pFuncOnVolumeChange(volume); pFuncOnVolumeChange(volume);
if (pFuncOnMutedChange != nullptr && newIsMuted != muted) if(pFuncOnMutedChange != nullptr && newIsMuted != muted)
pFuncOnMutedChange(muted); pFuncOnMutedChange(muted);
} }
}; };
uint8_t MiniDSP::OnInitSuccessful() { uint8_t MiniDSP::OnInitSuccessful() {
// Verify we're actually connected to the MiniDSP 2x4HD. // Verify we're actually connected to the MiniDSP 2x4HD.
if (HIDUniversal::VID != MINIDSP_VID || HIDUniversal::PID != MINIDSP_PID) if(HIDUniversal::VID != MINIDSP_VID || HIDUniversal::PID != MINIDSP_PID)
return 0; return 0;
// Request current status so we can initialize the values. // Request current status so we can initialize the values.
RequestStatus(); RequestStatus();
if (pFuncOnInit != nullptr) if(pFuncOnInit != nullptr)
pFuncOnInit(); pFuncOnInit();
return 0; return 0;
@ -60,7 +60,7 @@ uint8_t MiniDSP::OnInitSuccessful() {
uint8_t MiniDSP::Checksum(const uint8_t *data, uint8_t data_length) const { uint8_t MiniDSP::Checksum(const uint8_t *data, uint8_t data_length) const {
uint16_t sum = 0; uint16_t sum = 0;
for (uint8_t i = 0; i < data_length; i++) for(uint8_t i = 0; i < data_length; i++)
sum += data[i]; sum += data[i];
return sum & 0xFF; return sum & 0xFF;
@ -68,7 +68,7 @@ uint8_t MiniDSP::Checksum(const uint8_t *data, uint8_t data_length) const {
void MiniDSP::SendCommand(uint8_t *command, uint8_t command_length) const { void MiniDSP::SendCommand(uint8_t *command, uint8_t command_length) const {
// Sanity check on command length. // Sanity check on command length.
if (command_length > 63) if(command_length > 63)
return; return;
// Message is padded to 64 bytes with 0xFF and is of format: // Message is padded to 64 bytes with 0xFF and is of format:
@ -89,13 +89,13 @@ void MiniDSP::SendCommand(uint8_t *command, uint8_t command_length) const {
buf[checksumOffset] = Checksum(buf, command_length + 1); buf[checksumOffset] = Checksum(buf, command_length + 1);
// Pad the rest. // Pad the rest.
memset(&buf[checksumOffset + 1], 0xFF, sizeof(buf) - checksumOffset - 1); memset(&buf[checksumOffset + 1], 0xFF, sizeof (buf) - checksumOffset - 1);
pUsb->outTransfer(bAddress, epInfo[epInterruptOutIndex].epAddr, sizeof(buf), buf); pUsb->outTransfer(bAddress, epInfo[epInterruptOutIndex].epAddr, sizeof (buf), buf);
} }
void MiniDSP::RequestStatus() const { void MiniDSP::RequestStatus() const {
uint8_t RequestStatusOutputCommand[] = {0x05, 0xFF, 0xDA, 0x02}; uint8_t RequestStatusOutputCommand[] = {0x05, 0xFF, 0xDA, 0x02};
SendCommand(RequestStatusOutputCommand, sizeof(RequestStatusOutputCommand)); SendCommand(RequestStatusOutputCommand, sizeof (RequestStatusOutputCommand));
} }

15
MiniDSP.h
View file

@ -30,12 +30,14 @@
* It uses the HIDUniversal class for all the USB communication. * It uses the HIDUniversal class for all the USB communication.
*/ */
class MiniDSP : public HIDUniversal { class MiniDSP : public HIDUniversal {
public: public:
/** /**
* Constructor for the MiniDSP class. * Constructor for the MiniDSP class.
* @param p Pointer to the USB class instance. * @param p Pointer to the USB class instance.
*/ */
MiniDSP(USB *p) : HIDUniversal(p){}; MiniDSP(USB *p) : HIDUniversal(p) {
};
/** /**
* Used to check if a MiniDSP 2x4HD is connected. * Used to check if a MiniDSP 2x4HD is connected.
@ -50,7 +52,9 @@ class MiniDSP : public HIDUniversal {
* initialized. * initialized.
* @param funcOnInit Function to call. * @param funcOnInit Function to call.
*/ */
void attachOnInit(void (*funcOnInit)(void)) { pFuncOnInit = funcOnInit; }; void attachOnInit(void (*funcOnInit)(void)) {
pFuncOnInit = funcOnInit;
};
/** /**
* Used to call your own function when the volume has changed. * Used to call your own function when the volume has changed.
@ -98,7 +102,7 @@ class MiniDSP : public HIDUniversal {
return muted; return muted;
} }
protected: protected:
/** @name HIDUniversal implementation */ /** @name HIDUniversal implementation */
/** /**
* Used to parse USB HID data. * Used to parse USB HID data.
@ -119,6 +123,7 @@ class MiniDSP : public HIDUniversal {
/**@}*/ /**@}*/
/** @name USBDeviceConfig implementation */ /** @name USBDeviceConfig implementation */
/** /**
* Used by the USB core to check what this driver support. * Used by the USB core to check what this driver support.
* @param vid The device's VID. * @param vid The device's VID.
@ -131,7 +136,7 @@ class MiniDSP : public HIDUniversal {
}; };
/**@}*/ /**@}*/
private: private:
/** /**
* Calculate checksum for given buffer. * Calculate checksum for given buffer.
* Checksum is given by summing up all bytes in `data` and returning the first byte. * Checksum is given by summing up all bytes in `data` and returning the first byte.

9
examples/MiniDSP/MiniDSP.ino
View file

@ -28,14 +28,11 @@ void OnMutedChange(bool isMuted) {
void setup() { void setup() {
Serial.begin(115200); Serial.begin(115200);
#if !defined(__MIPSEL__) #if !defined(__MIPSEL__)
while (!Serial) while(!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
; // Wait for serial port to connect - used on Leonardo, Teensy and other
// boards with built-in USB CDC serial connection
#endif #endif
if (Usb.Init() == -1) { if(Usb.Init() == -1) {
Serial.print(F("\r\nOSC did not start")); Serial.print(F("\r\nOSC did not start"));
while (1) while(1); // Halt
; // Halt
} }
Serial.println(F("\r\nMiniDSP 2x4HD Library Started")); Serial.println(F("\r\nMiniDSP 2x4HD Library Started"));