Revision 11:2fcbac0f72dd, committed 2016-03-29

Comitter:

k4zuki

Date:

Tue Mar 29 18:54:53 2016 +0900

Parent:

10:31c65ba8b7ea

Child:

12:8e1f4f2156f9

Commit message:

merged

Changed in this revision

--- a/main.cpp	Tue Mar 29 09:09:34 2016 +0000
+++ b/main.cpp	Tue Mar 29 18:54:53 2016 +0900
@@ -57,46 +57,36 @@
 //    i2s.write(minibuf, to_write);
 //}
 Serial pc(USBTX,USBRX);
-#define _I2S0_TCSR (*((uint32_t*)0x4002F000u))
 /* main */
 int main()
 {
     pc.baud(115200);
     pc.printf("printf\n\r");
-    uint32_t hoge = 0;
-    pc.printf("hoge = 0x%08X\n\r",hoge);
-    pc.printf("hoge = I2S0->MCR = ");
-    hoge = I2S0->MCR;
-    pc.printf("0x%08X\n\r",hoge);
-//    (((I2S_Type *)0x4002F000u)->TCSR);
-//    pc.printf("&I2S0_TCSR = %08X\n\r",hoge);
-//        ((I2S0_TCSR)) |= 1u<<31;
-//    pc.printf("&I2S0_TCSR = %08X\n\r",I2S0_TCSR);
     // skipper = (aIn*49)+1;
-    //
+
     // codec.power(true);
     // codec.frequency(SAMPLERATE);
     // codec.wordsize(16);
     // codec.master(false);
     // codec.headphone_volume(0.5);
     // codec.start();
-    //
-//    i2s.frequency(SAMPLERATE);
-//    i2s.wordsize(16);
-//    i2s.stereomono(I2S_STEREO);
-//    i2s.masterslave(I2S_MASTER);
-//    i2s.attach(&play);
-//    i2s.start();
+
+    // i2s.frequency(SAMPLERATE);
+    // i2s.wordsize(16);
+    // i2s.stereomono(I2S_STEREO);
+    // i2s.masterslave(I2S_MASTER);
+    // i2s.attach(&play);
+    // i2s.start();
     while(1)
     {
         pc.printf(".");
         wait_ms(500);
         // skipper = (aIn*30)+1;
-        //
+
         // volume = 1;
-        // phase_kill = (vol-0.5)*400;
-        //
-        // //printf("Skipper:%f, %i, %i\n\r",skipper, to_write,i2s.fifo_level());
+        // phase_kill = (vol - 0.5) * 400;
+
+        // printf("Skipper:%f, %i, %i\n\r",skipper, to_write,i2s.fifo_level());
         /*if(flag)
         {
         printf(".");