From 17cb44b5a27d17372c79e3fe95f757b61d332db5 Mon Sep 17 00:00:00 2001 From: Dennis Frett Date: Fri, 5 Feb 2021 10:43:02 +0100 Subject: [PATCH] Applied @xxxajk's formatting. --- MiniDSP.cpp | 28 ++++++++++++++-------------- MiniDSP.h | 17 +++++++++++------ examples/MiniDSP/MiniDSP.ino | 9 +++------ 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/MiniDSP.cpp b/MiniDSP.cpp index 90b7c716..3f869d59 100644 --- a/MiniDSP.cpp +++ b/MiniDSP.cpp @@ -14,45 +14,45 @@ #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}; // 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; // Check if this is a status update. // 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. // Response is of format [ length ] [ 0x05 0xFF 0xDA ] [ volume ] [ muted ]. - const auto newVolume = buf[sizeof(StatusInputCommand) + 1]; - const auto newIsMuted = (bool)buf[sizeof(StatusInputCommand) + 2]; + const auto newVolume = buf[sizeof (StatusInputCommand) + 1]; + const auto newIsMuted = (bool)buf[sizeof (StatusInputCommand) + 2]; // Update status. volume = newVolume; muted = newIsMuted; // Call callbacks. - if (pFuncOnVolumeChange != nullptr && newVolume != volume) + if(pFuncOnVolumeChange != nullptr && newVolume != volume) pFuncOnVolumeChange(volume); - if (pFuncOnMutedChange != nullptr && newIsMuted != muted) + if(pFuncOnMutedChange != nullptr && newIsMuted != muted) pFuncOnMutedChange(muted); } }; uint8_t MiniDSP::OnInitSuccessful() { // 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; // Request current status so we can initialize the values. RequestStatus(); - if (pFuncOnInit != nullptr) + if(pFuncOnInit != nullptr) pFuncOnInit(); return 0; @@ -60,7 +60,7 @@ uint8_t MiniDSP::OnInitSuccessful() { uint8_t MiniDSP::Checksum(const uint8_t *data, uint8_t data_length) const { 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]; 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 { // Sanity check on command length. - if (command_length > 63) + if(command_length > 63) return; // 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); // 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 { uint8_t RequestStatusOutputCommand[] = {0x05, 0xFF, 0xDA, 0x02}; - SendCommand(RequestStatusOutputCommand, sizeof(RequestStatusOutputCommand)); + SendCommand(RequestStatusOutputCommand, sizeof (RequestStatusOutputCommand)); } diff --git a/MiniDSP.h b/MiniDSP.h index 4f5dc000..9cfe3c82 100644 --- a/MiniDSP.h +++ b/MiniDSP.h @@ -30,12 +30,14 @@ * It uses the HIDUniversal class for all the USB communication. */ class MiniDSP : public HIDUniversal { - public: +public: + /** * Constructor for the MiniDSP class. * @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. @@ -50,7 +52,9 @@ class MiniDSP : public HIDUniversal { * initialized. * @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. @@ -98,7 +102,7 @@ class MiniDSP : public HIDUniversal { return muted; } - protected: +protected: /** @name HIDUniversal implementation */ /** * Used to parse USB HID data. @@ -119,6 +123,7 @@ class MiniDSP : public HIDUniversal { /**@}*/ /** @name USBDeviceConfig implementation */ + /** * Used by the USB core to check what this driver support. * @param vid The device's VID. @@ -131,9 +136,9 @@ 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. * @param data Buffer to calculate checksum for. * @param data_length Length of the buffer. diff --git a/examples/MiniDSP/MiniDSP.ino b/examples/MiniDSP/MiniDSP.ino index 8b7a20be..a289df2d 100644 --- a/examples/MiniDSP/MiniDSP.ino +++ b/examples/MiniDSP/MiniDSP.ino @@ -28,14 +28,11 @@ void OnMutedChange(bool isMuted) { void setup() { Serial.begin(115200); #if !defined(__MIPSEL__) - while (!Serial) - ; // Wait for serial port to connect - used on Leonardo, Teensy and other - // boards with built-in USB CDC serial connection + while(!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection #endif - if (Usb.Init() == -1) { + if(Usb.Init() == -1) { Serial.print(F("\r\nOSC did not start")); - while (1) - ; // Halt + while(1); // Halt } Serial.println(F("\r\nMiniDSP 2x4HD Library Started"));