newest

Dependencies:   BME280 BMP280 TextLCD mbed

Fork of CW_watchdog_08012018_newest by Calvin Kalintra

Revision:
5:8aa72ee456fc
Parent:
3:f5fe5071416a
diff -r 5dbb5145d0a9 -r 8aa72ee456fc data.h
--- a/data.h	Tue Jan 09 12:11:46 2018 +0000
+++ b/data.h	Tue Jan 09 15:45:56 2018 +0000
@@ -4,12 +4,12 @@
 float tempf;
 float pressuref;
 float lvl;
-float data_temp [119], data_press[119], data_light[119];
-int date_a[199], time_a[199], time0_a[199], date0_a[199];
+float data_temp [119], data_press[119], data_light[119],data_tempa[999], data_pressa[999], data_lighta[999];
+int date_a[199], time_a[199], time0_a[199], date0_a[199],date_aa[999], time_aa[999], time0_aa[9999], date0_aa[999];
 BMP280 bmp(D14,D15);
 
 AnalogIn LDR(A0);
-int counterw = 0, full = 0, day, month, year, leap;
+int counterw = 0, full = 0, day, month, year, leap, countera;
 
 void time_rule()
 {
@@ -269,15 +269,23 @@
      data_press[counterw] = pressuref;
      data_light[counterw] = lvl;
      date_a[counterw] = dd*1000000+m*100000+mm*10000+y*1000+yy*100+yyy*10+yyyy;
-     time_a[counterw] = ss*10000+mi*1000+mmi*100+h*10+hh;
+     time_a[counterw] = hh*10000+mi*1000+mmi*100+s*10+ss;
      date0_a[counterw] = d;
-     time0_a[counterw] = s;
+     time0_a[counterw] = h;
+     data_tempa[countera] = tempf;
+     data_pressa[countera] = pressuref;
+     data_lighta[countera] = lvl;
+     date_aa[countera] = dd*1000000+m*100000+mm*10000+y*1000+yy*100+yyy*10+yyyy;
+     time_aa[countera] = hh*10000+mi*1000+mmi*100+s*10+ss;
+     date0_aa[countera] = d;
+     time0_aa[countera] = h;
      if (counterw == 119)
      {
          counterw = 0;
          full = 1;
      }
      counterw++;
+     countera++;
 }