Fixed debug line in Firmware activity and Harmonics. Readded charging…

… history fields in Class Fields
fesch · Mar 6, 2017 · d11224e · d11224e
1 parent 9a3af9a
commit d11224e
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 4 deletions.
diff --git a/app/src/main/java/lu/fisch/canze/activities/FirmwareActivity.java b/app/src/main/java/lu/fisch/canze/activities/FirmwareActivity.java
@@ -135,6 +135,7 @@ public void run() {
 
                 // query the Frame
                 Frame frame = Frames.getInstance().getById(ecu.getFromId(), "6180");
+                MainActivity.getInstance().dropDebugMessage(frame.getHexId() + "." + frame.getResponseId());
                 Message message = MainActivity.device.requestFrame(frame); //  field.getFrame());
                 if (message.isError()) {
                     MainActivity.getInstance().dropDebugMessage(message.getError());
@@ -211,9 +212,9 @@ protected void onDestroy() {
         super.onDestroy();
     }
 
-
-    protected void initListeners() {}
-
+    protected void initListeners () {
+        MainActivity.getInstance().setDebugListener(this);
+    }
     @Override
     public void onFieldUpdateEvent(final Field field) {}
 }
diff --git a/app/src/main/java/lu/fisch/canze/activities/HarmonicsActivity.java b/app/src/main/java/lu/fisch/canze/activities/HarmonicsActivity.java
@@ -35,7 +35,9 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_harmonics);
     }
 
-    protected void initListeners () {}
+    protected void initListeners () {
+        MainActivity.getInstance().setDebugListener(this);
+    }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {

diff --git a/app/src/main/java/lu/fisch/canze/actors/Fields.java b/app/src/main/java/lu/fisch/canze/actors/Fields.java
@@ -620,6 +620,67 @@ private void fillStatic() {
                         + "7ec,24,31,1,1,0,,223318,623318,ff\n" // Motor Water pump speed
                         + "7ec,24,31,1,1,0,,223319,623319,ff\n" // Charger pump speed
                         + "7ec,24,31,1,1,0,,22331A,62331A,ff\n" // Heater water pump speed
+                        + "7ec,24,47,0.001,1,0,kWh,2233dc,6233dc,ff\n" // Consumed domestic energy
+                        + "7ec,240,263,1,0,0,km,2233d4,6233d4,ff\n" //
+                        + "7ec,216,239,1,0,0,km,2233d4,6233d4,ff\n" //
+                        + "7ec,192,215,1,0,0,km,2233d4,6233d4,ff\n" //
+                        + "7ec,168,191,1,0,0,km,2233d4,6233d4,ff\n" //
+                        + "7ec,144,167,1,0,0,km,2233d4,6233d4,ff\n" //
+                        + "7ec,120,143,1,0,0,km,2233d4,6233d4,ff\n" //
+                        + "7ec,96,119,1,0,0,km,2233d4,6233d4,ff\n" //
+                        + "7ec,72,95,1,0,0,km,2233d4,6233d4,ff\n" //
+                        + "7ec,48,71,1,0,0,km,2233d4,6233d4,ff\n" //
+                        + "7ec,24,47,1,0,0,km,2233d4,6233d4,ff\n" //
+                        + "7ec,96,103,1,0,0,,2233d5,6233d5,ff,\n" //
+                        + "7ec,88,95,1,0,0,,2233d5,6233d5,ff\n" //
+                        + "7ec,80,87,1,0,0,,2233d5,6233d5,ff\n" //
+                        + "7ec,72,79,1,0,0,,2233d5,6233d5,ff\n" //
+                        + "7ec,64,71,1,0,0,,2233d5,6233d5,ff\n" //
+                        + "7ec,56,63,1,0,0,,2233d5,6233d5,ff\n" //
+                        + "7ec,48,55,1,0,0,,2233d5,6233d5,ff\n" //
+                        + "7ec,40,47,1,0,0,,2233d5,6233d5,ff\n" //
+                        + "7ec,32,39,1,0,0,,2233d5,6233d5,ff\n" //
+                        + "7ec,24,31,1,0,0,,2233d5,6233d5,ff\n" //
+                        + "7ec,96,103,1,0,0,,2233d6,6233d6,ff\n" //
+                        + "7ec,88,95,1,0,0,,2233d6,6233d6,ff\n" //
+                        + "7ec,80,87,1,0,0,,2233d6,6233d6,ff\n" //
+                        + "7ec,72,79,1,0,0,,2233d6,6233d6,ff\n" //
+                        + "7ec,64,71,1,0,0,,2233d6,6233d6,ff\n" //
+                        + "7ec,56,63,1,0,0,,2233d6,6233d6,ff\n" //
+                        + "7ec,48,55,1,0,0,,2233d6,6233d6,ff\n" //
+                        + "7ec,40,47,1,0,0,,2233d6,6233d6,ff\n" //
+                        + "7ec,32,39,1,0,0,,2233d6,6233d6,ff\n" //
+                        + "7ec,24,31,1,0,0,,2233d6,6233d6,ff\n" //
+                        + "7ec,168,183,.2,0,0,%,2233d7,6233d7,ff\n" //
+                        + "7ec,152,167,.2,0,0,%,2233d7,6233d7,ff\n" //
+                        + "7ec,136,151,.2,0,0,%,2233d7,6233d7,ff\n" //
+                        + "7ec,120,135,.2,0,0,%,2233d7,6233d7,ff\n" //
+                        + "7ec,104,119,.2,0,0,%,2233d7,6233d7,ff\n" //
+                        + "7ec,88,103,.2,0,0,%,2233d7,6233d7,ff\n" //
+                        + "7ec,72,87,.2,0,0,%,2233d7,6233d7,ff\n" //
+                        + "7ec,56,71,.2,0,0,%,2233d7,6233d7,ff\n" //
+                        + "7ec,40,55,.2,0,0,%,2233d7,6233d7,ff\n" //
+                        + "7ec,24,39,.2,0,0,%,2233d7,6233d7,ff\n" //
+                        + "7ec,96,103,1,40,0,°C,2233d8,6233d8,ff\n" //
+                        + "7ec,88,95,1,40,0,°C,2233d8,6233d8,ff\n" //
+                        + "7ec,80,87,1,40,0,°C,2233d8,6233d8,ff\n" //
+                        + "7ec,72,79,1,40,0,°C,2233d8,6233d8,ff\n" //
+                        + "7ec,64,71,1,40,0,°C,2233d8,6233d8,ff\n" //
+                        + "7ec,56,63,1,40,0,°C,2233d8,6233d8,ff\n" //
+                        + "7ec,48,55,1,40,0,°C,2233d8,6233d8,ff\n" //
+                        + "7ec,40,47,1,40,0,°C,2233d8,6233d8,ff\n" //
+                        + "7ec,32,39,1,40,0,°C,2233d8,6233d8,ff\n" //
+                        + "7ec,24,31,1,40,0,°C,2233d8,6233d8,ff\n" //
+                        + "7ec,168,183,1,0,0,min,2233d9,6233d9,ff\n" //
+                        + "7ec,152,167,1,0,0,min,2233d9,6233d9,ff\n" //
+                        + "7ec,136,151,1,0,0,min,2233d9,6233d9,ff\n" //
+                        + "7ec,120,135,1,0,0,min,2233d9,6233d9,ff\n" //
+                        + "7ec,104,119,1,0,0,min,2233d9,6233d9,ff\n" //
+                        + "7ec,88,103,1,0,0,min,2233d9,6233d9,ff\n" //
+                        + "7ec,72,87,1,0,0,min,2233d9,6233d9,ff\n" //
+                        + "7ec,56,71,1,0,0,min,2233d9,6233d9,ff\n" //
+                        + "7ec,40,55,1,0,0,min,2233d9,6233d9,ff\n" //
+                        + "7ec,24,39,1,0,0,min,2233d9,6233d9,ff\n" //
 
                 ;