Diff: main.cpp

Revision:

63:7903a33e2fd4

Parent:

61:a56cca07d4a6

Child:

64:bb4a4bd57681

diff -r 51f722ef9cb1 -r 7903a33e2fd4 main.cpp
--- a/main.cpp	Mon Feb 22 19:52:12 2016 +0000
+++ b/main.cpp	Tue Feb 23 19:49:42 2016 +0000
@@ -52,8 +52,8 @@
     
     pc.printf("\r\n\r\n\r\n");
     
-    pdb_start();
-    while(1) 
+    //pdb_start();
+/*    while(1) 
         {
             while(sampling_status == 0)
             {   
@@ -74,8 +74,11 @@
             status_1 = 0;
         }
 }
-    
- /*       if(pc.readable() > 0) {
+ 
+ */   
+     while(1) 
+        {
+        if(pc.readable() > 0) {
             char temp = pc.getc();
             
             switch(temp) {
@@ -88,7 +91,10 @@
                 case 'S': // display what's been sampled
                 case 's':
                     for(int i = 0; i < len; i++) pc.printf("%i: %f\t %f\t %f\t %f\r\n",i,sample_array0[i]*3.3/65535,sample_array1[i]*3.3/65535,static_input_array0[i]*3.3/65535,static_input_array1[i]*3.3/65535);
+                    for(int i = len; i < len*2; i++) pc.printf("%i: %f\t %f\t %f\t %f\r\n",i,sample_array0[i]*3.3/65535,sample_array1[i]*3.3/65535,(float) 100, (float) 100);
                     pc.printf("\r\n");
+                    //pc.printf("0: %f\t %f\t %f\t %f\r\n",0,sample_array0[0]*3.3/65535,sample_array1[0]*3.3/65535,static_input_array0[0]*3.3/65535,static_input_array1[0]*3.3/65535);
+                    //pc.printf("\r\n");
                     break;
  
                 case 'D': // DMA debug
@@ -96,6 +102,9 @@
                     pc.printf("DMA Status:\r\n");
                     pc.printf("DMA_TCD0_SOFF: %x\r\n", DMA_TCD0_SOFF);
                     pc.printf("DMA_TCD1_SOFF: %x\r\n", DMA_TCD1_SOFF);
+                    pc.printf("DMA_TCD0_SADDR: %i\r\n", DMA_TCD0_SADDR);
+                    pc.printf("DMA_TCD0_DADDR: %i\r\n", DMA_TCD0_DADDR);
+
                     pc.printf("DMA_TCD0_CITER_ELINKNO: %x\r\n", DMA_TCD0_CITER_ELINKNO);
                     pc.printf("DMA_TCD0_BITER_ELINKNO: %x\r\n", DMA_TCD0_BITER_ELINKNO);
                     pc.printf("DMA_TCD1_CITER_ELINKNO: %x\r\n", DMA_TCD1_CITER_ELINKNO);
@@ -104,7 +113,23 @@
                     pc.printf("DMA_TCD2_BITER_ELINKNO: %x\r\n", DMA_TCD2_BITER_ELINKNO);
                     pc.printf("DMA_TCD3_CITER_ELINKNO: %x\r\n", DMA_TCD3_CITER_ELINKNO);
                     pc.printf("DMA_TCD3_BITER_ELINKNO: %x\r\n", DMA_TCD3_BITER_ELINKNO);
-                    
+                    pc.printf("DMA Status:\r\n");
+                    pc.printf("DMA_TCD4_SADDR: %i\r\n", DMA_TCD4_SADDR);
+                    pc.printf("DMA_TCD4_DADDR: %i\r\n", DMA_TCD4_DADDR);
+                    pc.printf("DMA_TCD4_CITER_ELINKNO: %x\r\n", DMA_TCD4_CITER_ELINKNO);
+                    pc.printf("DMA_TCD4_BITER_ELINKNO: %x\r\n", DMA_TCD4_BITER_ELINKNO);
+                    pc.printf("DMA_TCD5_SADDR: %i\r\n", DMA_TCD5_SADDR);
+                    pc.printf("DMA_TCD5_DADDR: %i\r\n", DMA_TCD5_DADDR);
+                    pc.printf("DMA_TCD5_CITER_ELINKNO: %x\r\n", DMA_TCD5_CITER_ELINKNO);
+                    pc.printf("DMA_TCD5_BITER_ELINKNO: %x\r\n", DMA_TCD5_BITER_ELINKNO);
+                    pc.printf("DMA_TCD6_CITER_ELINKNO: %x\r\n", DMA_TCD6_CITER_ELINKNO);
+                    pc.printf("DMA_TCD6_BITER_ELINKNO: %x\r\n", DMA_TCD6_BITER_ELINKNO);
+                    pc.printf("DMA_TCD7_CITER_ELINKNO: %x\r\n", DMA_TCD7_CITER_ELINKNO);
+                    pc.printf("DMA_TCD7_BITER_ELINKNO: %x\r\n", DMA_TCD7_BITER_ELINKNO);
+                    pc.printf("DMA_TCD8_CITER_ELINKNO: %x\r\n", DMA_TCD8_CITER_ELINKNO);
+                    pc.printf("DMA_TCD8_BITER_ELINKNO: %x\r\n", DMA_TCD8_BITER_ELINKNO);
+                    pc.printf("DMA_TCD9_CITER_ELINKNO: %x\r\n", DMA_TCD9_CITER_ELINKNO);
+                    pc.printf("DMA_TCD9_BITER_ELINKNO: %x\r\n", DMA_TCD9_BITER_ELINKNO);
                     break;
 
                 
@@ -121,6 +146,11 @@
                     pc.printf("Stopped PDB\r\n");
                     pdb_stop();
                     break;
+                case 'T':
+                case 't':
+                    pc.printf("One step of PDB\r\n");
+                    pdb_step();
+                    break;
                 case 'V':
                 case 'v':
                     pc.printf("PDB: %i\r\n",PDB0_CNT);
@@ -132,4 +162,3 @@
         }   
 
 }
-*/
\ No newline at end of file