Diff: main.cpp

Revision:

2:4d8ef1799adc

Parent:

1:ee1640b8be78

--- a/main.cpp	Fri Nov 20 14:24:11 2015 +0000
+++ b/main.cpp	Mon Nov 23 07:54:55 2015 +0000
@@ -4,6 +4,9 @@
 #include "I2C.h"
 DigitalOut myled(LED1);
 TextLCD display(PA_9, PC_7, PB_5, PB_4, PB_10, PA_8, TextLCD::LCD16x2);
+Serial pc(SERIAL_TX, SERIAL_RX);
+
+
 
 /******************************************************
 * void vInitSystemClock(void)
@@ -64,21 +67,36 @@
 
 
 
-int main() {
-    byte arr[2];
+int main()
+{
     display.cls();
-   // vInitSystemClock();
-    display.printf("Hallo\n");
-   // PRESSURE_vInit();
-        while(1) {
+     vInitSystemClock();
+    PRESSURE_vInit();
+    PRESSURE_vget_CALDATA();
+    PRESSURE_vwrite_EEPROM_REGISTER(BMP180_register_CONTROLL,0x2E);
+    wait(0.2);
+    PRESSURE_DATA.i_RAW_TEMPERATUR = PRESSURE_vread_EEPROM_REGISTER(BMP180_register_ADC_ERG);
+    wait(0.1);
+    PRESSURE_vwrite_EEPROM_REGISTER(BMP180_register_CONTROLL,0xB4); // HIGH RESULUTUIN
+    wait(0.1);
+    PRESSURE_DATA.i_RAW_PRESSURE =   ( (PRESSURE_vread_EEPROM_REGISTER(BMP180_register_ADC_ERG))<<8 ) >>(8-BMP180_oss_high_resulution );
+    PRESSURE_vCALCULATE_TEMPANDPRESSURE();
+
+    while(1) {
         myled = 1; // LED is ON
-        wait(0.1); // 200 ms
-      //  I2C_write(0xC4, 0x00, 0x04);
+        PRESSURE_vwrite_EEPROM_REGISTER(BMP180_register_CONTROLL,0x2E);
+        wait(0.2);
+        PRESSURE_DATA.i_RAW_TEMPERATUR = PRESSURE_vread_EEPROM_REGISTER(BMP180_register_ADC_ERG);
+        PRESSURE_vwrite_EEPROM_REGISTER(BMP180_register_CONTROLL,0xB4); // HIGH RESULUTUIN
+        wait(0.1);
+        PRESSURE_DATA.i_RAW_PRESSURE =   ( (PRESSURE_vread_EEPROM_REGISTER(BMP180_register_ADC_ERG))<<8 ) >>(8-BMP180_oss_high_resulution );
+        PRESSURE_vCALCULATE_TEMPANDPRESSURE();
         myled = 0; // LED is OFF
-        wait(0.3); // 1 sec
-      // I2C_read(0xC4,0xC5, 0x8f, 2, arr);
-       display.cls();
-        //display.printf("Distanz:%d cm\n", ((arr[0]<<8) | arr[1]) );
-             display.printf("Distanz: cm\n" );
+        wait(0.1); // 1 sec
+        display.cls();
+        display.printf("TEMP:%d.%d C\n", (PRESSURE_DATA.i_TEMPERATURE)/10, (PRESSURE_DATA.i_TEMPERATURE)%10 );
+        display.locate(0,1);
+        display.printf("Press: %d PA\n",PRESSURE_DATA.i_PRESSURE  );
+        pc.printf("TestPrintPCDisplay\n");
     }
 }