Diff: main.cpp

Revision:

25:dbadea3c526d

Parent:

24:7fc204a3d013

Child:

26:7439102e0d9f

--- a/main.cpp	Tue May 05 21:31:55 2015 +0000
+++ b/main.cpp	Thu May 07 01:23:06 2015 +0000
@@ -6,12 +6,12 @@
 #include "stdlib.h"
 #include <vector>
 
-MODSERIAL telemetry_serial(USBTX, USBRX);
+MODSERIAL telemetry_serial(PTA2, PTA1);
 telemetry::MbedHal telemetry_hal(telemetry_serial);
 telemetry::Telemetry telemetry_obj(telemetry_hal);
 
 telemetry::Numeric<uint32_t> tele_time_ms(telemetry_obj, "time", "Time", "ms", 0);
-telemetry::NumericArray<uint16_t, 128> tele_linescan(telemetry_obj, "linescan", "Linescan", "ADC", 0);
+telemetry::NumericArray<float, 128> tele_linescan(telemetry_obj, "linescan", "Linescan", "ADC", 0);
 telemetry::Numeric<float> tele_motor_pwm(telemetry_obj, "motor", "Motor PWM", "%DC", 0);
 
 //Outputs
@@ -24,6 +24,7 @@
 DigitalOut break2(PTC0);
 PwmOut servo(PTA5);
 
+//Serial bt(PTA2, PTA1);
 //Serial pc(USBTX, USBRX); // tx, rx
 
 //Inputs
@@ -132,7 +133,7 @@
 }
 
 int main() {
-    
+    bluetooth_power.write(1);
     telemetry_serial.baud(115200);
     telemetry_obj.transmit_header();
     
@@ -208,7 +209,11 @@
             //Enable interrupts
             //interrupt.fall(&fallInterrupt);
             //interrupt.rise(&riseInterrupt);
-            
+            tele_time_ms = t.read_ms();
+            for (uint16_t i=0; i<128; i++) {
+                tele_linescan[i] = ADCdata[i];
+            }
+            telemetry_obj.do_io();
             if (firstTime){
             
                 maxVal = ADCdata[10];
@@ -344,11 +349,7 @@
             loopCounterForModdingSoThatWeCanIncreaseTheRecordingTime++;
         }
         //camData.
-        tele_time_ms = t.read_ms();
-        for (uint16_t i=0; i<128; i++) {
-            tele_linescan[i] = ADCdata[i];
-        }
-        telemetry_obj.do_io();
+        
         
     }
 /*