fixed CO2T and CO2H missing values

kike-canaries · Mar 22, 2021 · bf08e1f · bf08e1f
1 parent 7cb5bbc
commit bf08e1f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/models/SensorData.java b/app/src/main/java/hpsaturn/pollutionreporter/models/SensorData.java
@@ -16,6 +16,10 @@ public class SensorData {
 
     public int CO2;
 
+    public float CO2T;
+
+    public float CO2H;
+
     public int P10;
 
     public int P1;

diff --git a/app/src/main/java/hpsaturn/pollutionreporter/view/ChartVar.java b/app/src/main/java/hpsaturn/pollutionreporter/view/ChartVar.java
@@ -138,8 +138,9 @@ public void addValue(float time,SensorData data){
         }
 
         try {
-//            Logger.e(TAG,"ChartVal:"+type);
-            dataSet.addEntry(new Entry(time,data.getClass().getField(type).getFloat(data)));
+            float value = data.getClass().getField(type).getFloat(data);
+            Logger.i(TAG,"--> "+type+ ":"+value);
+            dataSet.addEntry(new Entry(time,value));
 
         } catch (IllegalAccessException | NoSuchFieldException e) {
             e.printStackTrace();

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -19,7 +19,7 @@
 
     <!-- GENERIC COLORS -->
     <color name="red">#f00</color>
-    <color name="blue">#0080ff</color>
+    <color name="blue">#031B71</color>
     <color name="light_green">#1CAB1C</color>
     <color name="green">#187218</color>
     <color name="yellow">#DEDE16</color>
@@ -34,7 +34,7 @@
     <color name="transparent">#00FFFFFF</color>
     <color name="transwhite">#AAFFFFFF</color>
     <color name="light_red">#F0857D</color>
-    <color name="light_blue">#C3DDF8</color>
+    <color name="light_blue">#338FEF</color>
 
 
 </resources>
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1536m
 mCompileSdkVersion=29
 mMinSdkVersion=19
 mTargetSdkVersion=29
-mVersionCode=537
-mVersionName=0.3.8
+mVersionCode=538
+mVersionName=0.3.9
 android.useAndroidX=true
 android.enableJetifier=true