altoslib: Improve AltosState save/restore debugging

[fw/altos] / altoslib / AltosMs5607.java

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 2319d5b821b833becd9cd72c37b796caca051aa6..a769223e299a376b5671fdb5ed2f77cd77f3160f 100644 (file)
--- a/altoslib/AltosMs5607.java
+++ b/altoslib/AltosMs5607.java
@@ -15,11 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_11;
 
 import java.util.concurrent.*;
+import java.io.*;
 
-public class AltosMs5607 {
+public class AltosMs5607 implements AltosJsonable {
        public int      reserved;
        public int      sens;
        public int      off;
@@ -44,7 +45,7 @@ public class AltosMs5607 {
                //int P;
 
                dT = raw_temp - ((int) tref << 8);
-       
+
                TEMP = (int) (2000 + (((long) dT * (long) tempsens) >> 23));
 
                if (ms5611) {
@@ -55,7 +56,7 @@ public class AltosMs5607 {
                        OFF = ((long) off << 17) + (((long) tco * (long) dT) >> 6);
 
                        SENS = ((long) sens << 16) + (((long) tcs * (long) dT) >> 7);
-               } 
+               }
 
                if (TEMP < 2000) {
                        int     T2 = (int) (((long) dT * (long) dT) >> 31);
@@ -126,7 +127,7 @@ public class AltosMs5607 {
 
        static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
                try {
-                       AltosMs5607     ms5607 = new AltosMs5607(link);
+                       AltosMs5607     ms5607 = new AltosMs5607(link, config_data);
 
                        if (ms5607 != null) {
                                state.set_ms5607(ms5607);
@@ -143,9 +144,17 @@ public class AltosMs5607 {
                cc = AltosLib.MISSING;
        }
 
-       public AltosMs5607 (AltosLink link) throws InterruptedException, TimeoutException {
+       public AltosMs5607 (AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException {
                this();
-               link.printf("c s\nB\n");
+               reserved = config_data.ms5607_reserved;
+               sens = config_data.ms5607_sens;
+               off = config_data.ms5607_off;
+               tcs = config_data.ms5607_tcs;
+               tco = config_data.ms5607_tco;
+               tref = config_data.ms5607_tref;
+               tempsens = config_data.ms5607_tempsens;
+               crc = config_data.ms5607_crc;
+               link.printf("B\n");
                for (;;) {
                        String line = link.get_reply_no_dialog(5000);
                        if (line == null) {
@@ -157,4 +166,46 @@ public class AltosMs5607 {
                }
                convert();
        }
+
+       public AltosJson json() {
+               AltosJson j = new AltosJson();
+
+               j.put("reserved", reserved);
+               j.put("sens", sens);
+               j.put("off", off);
+               j.put("tcs", tcs);
+               j.put("tco", tco);
+               j.put("tref", tref);
+               j.put("tempsens", tempsens);
+               j.put("crc", crc);
+               j.put("raw_pres", raw_pres);
+               j.put("raw_temp", raw_temp);
+               j.put("pa", pa);
+               j.put("cc", cc);
+               return j;
+       }
+
+       public AltosMs5607(AltosJson j) {
+               this();
+
+               reserved = j.get_int("reserved", reserved);
+               sens = j.get_int("sens", sens);
+               off = j.get_int("off", off);
+               tcs = j.get_int("tcs", tcs);
+               tco = j.get_int("tco", tco);
+               tref = j.get_int("tref", tref);
+               tempsens = j.get_int("tempsens", tempsens);
+               crc = j.get_int("crc", crc);
+               raw_pres = j.get_int("raw_pres", raw_pres);
+               raw_temp = j.get_int("raw_temp", raw_temp);
+               pa = j.get_int("pa", pa);
+               cc = j.get_int("cc", cc);
+       }
+
+       public static AltosMs5607 fromJson(AltosJson j, AltosMs5607 def) {
+               if (j == null)
+                       return def;
+
+               return new AltosMs5607(j);
+       }
 }