Diff: VS1053.h

Revision:

10:a8594af40a50

Parent:

9:1dd0ecaac8e5

--- a/VS1053.h	Thu Jul 16 18:17:42 2015 +0000
+++ b/VS1053.h	Fri Jul 24 11:05:54 2015 +0000
@@ -6,8 +6,8 @@
 
 #ifndef KAYX_VS1053_H_
 #define KAYX_VS1053_H_
-
-//SCI_MODE register bits as of p.26 of the datasheet
+#pragma O3
+//SCI_MODE register bits
 #define SM_DIFF         0x0001
 #define SM_SETTOZERO    0x0002
 #define SM_RESET        0x0004
@@ -32,7 +32,7 @@
 private:
     SPI        spi;
     DigitalOut cs;
-    DigitalOut bsync;
+    DigitalOut dcs;
     DigitalIn  dreq;
     DigitalOut rst;
 
@@ -55,23 +55,24 @@
     static const uint8_t SCI_AICTRL3     = 0x0f;
     
     VS1053(PinName mosiPin, PinName misoPin, PinName sckPin,
-           PinName csPin, PinName bsyncPin, PinName dreqPin, PinName rstPin,
+           PinName csPin, PinName dcsPin, PinName dreqPin, PinName rstPin,
            uint32_t spiFrequency=7000000);
     ~VS1053();
     void hardwareReset();
     void sendDataByte(uint8_t data);
     size_t sendDataBlock(uint8_t* data, size_t length);
+    bool checkDREQ();
     void sci_init();
     void sdi_init();
     bool sendCancel();
     bool stop();
     void sine_test_activate(unsigned char wave);
     void sine_test_deactivate();
-    void VS1053::VolControl(uint16_t vol);
+    void VolControl(uint16_t vol);
+    uint16_t readReg(uint8_t);
 
 private:
     void writeReg(uint8_t, uint16_t);
-    uint16_t readReg(uint8_t);
     uint32_t useSpiFreq;
     void sci_en();
     void sci_dis();