The plotter on the Battery screen has been fixed

fesch · Apr 18, 2016 · 960739c · 960739c
1 parent d4d6900
commit 960739c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -61,22 +61,23 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -90,6 +91,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />

diff --git a/app/src/main/java/lu/fisch/canze/actors/Field.java b/app/src/main/java/lu/fisch/canze/actors/Field.java
@@ -354,6 +354,11 @@ public int getCar() {
         return (options & 0x0f);
     }
 
+    public boolean isCar(int car)
+    {
+        return (options & car)==car;
+    }
+
     public void setCar(int car) { options = (short)((options & 0xfe0) + (car & 0x1f)); }
 
     public int getFrequency() {

diff --git a/app/src/main/java/lu/fisch/canze/changelog.txt b/app/src/main/java/lu/fisch/canze/changelog.txt
@@ -1,3 +1,5 @@
+2016.04.18 [Bob] The plotter on the Battery screen has been fixed
+
 ---< Version 1.12 / 2016.04.11 >---
 
 2016.04.06 [Bob] Trying to resolve a NullPointerException ereported by Google Dev Console

diff --git a/app/src/main/java/lu/fisch/canze/devices/Device.java b/app/src/main/java/lu/fisch/canze/devices/Device.java
@@ -45,7 +45,7 @@
 public abstract class Device {
 
     private final double minIntervalMultiplicator = 1.3;
-    private final double maxIntervalMultiplicator = 2.0;
+    private final double maxIntervalMultiplicator = 2.5;
     protected double intervalMultiplicator = minIntervalMultiplicator;
 
     /* ----------------------------------------------------------------

diff --git a/app/src/main/java/lu/fisch/canze/widgets/Plotter.java b/app/src/main/java/lu/fisch/canze/widgets/Plotter.java
@@ -37,6 +37,7 @@
 import lu.fisch.canze.actors.Field;
 import lu.fisch.canze.actors.Fields;
 import lu.fisch.canze.database.CanzeDataSource;
+import lu.fisch.canze.fragments.MainFragment;
 import lu.fisch.canze.interfaces.DrawSurfaceInterface;
 
 /**
@@ -232,6 +233,7 @@ public void draw(Graphics g) {
             }
         }
         // values
+        //MainActivity.debug("PLOTTER SIZE: "+values.size());
         if(values.size()>0)
         {
             double w = (double) barWidth/values.size();
@@ -275,9 +277,9 @@ public void draw(Graphics g) {
     public void onFieldUpdateEvent(Field field) {
         // only take data fofr valid cars
         //MainActivity.debug("Plotter: "+field.getSID()+" --> "+field.getValue());
-        //MainActivity.debug("Car = "+MainActivity.car+" / "+field.getCar());
+        //MainActivity.debug("Car = "+MainActivity.car+" / "+field.getCar()+" / "+field.isCar(MainActivity.car));
 
-        if(field.getCar()==0 || field.getCar()== MainActivity.car) {
+        if(field.isCar(MainActivity.car)) {
             String sid = field.getSID();
 
             //MainActivity.debug("!! Plotter: "+sid+" --> "+field.getValue());

diff --git a/app/src/main/res/layout/activity_battery.xml b/app/src/main/res/layout/activity_battery.xml
@@ -48,9 +48,9 @@ android:id="@+id/table"
             custom:max="120"
             custom:majorTicks="10"
             custom:minorTicks="5"
-            custom:fieldSID="42e.0,654.25"
+            custom:fieldSID="7bb.6103.192,654.25"
             custom:widget="timeplot"
-            custom:text="True vs. Indicated State of Charge (%)"
+            custom:text="Real vs. Indicated State of Charge (%)"
             />
 
     </TableRow>