diff options
| author | Keith Packard <keithp@keithp.com> | 2012-06-02 19:42:47 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-06-02 19:42:47 -0700 |
| commit | dd43a2ae7594f062a8980d1756a07488ee54b447 (patch) | |
| tree | 9bb9887e03f3f2e8cda171fee2a9dc6f220dcbc1 | |
| parent | 0772020c969a69c3b0a705de7362340a9732daab (diff) | |
altoslib: Move new sensor library code into altoslib
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altoslib/AltosIMU.java (renamed from altosui/AltosIMU.java) | 14 | ||||
| -rw-r--r-- | altoslib/AltosMag.java (renamed from altosui/AltosMag.java) | 8 | ||||
| -rw-r--r-- | altoslib/AltosMs5607.java (renamed from altosui/AltosMs5607.java) | 22 | ||||
| -rw-r--r-- | altoslib/Makefile.am | 5 | ||||
| -rw-r--r-- | altosui/Makefile.am | 3 |
5 files changed, 26 insertions, 26 deletions
diff --git a/altosui/AltosIMU.java b/altoslib/AltosIMU.java index 1f865a65..88e36544 100644 --- a/altosui/AltosIMU.java +++ b/altoslib/AltosIMU.java @@ -15,15 +15,15 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package altoslib; public class AltosIMU { - int accel_x; - int accel_y; - int accel_z; + public int accel_x; + public int accel_y; + public int accel_z; - int gyro_x; - int gyro_y; - int gyro_z; + public int gyro_x; + public int gyro_y; + public int gyro_z; }
\ No newline at end of file diff --git a/altosui/AltosMag.java b/altoslib/AltosMag.java index b3fc542b..45f1924c 100644 --- a/altosui/AltosMag.java +++ b/altoslib/AltosMag.java @@ -15,11 +15,11 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package altoslib; public class AltosMag { - int x; - int y; - int z; + public int x; + public int y; + public int z; }
\ No newline at end of file diff --git a/altosui/AltosMs5607.java b/altoslib/AltosMs5607.java index 6f8bdbbe..253e2f9b 100644 --- a/altosui/AltosMs5607.java +++ b/altoslib/AltosMs5607.java @@ -15,20 +15,20 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package altoslib; public class AltosMs5607 { - int reserved; - int sens; - int off; - int tcs; - int tco; - int tref; - int tempsens; - int crc; + public int reserved; + public int sens; + public int off; + public int tcs; + public int tco; + public int tref; + public int tempsens; + public int crc; - int raw_pres; - int raw_temp; + public int raw_pres; + public int raw_temp; public int pa; public int cc; diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am index 4262daca..2e4a795a 100644 --- a/altoslib/Makefile.am +++ b/altoslib/Makefile.am @@ -47,7 +47,10 @@ AltosLib_JAVA = \ $(SRC)/AltosTelemetryRecordLocation.java \ $(SRC)/AltosTelemetryRecordRaw.java \ $(SRC)/AltosTelemetryRecordSatellite.java \ - $(SRC)/AltosTelemetryRecordSensor.java + $(SRC)/AltosTelemetryRecordSensor.java \ + $(SRC)/AltosMs5607.java \ + $(SRC)/AltosIMU.java \ + $(SRC)/AltosMag.java JAR=AltosLib.jar diff --git a/altosui/Makefile.am b/altosui/Makefile.am index 1ec45c5f..0a6ae59e 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -45,9 +45,6 @@ altosui_JAVA = \ AltosEepromTeleScience.java \ AltosEepromMega.java \ AltosEepromMegaIterable.java \ - AltosMs5607.java \ - AltosIMU.java \ - AltosMag.java \ AltosEepromSelect.java \ AltosFlash.java \ AltosFlashUI.java \ |