Diff: main.cpp

Revision:

30:9e127911409d

Parent:

28:0ed68c73dd28

Child:

31:c924aad0dc4b

--- a/main.cpp	Thu Mar 08 21:18:29 2018 +0000
+++ b/main.cpp	Thu Mar 08 21:52:44 2018 +0000
@@ -326,14 +326,14 @@
         printf("error: WHO_AM_I is not 0xC4; exiting\r\n");
         return -1;
     } else {
-        double data[1000];
+        double data[900];
 
         int ind = 0;
 
         //set sample_time
         wait_ms(100);
         uint8_t st = pressure.getCTRL_REG1();
-        uint8_t msk = 0xc7;
+        uint8_t msk = 0x8f;
         printf("CTL_REG1 = 0x%05x\r\n", st);
         pressure.setCTRL_REG1(msk);
         pressure.activate();
@@ -346,23 +346,25 @@
 
 
         //GPIO pin indicates sampling should begin -- if voltage == 3.3, start
-        while(ind < 1000 && !pc.readable()) {
+        while(ind < 900 && !pc.readable()) {
             printf("in the while\r\n");
             //then we measure
             //pressure and temperature sampled at 10times/second (10 hz)
             //LED blinks during sampling at 1 hz (1 time/second)
             led3 = 1;
             for(int i = 0; i < 10; i++) {
-                pressure.readRegs(mregids[1], tmp, 3) ;
-                pres = ((tmp[0]<<16)|(tmp[1]<<8)|(tmp[2])) >> 6;
+                pres = pressure.getPressure();
+                //pressure.readRegs(mregids[1], tmp, 3) ;
+                //pres = ((tmp[0]<<16)|(tmp[1]<<8)|(tmp[2])) >> 6;
                 data[ind++] = pres;
                 data[ind++] = pressure.getTemperature();
                 wait_ms(100);
             }//for
             led3 = 0;
             for(int i = 0; i < 10; i++) {
-                pressure.readRegs(mregids[1], tmp, 3) ;
-                pres = ((tmp[0]<<16)|(tmp[1]<<8)|(tmp[2])) >> 6;
+                pres = pressure.getPressure();
+                //pressure.readRegs(mregids[1], tmp, 3) ;
+                //pres = ((tmp[0]<<16)|(tmp[1]<<8)|(tmp[2])) >> 6;
                 data[ind++] = pres;
                 data[ind++] = pressure.getTemperature();
                 wait_ms(100);