projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/easymini-v1.0: Shrink stack to deal with USB changes
[fw/altos]
/
altoslib
/
AltosMs5607.java
diff --git
a/altoslib/AltosMs5607.java
b/altoslib/AltosMs5607.java
index 2319d5b821b833becd9cd72c37b796caca051aa6..97e17164bd03482c491a6ddd9cde62eb94ebe04e 100644
(file)
--- a/
altoslib/AltosMs5607.java
+++ b/
altoslib/AltosMs5607.java
@@
-15,11
+15,12
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
2
;
+package org.altusmetrum.altoslib_
5
;
import java.util.concurrent.*;
import java.util.concurrent.*;
+import java.io.*;
-public class AltosMs5607 {
+public class AltosMs5607
implements Serializable
{
public int reserved;
public int sens;
public int off;
public int reserved;
public int sens;
public int off;
@@
-44,7
+45,7
@@
public class AltosMs5607 {
//int P;
dT = raw_temp - ((int) tref << 8);
//int P;
dT = raw_temp - ((int) tref << 8);
-
+
TEMP = (int) (2000 + (((long) dT * (long) tempsens) >> 23));
if (ms5611) {
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);
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);
if (TEMP < 2000) {
int T2 = (int) (((long) dT * (long) dT) >> 31);