Diff: main.cpp

Revision:

3:eb63ba24e2bb

Parent:

2:c35c40bae96e

Child:

4:bd0675c58f5e

--- a/main.cpp	Thu Feb 13 20:26:20 2014 +0000
+++ b/main.cpp	Thu Feb 13 20:34:35 2014 +0000
@@ -8,16 +8,16 @@
 BusIn joy(p15,p12,p13,p16);
 DigitalIn fire(p14);
 PwmOut spkr(p26);
-PwmOut red (p23);
-PwmOut green (p24);
-PwmOut blue (p25);
 C12832 lcd(p5, p7, p6, p8, p11);
-AnalogIn pot1(p19);
-AnalogIn pot2(p20);
 DigitalIn up(p15); 
 DigitalIn down(p12);
+BusOut leds(LED1,LED2,LED3,LED4);
 
-BusOut leds(LED1,LED2,LED3,LED4);
+I2C i2cPort(p9,p10);
+char note;
+char length;
+const int masterAddress = 0x61;
+const int slaveAddress = 0x60;
 
 int main()
 {
@@ -56,10 +56,12 @@
         {
             leds=joy;
 #ifdef MASTER
-            if(up){
+            if(up)
+            {//master sends its song to slave
                 
             }
-            else if(down){
+            else if(down)
+            {//slave should send it's song to master
                 
             }
 #elif SLAVE