Diff: main.cpp

Revision:

58:4bee89daccff

Parent:

57:7b8c49e1c1f6

Child:

61:a56cca07d4a6

diff -r 7b8c49e1c1f6 -r 4bee89daccff main.cpp
--- a/main.cpp	Thu Feb 18 23:20:49 2016 +0000
+++ b/main.cpp	Fri Feb 19 19:01:30 2016 +0000
@@ -10,6 +10,8 @@
 DigitalOut led_red(LED_RED);
 DigitalOut led_green(LED_GREEN);
 DigitalOut led_blue(LED_BLUE);
+DigitalOut status_0(D0);
+DigitalOut status_1(D1);
 
 // defined in dma.cpp
 extern int len;
@@ -50,93 +52,26 @@
     
     pc.printf("\r\n\r\n\r\n");
     
+    pdb_start();
     while(1) {
+        while(sampling_status == 0)
+        {   
+            led_green = 1;
+            status_0 = 1;
+        }
         
-        if(pc.readable() > 0) {
-            char temp = pc.getc();
-            
-            switch(temp) {
-                case 'F': // clear the samples
-                case 'f':
-                    for(int i = 0; i < len; i++) {sample_array0[i] = 0; sample_array1[i] = 0;}
-                    pc.printf("Arrays cleared\r\n");
-                    sampling_status = 0;
-                    pc.printf("Sampling status cleared\r\n");
-                    // then display the samples
-                    break;
-                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\t %i\t %i\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, static_output_array0[i], output_array0[i]);
-                    pc.printf("\r\n");
-                    break;
-                    
-                case 'L': // Load output array
-                case 'l':
-                    for(int i = 0; i < len; i++) 
-                        {
-                            static_output_array0[i] = (uint32_t) i + 10;
-                            pc.printf("%i\r\n", static_output_array0[i]);
-                        }
-                    break;
-
-                case 'D': // debug
-                case 'd':
-                    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_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);
-                    pc.printf("DMA_TCD1_BITER_ELINKNO: %x\r\n", DMA_TCD1_BITER_ELINKNO);
-                    pc.printf("DMA_TCD2_CITER_ELINKNO: %x\r\n", DMA_TCD2_CITER_ELINKNO);
-                    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_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_CITER_ELINKNO: %x\r\n", DMA_TCD5_CITER_ELINKNO);
-                    pc.printf("DMA_TCD5_BITER_ELINKNO: %x\r\n", DMA_TCD5_BITER_ELINKNO);
-                    pc.printf("\r\n");
-                    //pc.printf("DAC0_DAT0H: %x\r\n", DAC0_DAT0H);
-                    //pc.printf("DAC0_DAT0L: %x\r\n", DAC0_DAT0L);
-                    pc.printf("DAC0_DAT0: %i\r\n", (DAC0_DAT0H << 8) | DAC0_DAT0L);
-                    pc.printf("DMA_TCD2_SADDR: %i\r\n", DMA_TCD2_SADDR);
-                    pc.printf("DMA_TCD2_DADDR: %i\r\n", DMA_TCD2_DADDR);
-                    pc.printf("DAC0_DAT0H: %i\r\n", (uint32_t) &DAC0_DAT0H);
-                    pc.printf("DAC0_DAT0L: %i\r\n", (uint32_t) &DAC0_DAT0L);
-                    //int ptr;
-                    //ptr = DMA_TCD2_SADDR;
-                    //ptr = DMA_TCD2_SADDR;
-                    //ptr = DMA_TCD2_SADDR;
-                    pc.printf("Value at SADDR: %i\r\n", *((uint32_t *)DMA_TCD2_SADDR));
-                    
-                    pc.printf("Value of sampling_status: %i\r\n", sampling_status);                    
-                    break;
-                
-                case 'A': // analog out
-                case 'a':
-                    DAC0_DAT0H = 0x01;
-                    DAC0_DAT0L = 0x10;
-                    break;
-                    
-                // Programmable Delay Block debug
-                case 'B':
-                case 'b':
-                    pc.printf("Started PDB...samples being taken\r\n");
-                    pdb_start();
-                    break;
-                case 'K':
-                case 'k':
-                    pc.printf("Stopped PDB\r\n");
-                    pdb_stop();
-                    break;
-                case 'V':
-                case 'v':
-                    pc.printf("PDB: %i\r\n",PDB0_CNT);
-                    break;
+        sampling_status = 0;
+        led_green = 0;
+        status_0 = 0;
+        
+        status_1 = 1;
+        for(int i = 0; i < len; i++) {
+            static_output_array0[i] = static_input_array0[i] >> 4;
+            //pc.printf("%i\r\n", static_input_array0[i]);
             }
+        status_1 = 0;
         }
     
         
-    }
+    
 }
\ No newline at end of file