Diff: Jareds_DSP/print_data.cpp

Revision:

78:10b2916b8f5c

Parent:

77:1ee17a9e9f8b

Child:

81:30d699e951a8

Child:

84:5b4466dd2326

--- a/Jareds_DSP/print_data.cpp	Mon Jun 05 18:09:37 2017 +0000
+++ b/Jareds_DSP/print_data.cpp	Tue Jun 06 18:15:00 2017 +0000
@@ -1,31 +1,44 @@
 #include "print_data.h"
 
+#define NUM_PRINT_INPUTS 2
 DigitalOut status_2(D4);
-int printing_length = 0;
-int printing_counter = 0;
-char print_buffer[50];
+int printing_length[NUM_PRINT_INPUTS] = {0};
+int printing_counter[NUM_PRINT_INPUTS] = {0};
+char print_buffer[NUM_PRINT_INPUTS][50];
+
 
 
 void print_filter_data(Serial *pc)
 {
-    if (printing_counter>=printing_length)
+    static int current_print_frequency = 0;
+    if (printing_counter[current_print_frequency]>=printing_length[current_print_frequency])
+    {
+        printing_counter[current_print_frequency]= 0;
+        printing_length[current_print_frequency] = 0;
+        current_print_frequency++;
+        if (current_print_frequency>=NUM_PRINT_INPUTS)
+        {
+            current_print_frequency=0;
+        }
         return;
+    }    
     status_2 = 1;
     //printf("Y");
-    pc->printf("%c",print_buffer[printing_counter]);
-    printing_counter++;
+    pc->printf("%c",print_buffer[current_print_frequency][printing_counter[current_print_frequency]]);
+    printing_counter[current_print_frequency]++;
 
     status_2 = 0;
 }
-void set_print_buffer(float mag,float phase)
+void set_print_buffer(float mag,float phase, int print_identifier)
 {
     
+    
     if (printing_counter<printing_length)
     {
         printf("PRINT OVERLOAD\n\r");
     }
     
-    printing_length=sprintf (print_buffer, "%E %f\n\r", mag, phase);
-    printing_counter = 0;
+    printing_length[print_identifier]=sprintf (print_buffer[print_identifier], "%d %E %f\n\r",print_identifier, mag, phase);
+    //printing_counter[print_identifier] = 0;
     
 }
\ No newline at end of file