From 20bc23ddb90f8a6da1f7ea70f02cf3a038059d32 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Fri, 7 Sep 2012 17:32:07 +1200 Subject: altoslib: Remove un-needed imports Signed-off-by: Mike Beattie --- altoslib/AltosTelemetryRecordLegacy.java | 2 -- 1 file changed, 2 deletions(-) (limited to 'altoslib/AltosTelemetryRecordLegacy.java') diff --git a/altoslib/AltosTelemetryRecordLegacy.java b/altoslib/AltosTelemetryRecordLegacy.java index 3976a07a..b11fed58 100644 --- a/altoslib/AltosTelemetryRecordLegacy.java +++ b/altoslib/AltosTelemetryRecordLegacy.java @@ -17,9 +17,7 @@ package org.altusmetrum.AltosLib; -import java.lang.*; import java.text.*; -import java.util.HashMap; /* * Telemetry data contents -- cgit v1.2.3 From 369c5e23ac6d65bab4b456ed86737576ac61102f Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Fri, 7 Sep 2012 17:35:29 +1200 Subject: altoslib: access static variables via class, not instance Signed-off-by: Mike Beattie --- altoslib/AltosEepromLog.java | 2 +- altoslib/AltosTelemetryRecordLegacy.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'altoslib/AltosTelemetryRecordLegacy.java') diff --git a/altoslib/AltosEepromLog.java b/altoslib/AltosEepromLog.java index e27c382a..211fd706 100644 --- a/altoslib/AltosEepromLog.java +++ b/altoslib/AltosEepromLog.java @@ -72,7 +72,7 @@ public class AltosEepromLog { for (block = in_start_block; block < in_end_block; block++) { AltosEepromChunk eechunk = new AltosEepromChunk(link, block, block == in_start_block); - for (int i = 0; i < eechunk.chunk_size; i += AltosEepromRecord.record_length) { + for (int i = 0; i < AltosEepromChunk.chunk_size; i += AltosEepromRecord.record_length) { try { AltosEepromRecord r = new AltosEepromRecord(eechunk, i); diff --git a/altoslib/AltosTelemetryRecordLegacy.java b/altoslib/AltosTelemetryRecordLegacy.java index b11fed58..9e75fa2c 100644 --- a/altoslib/AltosTelemetryRecordLegacy.java +++ b/altoslib/AltosTelemetryRecordLegacy.java @@ -476,7 +476,7 @@ public class AltosTelemetryRecordLegacy extends AltosTelemetryRecord { record.gps = new AltosGPS(); record.new_gps = true; - record.seen |= record.seen_gps_time | record.seen_gps_lat | record.seen_gps_lon; + record.seen |= AltosRecord.seen_gps_time | AltosRecord.seen_gps_lat | AltosRecord.seen_gps_lon; record.gps.nsat = (gps_flags & AO_GPS_NUM_SAT_MASK); record.gps.locked = (gps_flags & AO_GPS_VALID) != 0; record.gps.connected = true; -- cgit v1.2.3 From 639f3e5e5171769429eac9e2f17a7b315fd62135 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Fri, 7 Sep 2012 17:39:25 +1200 Subject: altoslib: comment out unused methods Signed-off-by: Mike Beattie --- altoslib/AltosIgnite.java | 2 ++ altoslib/AltosTelemetryRecordLegacy.java | 2 ++ 2 files changed, 4 insertions(+) (limited to 'altoslib/AltosTelemetryRecordLegacy.java') diff --git a/altoslib/AltosIgnite.java b/altoslib/AltosIgnite.java index e89f1b65..a48d0b69 100644 --- a/altoslib/AltosIgnite.java +++ b/altoslib/AltosIgnite.java @@ -64,6 +64,7 @@ public class AltosIgnite { } } + /* private boolean get_string(String line, String label, string_ref s) { if (line.startsWith(label)) { String quoted = line.substring(label.length()).trim(); @@ -78,6 +79,7 @@ public class AltosIgnite { return false; } } + */ private int status(String status_name) { if (status_name.equals("unknown")) diff --git a/altoslib/AltosTelemetryRecordLegacy.java b/altoslib/AltosTelemetryRecordLegacy.java index 9e75fa2c..21176069 100644 --- a/altoslib/AltosTelemetryRecordLegacy.java +++ b/altoslib/AltosTelemetryRecordLegacy.java @@ -392,9 +392,11 @@ public class AltosTelemetryRecordLegacy extends AltosTelemetryRecord { int[] bytes; int adjust; + /* private int int8(int i) { return AltosLib.int8(bytes, i + 1 + adjust); } + */ private int uint8(int i) { return AltosLib.uint8(bytes, i + 1 + adjust); } -- cgit v1.2.3