Diff: VS1053.cpp

Revision:

1:c47269f0e9e1

Parent:

0:67cb2f650c15

--- a/VS1053.cpp	Tue Oct 12 14:11:52 2010 +0000
+++ b/VS1053.cpp	Sat Oct 16 05:14:59 2010 +0000
@@ -1,6 +1,10 @@
 #include "VS1053.h"
 #include "mbed.h"
 
+// patch binary
+#include "VS1053b_patch.c"
+// spectrum analyzer binary
+#include "VS1053b_specana.c"
 
 Serial pc(USBTX, USBRX);
 
@@ -17,7 +21,7 @@
      _DREQ(dreq),
      _DCS(dcs), 
      _VOL(vol) {
-    
+        firstTime=-1;    
     }    
 
 /*===================================================================
@@ -35,6 +39,7 @@
 void VS1053::dcs_low(void)
 {
     _DCS = 0;
+ 
 }
 void VS1053::dcs_high(void)
 {
@@ -62,11 +67,14 @@
 }
 void VS1053::reset(void)                    //hardware reset
 {
-    wait(0.01);
+//    wait(0.01);
+    wait_ms(10);
     _RST = 0;
-    wait(0.01);
+//    wait(0.01);
+    wait_ms(5);
     _RST = 1;
-    wait(0.10);
+//    wait(0.10);
+    wait_ms(10);
 }
 void VS1053::power_down(void)                //hardware and software reset
 {
@@ -81,7 +89,9 @@
 {
     _RST = 1;                                //no reset
     _spi.format(8,0);                        //spi 8bit interface, steady state low
-    _spi.frequency(1000000);                //rising edge data record, freq. 1Mhz
+ //   _spi.frequency(1000000);                //rising edge data record, freq. 1Mhz
+    _spi.frequency(2000000);                //rising edge data record, freq. 2Mhz
+
     
     cs_low();
     for(int i=0; i<4; i++)
@@ -95,7 +105,10 @@
 void VS1053::sdi_initialise(void)
 {
     _spi.format(8,0);
-    _spi.frequency(7000000);                //set to 7MHz
+//    _spi.frequency(7000000);                //set to 7MHz
+//    _spi.frequency(12000000);                //set to 12MHz to make fast transfer
+    _spi.frequency(18000000);                //set to 18MHz to make fast transfer
+//NG does not work//    _spi.frequency(24000000);                //set to 24MHz to make fast transfer
     
     cs_high();
     dcs_high();
@@ -120,9 +133,10 @@
     while(!_DREQ);
     _spi.write(datum);
     
-    sci_dis();
+//?    sci_dis();
+      sdi_dis();
 }
-unsigned short int VS1053::read(unsigned short int address)
+unsigned short int VS1053::sci_read(unsigned short int address)
 {
     cs_low();                                //enables SCI/disables SDI
     
@@ -198,11 +212,114 @@
 }
 #endif
 
+unsigned short int VS1053::wram_read(unsigned short int address)
+{
+    unsigned short int tmp1,tmp2;
+    sci_write(SCI_WRAMADDR,address);
+    tmp1=sci_read(SCI_WRAM);
+    sci_write(SCI_WRAMADDR,address);
+    tmp2=sci_read(SCI_WRAM);
+    if (tmp1==tmp2) return tmp1;
+    sci_write(SCI_WRAMADDR,address);
+    tmp1=sci_read(SCI_WRAM);
+    if (tmp1==tmp2) return tmp1;
+    sci_write(SCI_WRAMADDR,address);    
+    tmp1=sci_read(SCI_WRAM);
+    if (tmp1==tmp2) return tmp1;
+    return tmp1;    
+}
+
+void VS1053::wram_write(unsigned short int address, unsigned short int data)
+{
+    sci_write(SCI_WRAMADDR,address);
+    sci_write(SCI_WRAM,data);
+    return;
+}
+
+
 void VS1053::terminateStream(void)
 {
-    for(int n=0; n<2048; n++)
-       {
-           sdi_write(0x00);
-       }
+#if 1
+    unsigned int endFillByte=wram_read(para_endFillByte);
+//    printf("endFillByte:%04X\r\n",endFillByte); // debug
+    for(int n=0; n<2052; n++) sdi_write(0xFF&endFillByte);
+    sci_write(SCI_MODE,(SM_SDINEW+SM_CANCEL));
+    for(int n=0; n<2048; n++) sdi_write(0xFF&endFillByte);
+    // don't reset if you don't want to lose the patch 
+    //    sci_write(SCI_MODE,(SM_SDINEW+SM_RESET)); //  set mode reg.
+    //    wait_ms(10); 
+#endif 
+}
+
+void VS1053::write_plugin(const unsigned short *plugin, unsigned int len)
+{
+  unsigned int i;
+  unsigned short addr, n, val;
+
+  for(i=0; i<len;)
+  {
+    addr = plugin[i++];
+    n    = plugin[i++];
+    if(n & 0x8000U) //RLE run, replicate n samples
+    {
+      n  &= 0x7FFF;
+      val = plugin[i++];
+      while(n--) 
+      {
+        sci_write(addr,val);
+      }
+    }
+    else //copy run, copy n sample
+    {
+      while(n--)
+      {
+        val = plugin[i++];
+        sci_write(addr,val);
+      }
+    }
+  }
 
+  return;
 }
+
+
+void VS1053::initialize(void)
+{
+    _RST = 1;
+    cs_high();                           //chip disabled
+    sci_initialise();                    //initialise MBED
+    sci_write(SCI_MODE,(SM_SDINEW+SM_RESET)); //  set mode reg.
+    wait_ms(10); 
+#if 1
+       // debug
+        unsigned int chipID_0=wram_read(para_chipID_0);
+        if (firstTime) printf("chipID_0:%04X\r\n",chipID_0); // debug
+        unsigned int chipID_1=wram_read(para_chipID_1);
+        if (firstTime) printf("chipID_1:%04X\r\n",chipID_1); // debug      
+        unsigned int struct_version=wram_read(para_version);
+        if (firstTime) printf("structure version:%04X\r\n",struct_version); // debug      
+ #endif
+    //get chip version, set clock multiplier and load patch
+    int i = (sci_read(SCI_STATUS)&0xF0)>>4;
+    if(i == 4) 
+    {
+        if (firstTime) printf("Installed Chip is: VS1053\r\n");
+        sci_write(SCI_CLOCKF, (SC_MULT_XTALIx50+SC_ADD_20x)); 
+#ifdef VS_PATCH
+        // loading patch
+        write_plugin(vs1053b_patch, sizeof(vs1053b_patch)/2);
+        if (firstTime) {
+            printf("VS1053b patch loaded.\r\n");
+            printf("patch size:%d bytes\r\n",sizeof(vs1053b_patch));
+        }
+#endif
+#ifdef VS_SPECANA
+        // loading plugin(spectrum analyzer)
+        write_plugin(vs1053b_specana, sizeof(vs1053b_specana)/2);
+        if (firstTime) printf("VS1053b specana loaded.\r\n");
+#endif
+    }
+    else printf("??? Not Supported Chip???\r\n");
+    sdi_initialise(); 
+    firstTime=0; // disable message when init after 1st time
+}