Diff: main.cpp

Revision:

4:75077e05de3e

Parent:

3:7acf6d1a6b1e

Child:

5:832b59a73dec

--- a/main.cpp	Thu Jun 05 14:57:10 2014 +0000
+++ b/main.cpp	Fri Jun 06 13:10:57 2014 +0000
@@ -1,15 +1,28 @@
 #include "mbed.h"
-
+#include "USBSerial.h"
+//#define BAUD 460800
+//#define BAUD 9600
 
-Serial pc(USBTX, USBRX);
-
-DigitalOut led1(LED1);
+#define __LPC1768
+#if defined( __LPC1768)
+//Serial pc(USBTX, USBRX);
+USBSerial pc;
 DigitalOut led2(LED2);
 DigitalOut led3(LED3);
 DigitalOut led4(LED4);
 AnalogIn adc_1(p16);
 AnalogIn adc_2(p17);
-uint16_t  T_hma_u16[2][4096];
+#endif
+#if defined( __KL25)
+USBSerial pc;
+DigitalOut led2(LED_GREEN);
+DigitalOut led3(LED_RED);
+DigitalOut led4(LED_BLUE);
+AnalogIn adc_1(PTC1);
+AnalogIn adc_2(PTC2);
+#endif
+
+uint16_t  T_hma_u16[2][2048];
 uint16_t index_hma_write=0;
 
 uint16_t index_hma_read=0;
@@ -21,7 +34,7 @@
 
 void flipADC()
 {
-led4=1;
+
     T_hma_u16[t_write][index_hma_write++]=adc_1.read_u16(); //read ADC
     T_hma_u16[t_write][index_hma_write++]=adc_2.read_u16(); //read ADC
     //T_hma_u16[t_write][index_hma_write++]=0x00FF;
@@ -32,7 +45,7 @@
         index_hma_read=index_hma_write-2;
         index_hma_write=0;
     }
-    led4=0;
+
 }
 
 Ticker flipperUSB;
@@ -46,32 +59,30 @@
 void pc_rx(void)
 {
 
-
+led4=1;
     for(; pc.readable()==true; ++start_str) {
         str[start_str]=pc.getc();
     }
-
-    if( strcmp(str,"*IDN?")==0 || strcmp(str,"*ID?")==0) {
-        pc.printf("HMA\r");
+//pc.printf("recv:%s",str);
+    if( strncmp(str,"*IDN?",strlen("*IDN?"))==0 ) {
+        //pc.printf("HMA\r");
+        led3=1;
+        pc.printf("HMA serial\r");
         start_str=0;
         for(int i=0; i<256; ++i) {
             str[i]='\0';
 
         }
-        led4=1;
-        led2=0;
-        led3=0;
-    } else if( strcmp(str,"MEASure")==0 || strcmp(str,"MEAS")==0 || strcmp(str,"measure")==0) {
+
+    } else if( strncmp(str,"MEASure",strlen("MEASure"))==0 ) {
         for(int i=0; i<256; ++i) {
             str[i]='\0';
 
         }
         flipperADC.attach_us(&flipADC, 1000); //500us
-        led4=0;
-        led2=1;
-        led3=0;
+ 
 
-    } else if( strcmp(str,"ABORt")==0 || strcmp(str,"ABOR")==0 || strcmp(str,"ABORT")==0) {
+    } else if( strncmp(str,"ABORt",strlen("ABORt"))==0 ) {
         for(int i=0; i<256; ++i) {
             str[i]='\0';
 
@@ -80,9 +91,7 @@
         t_write=0;
         index_hma_read=0;
         index_hma_write=0;
-        led4=0;
-        led2=0;
-        led3=1;
+
     }
     for(int i=0; i<start_str; ++i) {
         if(str[i]=='\r') {
@@ -101,25 +110,25 @@
 
 int main()
 {
-
-    pc.baud(460800);
+led2=0;
+led3=0;
+led4=0;
+//    pc.baud(BAUD);
+    pc.printf("HMA serial\r");
     for(int i=0; i<256; ++i) {
         str[i]='\0';
 
     }
-    //RUN ADC
 
-//    flipperADC.attach_us(&flipADC, 500); //500us
-//    flipperUSB.attach(&flipUSB,0.5); //500ms
 
     while(1) {
-    led1=0;
+ 
         if (pc.readable()) {
             pc_rx();
         }
         if(flag_write_USB==1) {
             flag_write_USB=0;
-            led1=1;
+
 
             pc.printf("%04d%c\r",index_hma_read,'\0'); //'\0'fin de chaine ASCII '\r' fin de transmission