diff --git a/app/app.iml b/app/app.iml
index c5086cf0..02144866 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -61,13 +61,6 @@
-
-
-
-
-
-
-
@@ -75,8 +68,16 @@
+
+
+
+
+
+
+
+
@@ -90,6 +91,7 @@
+
diff --git a/app/src/main/java/lu/fisch/canze/actors/Field.java b/app/src/main/java/lu/fisch/canze/actors/Field.java
index 454fa65e..8f98a6e1 100644
--- 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
index 2e8d7cee..ab7f2266 100644
--- 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
index 8f8747e3..cdc0bc98 100644
--- 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
index ca432c4b..d94e74b8 100644
--- 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
index 2ad96d00..9ef8d832 100644
--- 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 (%)"
/>