Revision 2:b5346ebd1e3c, committed 2016-05-24

Comitter:

oscarvzfz

Date:

Tue May 24 00:01:20 2016 +0000

Parent:

0:07c50519b515

Commit message:

;

Changed in this revision

--- a/main.cpp	Mon Nov 09 18:22:43 2015 +0000
+++ b/main.cpp	Tue May 24 00:01:20 2016 +0000
@@ -30,13 +30,13 @@
 
 AnalogIn uv(p20);
 float uv_rad=0;
-
+DigitalOut gato(p25);
+DigitalOut reset(p26);
 MS5803     press_sensor( p9, p10, 0x76);
 
 
 int main(){
- 
-    
+
     sensor.setOTPReload(false);
     sensor.setResolution(true);
 
@@ -50,20 +50,20 @@
             roll=atan2(ay, az);
             pitch=atan((-ax)/(ay*sin(roll)+az*cos(roll)));
             yaw=atan2(mz*sin(roll)-my*cos(roll),mx*cos(pitch)+my*sin(pitch)*sin(roll)+mz*sin(pitch)*cos(roll));
-            //printf("acc: %.4f %.4f %.4f mag: %.4f %.4f %.4f gir: %.4f %.4f %.4f\n\r",ax,ay,az,mx,my,mz,gx,gy,gz);
+           // printf("acc: %.4f %.4f %.4f mag: %.4f %.4f %.4f gir: %.4f %.4f %.4f\n\r",ax,ay,az,mx,my,mz,gx,gy,gz);
             
             press_sensor.Barometer_MS5803();
             bmp180.startTemperature();
             wait_ms(5);     // Wait for conversion to complete
             if(bmp180.getTemperature(&temp) != 0) {
             printf("Error getting temperature\n");
-            continue;
-            }
-            bmp180.startPressure(BMP180::ULTRA_LOW_POWER);
+           continue;
+           }
+           bmp180.startPressure(BMP180::ULTRA_LOW_POWER);
             wait_ms(10);    // Wait for conversion to complete
             if(bmp180.getPressure(&press) != 0) {
-            printf("Error getting pressure\n");
-            continue;
+           printf("Error getting pressure\n");
+           continue;
             }
             
             uv_rad=((uv.read()*3.3)-1)/0.125;
@@ -73,17 +73,17 @@
             o.setTextCursor(0,0);
             o.clearDisplay();
             o.printf("%u/%u/%02u %2u:%02u:%02u\n\r",dt.month(),dt.day(),dt.year(),(dt.hour()-6),dt.minute(),dt.second());
-            o.printf("Temperatura: %3.2f C\r\n", sensor.getTemperature());
+            o.printf("Temperatura: %3.1f\r\n", sensor.getTemperature());
             o.printf("Humedad: %3.2f %%\r\n", sensor.getHumidity());
             o.printf("P=%d Pa\n\rT=%.2fC\n\r", press, temp);
             o.printf("r:%.1fp:%.1fy:%.1f\n\r",roll*180/M_PI,pitch*180/M_PI,yaw*180/M_PI);
             o.printf("UV=%.3fmW/cm^2\n\r",uv_rad);
             o.printf("P=%.0fPa T=%.2fC\r\n", press_sensor.MS5803_Pressure()*100,press_sensor.MS5803_Temperature());
-            o.fillCircle(125,61,2,1);
-            o.drawCircle(118,61,2,1);
-            o.fillCircle(111,61,2,1);
-            o.drawCircle(104,61,2,1);
-            o.fillCircle(97,61,2,1);
+            //o.fillCircle(125,61,2,1);
+            //o.drawCircle(118,61,2,1);
+            //o.fillCircle(111,61,2,1);
+            //o.drawCircle(104,61,2,1);
+            //o.fillCircle(97,61,2,1);
             o.display();
         
     }