Merge pull request #339 from yoh-there/master

Added 8 bits to HV kilometers (bringing it in line with car kms), attempted fix issue #337
fesch · May 14, 2016 · cca2263 · cca2263
2 parents 77e574a + e019771
commit cca2263
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/java/lu/fisch/canze/actors/Fields.java b/app/src/main/java/lu/fisch/canze/actors/Fields.java
@@ -1311,7 +1311,7 @@ private void fillStatic()
                         +"0x7bb,976,991,0.001,0,3,V,0x2141,0x6141,1f\n" // Cell 61 V
                         +"0x7bb,992,1007,0.001,0,3,V,0x2141,0x6141,1f\n" // Cell 62 V
                         +"0x7bb,16,31,0.001,0,3,V,0x2142,0x6142,1f\n" // Cell 63 V
-                        +"0x7bb,32,47,0.001,0,3,V,0x2142,0x6142,1f\n" // Cell 64 V
+                        +"0x7bb,32,47,0.001,0,3,V,0x2142,0x6142,1f\n" // Cell 64 Vl
                         +"0x7bb,48,63,0.001,0,3,V,0x2142,0x6142,1f\n" // Cell 65 V
                         +"0x7bb,64,79,0.001,0,3,V,0x2142,0x6142,1f\n" // Cell 66 V
                         +"0x7bb,80,95,0.001,0,3,V,0x2142,0x6142,1f\n" // Cell 67 V
@@ -1346,7 +1346,7 @@ private void fillStatic()
                         +"0x7bb,544,559,0.001,0,3,V,0x2142,0x6142,1f\n" // Cell 96 V
 //+"0x7bb,60,79,0.0001,0,4,Ah,0x2161,0x6161,5\n" // Ah of the battery
 //+"0x7bb,80,87,0.05,0,2,%,0x2161,0x6161,5\n" // Battery State of Health
-                        +"0x7bb,104,119,1,0,0,km,0x2161,0x6161,1f\n" // Battery mileage in km
+                        +"0x7bb,96,119,1,0,0,km,0x2161,0x6161,1f\n" // Battery mileage in km
 //+"0x7bb,136,151,1,0,0,kWh,0x2161,0x6161,5\n" // Total energy output of battery?
                         +"0x7bb,144,159,1,0,0,,0x2180,0x6180,1f\n" // Software version
                         +"0x7bb,128,143,1,0,0,,0x2180,0x6180,1f\n" // PG number %04lx

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,6 @@
+2016.05.14 [Jeroen] Added 8 bits to HV kilometers (bringing it in line with car kms), attempted fix issue #337
+2016.04.18 [Jeroen] Added (untested) code to get battery data into the prediction plotter
+2016.04.18 [Jeroen] Small improvements to the Battery model
 2016.04.18 [Bob] Trying to fix issue #310
 2016.04.18 [Bob] The plotter on the Battery screen has been fixed