Diff: master.cpp

Revision:

2:4709985cf716

Parent:

1:92677fbab5f1

--- a/master.cpp	Tue Dec 02 17:41:35 2014 +0000
+++ b/master.cpp	Tue Dec 02 20:24:18 2014 +0000
@@ -12,7 +12,9 @@
 int slaveAddressRow2;
 
 Serial Usb(USBTX, USBRX);
-char buffer[16] = {0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x00};
+//char buffer[16] = {0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x00};
+//char buffer[16] = {'$', 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF};
+char buffer[16];
 int ack;
 
 char slaveBuffer[16];
@@ -29,53 +31,17 @@
 int main() 
 {
     slaveAddressRow1 = 0x02;
-    //slaveAddressRow2 = 0x04;
-    //Self.address(slaveAddressRow2);
+
     resetBus();
     
     while (1) 
     {
-        //for(int i = 0; i < sizeof buffer; buffer[i++]=0x00);
-        //Usb.scanf("%s", buffer);
-        //Usb.printf("%s \n\r", buffer);
-        
-        wait(1);
-        
-        int ack1 = Bus.write(slaveAddressRow1 & 0xFE, buffer, 16);
-        if(ack1 == 0)
-            Usb.printf("Row one sent\n\r");
-        else
-            Usb.printf("No Ack");
-        //ack2 = Bus.write(slaveAddressRow2 & 0xFE, buffer, 16);             
-        //if(ack2 == 0)
-          //  Usb.printf("Row two sent\n\r");
+        for(int i = 0; i < sizeof buffer; buffer[i++]=0x00);
         
-        /*int i = Bus.receive();
-        switch (i) 
-        {
-            case I2CSlave::ReadAddressed:
-                Bus.write(slaveBuffer, 16);
-                PC.printf("wrote: %s \n\r", buffer);
-                break;
-            case I2CSlave::WriteGeneral:
-                Bus.read(slaveBuffer, 16);
-                PC.printf("received broadcast: %s \n\r", buffer);
-                break;
-            case I2CSlave::WriteAddressed:
-                Bus.read(slaveBuffer, 16);
-                PC.printf("received message: %s \n\r", buffer);
-                break;
-        }
-        
-        char cell = SELECTSIZE;
-        for(j = 0; j < ROWSIZE; j++)
-        {
-            toCells = buffer[j];
-            select = cell;
-            cell >>= 1;
-            wait(0.1);
-            select = 0x00; 
-        }
-          */  
+        Usb.scanf("%16s", buffer);
+        Usb.printf("%s \n\r", buffer);
+        while( Bus.write(slaveAddressRow1 & 0xFE, buffer, 16) != 0);
+        //if(ack1 == 0)
+            Usb.printf("Row one sent\n\r");
     }
 }
\ No newline at end of file