Diff: main.cpp

Revision:

1:433aa8107296

Parent:

0:d35d9bdef147

--- a/main.cpp	Mon May 15 15:30:56 2017 +0000
+++ b/main.cpp	Tue Jun 19 11:47:26 2018 +0000
@@ -13,7 +13,7 @@
 C12832 lcd(p5, p7, p6, p8, p11); //define pin for LCD screen
 InterruptIn button(p14); // button used for zeroing - joystick
 I2C i2c(p28, p27);
-Serial pc(USBTX, USBRX);
+Serial pc(d+, d-);
 Timeout to1; // timeer...
 MLX90393 sensor(MLX90393::i2c_address,&i2c);
 
@@ -22,7 +22,7 @@
 bool Blink_started=false;
 bool CleanScreen=false;
 
-
+USBSerial serial;
 
 int main() 
 {
@@ -30,12 +30,13 @@
     int content_buffer[63];
     char read_buffer[11];
 
-    init();    
+    init();  
+    
     lcd.cls(); // clean screen
     button.rise(&startZeroing); //link button on the joystick with the start of zeroing
      
     pc.printf("Microteslameter");
-    if(0)//activate deactivate memory dump
+    if(1)//activate deactivate memory dump
     {    
         pc.printf("Memory dump at startup: \n");
         for (int i = 0; i<63; i++) {
@@ -184,7 +185,6 @@
     //char read_buffer[11];
     CorrX=0;CorrY=0;CorrZ=0;
     lcd.cls();
-    
     for(int i=0;i<iteration;i++)
     {
         MeasureXYZT(&X,&Y,&Z,&T);