X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMs5607.java;h=c598d01e4a6021c5b8d15e8ddf3565c37fa3735f;hb=c17b78e60c340c8a3e3d6f9b875667c66216647a;hp=631bc716d41c23fbb70324f36b812b363fcbac30;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;p=fw%2Faltos diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java index 631bc716..c598d01e 100644 --- a/altoslib/AltosMs5607.java +++ b/altoslib/AltosMs5607.java @@ -64,7 +64,7 @@ public class AltosMs5607 { int TEMPM = TEMP - 2000; long OFF2 = ((long) 61 * (long) TEMPM * (long) TEMPM) >> 4; long SENS2 = (long) 2 * (long) TEMPM * (long) TEMPM; - if (TEMP < 1500) { + if (TEMP < -1500) { int TEMPP = TEMP + 1500; long TEMPP2 = (long) TEMPP * (long) TEMPP; OFF2 = OFF2 + 15 * TEMPP2; @@ -138,6 +138,17 @@ public class AltosMs5607 { } } + public boolean valid_config() { + return reserved != AltosLib.MISSING && + sens != AltosLib.MISSING && + off != AltosLib.MISSING && + tcs != AltosLib.MISSING && + tco != AltosLib.MISSING && + tref != AltosLib.MISSING && + tempsens != AltosLib.MISSING && + crc != AltosLib.MISSING; + } + public AltosMs5607() { raw_pres = AltosLib.MISSING; raw_temp = AltosLib.MISSING; @@ -145,7 +156,7 @@ public class AltosMs5607 { cc = AltosLib.MISSING; } - public AltosMs5607 (AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException { + public AltosMs5607(AltosConfigData config_data) { this(); reserved = config_data.ms5607_reserved; sens = config_data.ms5607_sens; @@ -155,6 +166,10 @@ public class AltosMs5607 { tref = config_data.ms5607_tref; tempsens = config_data.ms5607_tempsens; crc = config_data.ms5607_crc; + } + + public AltosMs5607 (AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException { + this(config_data); link.printf("B\n"); for (;;) { String line = link.get_reply_no_dialog(5000);