Revision 11:f80f5c4a2db9, committed 2016-05-16

Comitter:

nlsantos

Date:

Mon May 16 22:44:28 2016 +0000

Parent:

10:2f9585ff5a7b

Child:

12:33728f2a7068

Commit message:

fixed the bug need to change sensor.cpp the variable id unit8_t

Changed in this revision

--- a/main.cpp	Sun May 15 23:52:52 2016 +0000
+++ b/main.cpp	Mon May 16 22:44:28 2016 +0000
@@ -24,8 +24,8 @@
 UserMethods u(v, n);
 ExpansionBoard e(v, n);
 
-Thread *logThread;
-Thread *getThread;
+//Thread *logThread;
+//Thread *getThread;
 
 
 int main()

--- a/sensor.cpp	Sun May 15 23:52:52 2016 +0000
+++ b/sensor.cpp	Mon May 16 22:44:28 2016 +0000
@@ -47,8 +47,6 @@
     while(true){
         //Block on queue if no data is available
         osEvent event = mail_box.get();
-        
-        if 
         printf("MAIL_BOX.GET\n");
         
         if (event.status == osEventMail) {
@@ -85,6 +83,7 @@
      /* Retrieve the composing elements of the expansion board */
     uint8_t id;
     printf("Initialising expansion board...\n\r");
+    /*
     humidity_sensor->ReadID(&id);
     printf("HTS221  humidity & temperature    = 0x%X\r\n", id);
     pressure_sensor->ReadID(&id);
@@ -93,4 +92,5 @@
     printf("LIS3MDL magnetometer              = 0x%X\r\n", id);
     gyroscope->ReadID(&id);
     printf("LSM6DS0 accelerometer & gyroscope = 0x%X\r\n\n", id);     
+    */
 }
\ No newline at end of file

--- a/sensor.h	Sun May 15 23:52:52 2016 +0000
+++ b/sensor.h	Mon May 16 22:44:28 2016 +0000
@@ -28,7 +28,7 @@
     static void getData(const void*);
     static Mail<log_data, QUEUESIZE> mail_box;
     static char *ExpansionBoard::printDouble(char* str, double v, int decimalDigits);
-    float T; //Default sampling rate, specified in specs   
+    float T;                       //Default sampling rate, specified in specs   
     static vector<log_data> * v;
     static int * n;  
     bool flag;