Diff: main.cpp

Revision:

2:a347938f640b

Parent:

1:87df5ce85ede

Child:

3:ae94f568bde5

--- a/main.cpp	Mon Feb 29 18:56:21 2016 +0000
+++ b/main.cpp	Tue Mar 08 20:48:12 2016 +0000
@@ -1,4 +1,4 @@
-#include "mbed.h"
+#include "mbed.h",
 #include "TextLCD.h"
 #include "DHT.h"
 
@@ -8,11 +8,15 @@
 
 RawSerial pc(USBTX, USBRX);//Serial LOG
 
+I2C         i2c(p28,p27);    // SDA, SCL
+BH1750      lum(i2c);         // BH1750 SDA, SCL (Data available every 120mSec)
+
 AnalogIn Ain1(p20);// --- Voltade devider Battery --1k--|---8.2k--- 30V "V"
-AnalogIn Ain2(p19);// --- ACS712T 5A "I"
+AnalogIn Ain2(p16);// --- ACS712T 5A "I" Battery chr
+AnalogIn Ain3(p11);// --- ACS712T 5A "I" Solar
 AnalogIn CellLow1(p18);// --- Voltade devider Solar Cell --1k--|---15k--- 50V "V"
 AnalogIn CellLow2(p17);// --- Voltade devider Solar Cell --1k--|---15k--- 50V "V"
-AnalogIn CellTotal(p16);// --- Voltade devider Solar Cell --1k--|---15k--- 50V "V"
+AnalogIn CellTotal(p19);// --- Voltade devider Solar Cell --1k--|---15k--- 50V "V"
 
 AnalogIn tempsensor1(p15);//AD22103 Sensor
 DHT dht22(p13,DHT22);  //Udendørs temperatur
@@ -87,13 +91,14 @@
             lcd.cls();
             lcd.printf("Solar Cell:\n");
             lcd.printf("C1 %.1f C2 %.1f\n C3 %.1f C4 %.1f\n",Cells[0],Cells[1],Cells[2],Cells[3]);
+            lcd.printf("%.1fV %.1fA %.1fW\n",Cell[2],IRaw1,IRaw1*Cell[2]);
         }
         break;
 
         case 4: {
             lcd.cls();
             lcd.printf("Reng / LUX");
-            lcd.printf("");
+            lcd.printf("LUM: %.2f [Lux]\n", lum.lux());
         }
         break;
     }
@@ -106,6 +111,7 @@
     while(1) {
         VRaw = Ain1.read()*VoltBatDevider;
         IRaw = ((Ain2.read()*3.3)-2.5)*ISensorFaktor;
+        IRaw1 = ((Ain3.read()*3.3)-2.5)*ISensorFaktor;
         Cells[0]=CellLow1.read()*VoltDevider;
         Cells[1]=CellLow2.read()*VoltDevider;
         Cells[2]=CellTotal.read()*VoltDevider-Cells[0];
@@ -125,6 +131,8 @@
         pc.printf("Inde %.2fC Ude: %.2fC %.1f% \n\r",ReadTempetur(),UdeTemp,UdeHym);
         pc.printf("Solar Cell:\r\n");
         pc.printf("C1 %.1f C2 %.1f C3 %.1f C4 %.1f \n\n\r",Cells[0],Cells[1],Cells[2],Cells[3]);
+        pc.printf("%.3f Volt %.3f Amp %.3f Watt\r\n",Cell[2],IRaw1,IRaw1*Cell[2]);
+        pc.printf("Illuminance: %+7.2f [Lux]\r\n", lum.lux());