Jostein Baustad / WavPlayer

WavPlayer.h changed to circuit board

Dependents:   WavPlayerSD WavPlayerUSB WavPlayerUSB WavPlayerSD_CB

Files at this revision

API Documentation at this revision

Revision 4:b0186c8dca92, committed 2019-04-14

Comitter:
JostBaus
Date:
Sun Apr 14 16:22:17 2019 +0000
Parent:
3:a7380cfc1987
Commit message:
Changed pins to match the circuit board, Replaced the wav_player.h lib with another one

Changed in this revision

I2S/I2S.cpp Show annotated file Show diff for this revision Revisions of this file
WavPlayer.cpp Show annotated file Show diff for this revision Revisions of this file 
diff -r a7380cfc1987 -r b0186c8dca92 I2S/I2S.cpp
--- a/I2S/I2S.cpp	Fri Sep 21 14:24:00 2012 +0000
+++ b/I2S/I2S.cpp	Sun Apr 14 16:22:17 2019 +0000
@@ -441,11 +441,11 @@
 
     if (_rxtx == I2S_TRANSMIT) {
         printf("\n\rSetting up pins....\n\r");
-        if (_sd != p5)
+        if (_sd != p11)
             pin_setup_err++;
-        if (_ws != p6 && ws_d == true)
+        if (_ws != p13 && ws_d == true)
             pin_setup_err++;
-        if (_clk != p7 && clk_d == true)
+        if (_clk != p12 && clk_d == true)
             pin_setup_err++;
         printf("Hmm....%i\n\r", pin_setup_err);
     } else {
@@ -477,7 +477,7 @@
                 val2 = 0;
             }
 
-            if (_sd == p8)
+            if (_sd == p15)
                 LPC_PINCON->PINSEL0 |= (val1 << 12);
             else
                 LPC_PINCON->PINSEL1 |= (val2 << 18);
@@ -490,7 +490,7 @@
             }
 
             if (clk_d == true) {
-                if (_clk == p15)
+                if (_clk == p16)
                     LPC_PINCON->PINSEL0 |= (val1 << 8);
                 else
                     LPC_PINCON->PINSEL1 |= (val2 << 14);

diff -r a7380cfc1987 -r b0186c8dca92 WavPlayer.cpp
--- a/WavPlayer.cpp	Fri Sep 21 14:24:00 2012 +0000
+++ b/WavPlayer.cpp	Sun Apr 14 16:22:17 2019 +0000
@@ -31,7 +31,7 @@
 //void WavPlayer::i2sisr();
 
 WavPlayer::WavPlayer() :
-        flag_play(true), i2s(I2S_TRANSMIT, p5, p6, p7), codec(p9, p10)//, ext_flag(p22), //run_flag(p23)
+        flag_play(true), i2s(I2S_TRANSMIT, p11, p12, p13), codec(p27, p28)//, ext_flag(p22), //run_flag(p23)
 {
     instance = this;
     codec.power(true);                  //power up TLV apart from analogue input
@@ -56,7 +56,7 @@
     volume = 1;
 }
 
-WavPlayer::WavPlayer(FILE **fpp):flag_play(true), i2s(I2S_TRANSMIT, p5, p6, p7), codec(p9, p10)//, ext_flag(p22), //run_flag(p23)
+WavPlayer::WavPlayer(FILE **fpp):flag_play(true), i2s(I2S_TRANSMIT, p11, p12, p13), codec(p27, p28)//, ext_flag(p22), //run_flag(p23)
 {
     instance = this;
     codec.power(true);                  //power up TLV apart from analogue input