Diff: main.cpp

Revision:

56:7e08cbc3a4f1

Parent:

55:2526b3317bc8

Child:

57:7b8c49e1c1f6

--- a/main.cpp	Wed Feb 17 20:26:26 2016 +0000
+++ b/main.cpp	Thu Feb 18 23:05:07 2016 +0000
@@ -20,6 +20,7 @@
 extern uint16_t static_input_array1[];
 
 extern uint16_t static_output_array0[];
+extern uint16_t output_array0[];
 
 using namespace std;
  
@@ -101,11 +102,20 @@
                     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\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 = 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': // DMA debug
+                case 'D': // debug
                 case 'd':
                     pc.printf("DMA Status:\r\n");
                     pc.printf("DMA_TCD0_SOFF: %x\r\n", DMA_TCD0_SOFF);
@@ -118,9 +128,30 @@
                     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));
                     break;
                 
+                case 'A': // analog out
+                case 'a':
+                    DAC0_DAT0H = 0x01;
+                    DAC0_DAT0L = 0x10;
+                    break;
                     
                 // Programmable Delay Block debug
                 case 'B':