Diff: main.cpp

Revision:

13:02c28a5a26c0

Parent:

12:75efd1e2314c

Child:

14:87e9a40d39e7

--- a/main.cpp	Sat Feb 23 00:58:04 2019 +0000
+++ b/main.cpp	Sat Feb 23 01:03:39 2019 +0000
@@ -8,6 +8,7 @@
 #define SCLK_1 D13
 #define VDD 3.3
 
+#define NUM_CHANNELS 10
 
 AnalogOut vOut1(A3);
 AnalogOut vOut2(A4);
@@ -20,14 +21,13 @@
 //Serial pc(USBTX, USBRX, 9600);
 Serial rpi(PA_9,PA_10,115200);
 
-#define NUM_CHANNELS 10
 
 int32_t channel_data[NUM_CHANNELS];
 int32_t new_data;
-int32_t avg_data;
-int32t data_buffer[NUM_CHANNELS][10];
-int32t data_sum[NUM_CHANNELS];
-int32t ind = 0;
+int32_t avg_data[NUM_CHANNELS];
+int32_t data_buffer[NUM_CHANNELS][10];
+int32_t data_sum[NUM_CHANNELS];
+int32_t ind = 0;
 int num_samples = 0;
 int num_avgs = 4;
 int ptr =-1;
@@ -53,7 +53,6 @@
         val = adc1.read8bits(n,&int_status);
         pc.printf("reg %02x, val =%02x\r\n",n,val);
     }
-    
 }
 
 void print8bitRegsAdc2(char start_reg,char end_reg)
@@ -73,7 +72,7 @@
     if (ptr == num_avgs) {
         ptr = 0; //reset pointer
     }
-    if num_samples < num_avgs {
+    if (num_samples < num_avgs) {
         num_samples++; //increment number of samples
     }
     else {
@@ -86,7 +85,7 @@
         data_sum[n] += channel_data[n]; //add new sample
         avg_data[n] = data_sum[n] / num_avgs; //get new average    
     }
-{
+}
 
 
 int main()