diff options
author | Keith Packard <keithp@keithp.com> | 2014-04-11 16:40:06 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2014-04-11 16:40:06 -0700 |
commit | 9e18c524fa2d1f648f265b3c3105f5ceacf06c10 (patch) | |
tree | 70eef3b41a40ca5401a45ae1894847a77409b203 /altoslib | |
parent | 7b275ddfe20f54857d7d1abb98607c406b678090 (diff) |
altoslib/altosui/altosuilib/libaltos: Remove trailing whitespace
Just cleaning up the source code.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib')
-rw-r--r-- | altoslib/AltosEepromDownload.java | 2 | ||||
-rw-r--r-- | altoslib/AltosEepromHeader.java | 4 | ||||
-rw-r--r-- | altoslib/AltosEepromMega.java | 2 | ||||
-rw-r--r-- | altoslib/AltosEepromMetrum2.java | 4 | ||||
-rw-r--r-- | altoslib/AltosFile.java | 2 | ||||
-rw-r--r-- | altoslib/AltosIdleFetch.java | 2 | ||||
-rw-r--r-- | altoslib/AltosLib.java | 2 | ||||
-rw-r--r-- | altoslib/AltosLink.java | 4 | ||||
-rw-r--r-- | altoslib/AltosMag.java | 1 | ||||
-rw-r--r-- | altoslib/AltosMs5607.java | 4 | ||||
-rw-r--r-- | altoslib/AltosPreferences.java | 4 | ||||
-rw-r--r-- | altoslib/AltosPyro.java | 6 | ||||
-rw-r--r-- | altoslib/AltosRomconfig.java | 2 | ||||
-rw-r--r-- | altoslib/AltosSelfFlash.java | 4 | ||||
-rw-r--r-- | altoslib/AltosSensorTM.java | 2 | ||||
-rw-r--r-- | altoslib/AltosSensorTMini.java | 2 | ||||
-rw-r--r-- | altoslib/AltosStateIterable.java | 2 | ||||
-rw-r--r-- | altoslib/AltosTelemetry.java | 2 | ||||
-rw-r--r-- | altoslib/AltosTelemetryFile.java | 2 | ||||
-rw-r--r-- | altoslib/AltosTelemetryLegacy.java | 2 | ||||
-rw-r--r-- | altoslib/AltosTelemetryMegaData.java | 6 | ||||
-rw-r--r-- | altoslib/AltosTelemetryMegaSensor.java | 2 | ||||
-rw-r--r-- | altoslib/AltosTelemetrySatellite.java | 2 | ||||
-rw-r--r-- | altoslib/AltosUnits.java | 8 |
24 files changed, 36 insertions, 37 deletions
diff --git a/altoslib/AltosEepromDownload.java b/altoslib/AltosEepromDownload.java index 04101079..163ffad9 100644 --- a/altoslib/AltosEepromDownload.java +++ b/altoslib/AltosEepromDownload.java @@ -132,7 +132,7 @@ public class AltosEepromDownload implements Runnable { CheckFile(false); } - + void CaptureLog(AltosEepromLog log) throws IOException, InterruptedException, TimeoutException, ParseException { int block, state_block = 0; int log_format = flights.config_data.log_format; diff --git a/altoslib/AltosEepromHeader.java b/altoslib/AltosEepromHeader.java index 6ce7ddd3..fe5bf6c3 100644 --- a/altoslib/AltosEepromHeader.java +++ b/altoslib/AltosEepromHeader.java @@ -162,7 +162,7 @@ public class AltosEepromHeader extends AltosEeprom { break; } } - + public AltosEepromHeader (String[] tokens) { last = false; valid = true; @@ -269,7 +269,7 @@ public class AltosEepromHeader extends AltosEeprom { for (AltosEepromHeader header : headers) { header.write(out); } - + } public AltosEepromHeader (String line) { diff --git a/altoslib/AltosEepromMega.java b/altoslib/AltosEepromMega.java index b8a1b9e8..35e87885 100644 --- a/altoslib/AltosEepromMega.java +++ b/altoslib/AltosEepromMega.java @@ -70,7 +70,7 @@ public class AltosEepromMega extends AltosEeprom { public int year() { return data8(14); } public int month() { return data8(15); } public int day() { return data8(16); } - + /* AO_LOG_GPS_SAT elements */ public int nsat() { return data16(0); } public int svid(int n) { return data8(2 + n * 2); } diff --git a/altoslib/AltosEepromMetrum2.java b/altoslib/AltosEepromMetrum2.java index f1bca6dc..d13aac42 100644 --- a/altoslib/AltosEepromMetrum2.java +++ b/altoslib/AltosEepromMetrum2.java @@ -59,7 +59,7 @@ public class AltosEepromMetrum2 extends AltosEeprom { public int year() { return data8(4); } public int month() { return data8(5); } public int day() { return data8(6); } - + /* AO_LOG_GPS_SAT elements */ public int nsat() { return data8(0); } public int more() { return data8(1); } @@ -161,7 +161,7 @@ public class AltosEepromMetrum2 extends AltosEeprom { break; try { AltosEepromMetrum2 metrum = new AltosEepromMetrum2(line); - + if (metrum.cmd != AltosLib.AO_LOG_INVALID) metrums.add(metrum); } catch (Exception e) { diff --git a/altoslib/AltosFile.java b/altoslib/AltosFile.java index 37bf7075..79f6f1c6 100644 --- a/altoslib/AltosFile.java +++ b/altoslib/AltosFile.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_3; +package org.altusmetrum.altoslib_3; import java.io.File; import java.util.*; diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java index 02cb7a94..b0e45797 100644 --- a/altoslib/AltosIdleFetch.java +++ b/altoslib/AltosIdleFetch.java @@ -142,7 +142,7 @@ public class AltosIdleFetch implements AltosStateUpdate { state.set_received_time(System.currentTimeMillis()); } catch (TimeoutException te) { } - + } public AltosIdleFetch(AltosLink link) { diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java index 05f0af8d..3f25bc31 100644 --- a/altoslib/AltosLib.java +++ b/altoslib/AltosLib.java @@ -203,7 +203,7 @@ public class AltosLib { throw new IllegalArgumentException(String.format("Invalid telemetry %d", telemetry)); } - + private static String[] state_to_string = { "startup", "idle", diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java index 97fa7062..469b03c0 100644 --- a/altoslib/AltosLink.java +++ b/altoslib/AltosLink.java @@ -76,7 +76,7 @@ public abstract class AltosLink implements Runnable { return get_reply(5000); } - + public abstract boolean can_cancel_reply(); public abstract boolean show_reply_timeout(); public abstract void hide_reply_timeout(); @@ -215,7 +215,7 @@ public abstract class AltosLink implements Runnable { break; } } - + } finally { --in_reply; } diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java index d2bb9da6..a3a0a74b 100644 --- a/altoslib/AltosMag.java +++ b/altoslib/AltosMag.java @@ -87,4 +87,3 @@ public class AltosMag implements Cloneable { } } } -
\ No newline at end of file diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java index 97d08c3e..4a851524 100644 --- a/altoslib/AltosMs5607.java +++ b/altoslib/AltosMs5607.java @@ -44,7 +44,7 @@ public class AltosMs5607 { //int P; dT = raw_temp - ((int) tref << 8); - + TEMP = (int) (2000 + (((long) dT * (long) tempsens) >> 23)); if (ms5611) { @@ -55,7 +55,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); diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java index b8920d26..484cb644 100644 --- a/altoslib/AltosPreferences.java +++ b/altoslib/AltosPreferences.java @@ -55,7 +55,7 @@ public class AltosPreferences { /* Launcher channel preference name */ public final static String launcherChannelPreference = "LAUNCHER-CHANNEL"; - + /* Default logdir is ~/TeleMetrum */ public final static String logdirName = "TeleMetrum"; @@ -349,7 +349,7 @@ public class AltosPreferences { return launcher_channel; } } - + public static AltosPreferencesBackend bt_devices() { synchronized (backend) { return backend.node("bt_devices"); diff --git a/altoslib/AltosPyro.java b/altoslib/AltosPyro.java index aefc6fbd..a1414123 100644 --- a/altoslib/AltosPyro.java +++ b/altoslib/AltosPyro.java @@ -105,7 +105,7 @@ public class AltosPyro { private static HashMap<Integer,AltosUnits> pyro_to_units = new HashMap<Integer,AltosUnits>(); private static HashMap<Integer,Double> pyro_to_scale = new HashMap<Integer,Double>(); - + private static void insert_map(int flag, String string, String name, AltosUnits units, double scale) { string_to_pyro.put(string, flag); pyro_to_string.put(flag, string); @@ -114,7 +114,7 @@ public class AltosPyro { pyro_to_units.put(flag, units); pyro_to_scale.put(flag, scale); } - + public static int string_to_pyro(String name) { if (string_to_pyro.containsKey(name)) return string_to_pyro.get(name); @@ -174,7 +174,7 @@ public class AltosPyro { insert_map(pyro_after_motor, pyro_after_motor_string, pyro_after_motor_name, null, 1.0); insert_map(pyro_delay, pyro_delay_string, pyro_delay_name, null, pyro_delay_scale); - + insert_map(pyro_state_less, pyro_state_less_string, pyro_state_less_name, null, 1.0); insert_map(pyro_state_greater_or_equal, pyro_state_greater_or_equal_string, pyro_state_greater_or_equal_name, null, 1.0); } diff --git a/altoslib/AltosRomconfig.java b/altoslib/AltosRomconfig.java index 1273fbc6..506c3961 100644 --- a/altoslib/AltosRomconfig.java +++ b/altoslib/AltosRomconfig.java @@ -144,7 +144,7 @@ public class AltosRomconfig { ao_romconfig_check, ao_serial_number }; - + private static boolean name_required(String name) { for (String required : required_names) if (name.equals(required)) diff --git a/altoslib/AltosSelfFlash.java b/altoslib/AltosSelfFlash.java index aae993eb..051aa766 100644 --- a/altoslib/AltosSelfFlash.java +++ b/altoslib/AltosSelfFlash.java @@ -47,7 +47,7 @@ public class AltosSelfFlash extends AltosProgrammer { for (int offset = 0; offset < len; offset += 0x100) { link.printf("R %x\n", addr + offset); byte[] reply = link.get_binary_reply(5000, 0x100); - + if (reply == null) throw new IOException("Read device memory timeout"); for (b = 0; b < len; b++) @@ -55,7 +55,7 @@ public class AltosSelfFlash extends AltosProgrammer { } return data; } - + void write_memory(long addr, byte[] data, int start, int len) { int b; link.printf("W %x\n", addr); diff --git a/altoslib/AltosSensorTM.java b/altoslib/AltosSensorTM.java index b8f54bcb..a5129783 100644 --- a/altoslib/AltosSensorTM.java +++ b/altoslib/AltosSensorTM.java @@ -40,7 +40,7 @@ public class AltosSensorTM { state.set_battery_voltage(AltosConvert.cc_battery_to_voltage(sensor_tm.batt)); state.set_apogee_voltage(AltosConvert.cc_ignitor_to_voltage(sensor_tm.drogue)); state.set_main_voltage(AltosConvert.cc_ignitor_to_voltage(sensor_tm.main)); - + } catch (TimeoutException te) { } } diff --git a/altoslib/AltosSensorTMini.java b/altoslib/AltosSensorTMini.java index cc5718a0..bb60a794 100644 --- a/altoslib/AltosSensorTMini.java +++ b/altoslib/AltosSensorTMini.java @@ -34,7 +34,7 @@ public class AltosSensorTMini { state.set_battery_voltage(AltosConvert.tele_mini_voltage(sensor_tmini.batt)); state.set_apogee_voltage(AltosConvert.tele_mini_voltage(sensor_tmini.apogee)); state.set_main_voltage(AltosConvert.tele_mini_voltage(sensor_tmini.main)); - + } catch (TimeoutException te) { } } diff --git a/altoslib/AltosStateIterable.java b/altoslib/AltosStateIterable.java index 5a919b66..7ea3041b 100644 --- a/altoslib/AltosStateIterable.java +++ b/altoslib/AltosStateIterable.java @@ -24,6 +24,6 @@ public abstract class AltosStateIterable implements Iterable<AltosState> { public void write_comments (PrintStream out) { } - + public abstract void write(PrintStream out); } diff --git a/altoslib/AltosTelemetry.java b/altoslib/AltosTelemetry.java index 01bedd5e..1c4ce7bc 100644 --- a/altoslib/AltosTelemetry.java +++ b/altoslib/AltosTelemetry.java @@ -67,7 +67,7 @@ public abstract class AltosTelemetry implements AltosStateUpdate { final static int packet_type_metrum_sensor = 0x0a; final static int packet_type_metrum_data = 0x0b; final static int packet_type_mini = 0x10; - + static AltosTelemetry parse_hex(String hex) throws ParseException, AltosCRCException { AltosTelemetry telem = null; diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java index 09d7d3f8..f6643134 100644 --- a/altoslib/AltosTelemetryFile.java +++ b/altoslib/AltosTelemetryFile.java @@ -62,7 +62,7 @@ public class AltosTelemetryFile extends AltosStateIterable { } public void write(PrintStream out) { - + } public AltosTelemetryFile(FileInputStream input) { diff --git a/altoslib/AltosTelemetryLegacy.java b/altoslib/AltosTelemetryLegacy.java index d302addd..da9296e4 100644 --- a/altoslib/AltosTelemetryLegacy.java +++ b/altoslib/AltosTelemetryLegacy.java @@ -470,7 +470,7 @@ public class AltosTelemetryLegacy extends AltosTelemetry { batt = int16(29); apogee = int16(31); main = int16(33); - + ground_accel = int16(7); ground_pres = int16(15); accel_plus_g = int16(17); diff --git a/altoslib/AltosTelemetryMegaData.java b/altoslib/AltosTelemetryMegaData.java index a4df70be..ffd82546 100644 --- a/altoslib/AltosTelemetryMegaData.java +++ b/altoslib/AltosTelemetryMegaData.java @@ -19,7 +19,7 @@ package org.altusmetrum.altoslib_3; public class AltosTelemetryMegaData extends AltosTelemetryStandard { int state; - + int v_batt; int v_pyro; int sense[]; @@ -41,7 +41,7 @@ public class AltosTelemetryMegaData extends AltosTelemetryStandard { v_batt = int16(6); v_pyro = int16(8); - sense = new int[6]; + sense = new int[6]; for (int i = 0; i < 6; i++) { sense[i] = int8(10 + i) << 4; @@ -62,7 +62,7 @@ public class AltosTelemetryMegaData extends AltosTelemetryStandard { super.update_state(state); state.set_state(this.state); - + state.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt)); state.set_pyro_voltage(AltosConvert.mega_pyro_voltage(v_pyro)); diff --git a/altoslib/AltosTelemetryMegaSensor.java b/altoslib/AltosTelemetryMegaSensor.java index d1a463c0..d9fd7fde 100644 --- a/altoslib/AltosTelemetryMegaSensor.java +++ b/altoslib/AltosTelemetryMegaSensor.java @@ -67,7 +67,7 @@ public class AltosTelemetryMegaSensor extends AltosTelemetryStandard { state.set_orient(orient); AltosIMU imu = new AltosIMU(); - + imu.accel_x = AltosIMU.convert_accel(accel_x); imu.accel_y = AltosIMU.convert_accel(accel_y); imu.accel_z = AltosIMU.convert_accel(accel_z); diff --git a/altoslib/AltosTelemetrySatellite.java b/altoslib/AltosTelemetrySatellite.java index 01252bde..24777b28 100644 --- a/altoslib/AltosTelemetrySatellite.java +++ b/altoslib/AltosTelemetrySatellite.java @@ -43,7 +43,7 @@ public class AltosTelemetrySatellite extends AltosTelemetryStandard { super.update_state(state); AltosGPS gps = state.make_temp_gps(true); - + gps.cc_gps_sat = sats; state.set_temp_gps(); } diff --git a/altoslib/AltosUnits.java b/altoslib/AltosUnits.java index e573a43b..82f102e4 100644 --- a/altoslib/AltosUnits.java +++ b/altoslib/AltosUnits.java @@ -41,7 +41,7 @@ public abstract class AltosUnits { public double value(double v) { return value(v, AltosConvert.imperial_units); } - + public double inverse(double v) { return inverse(v, AltosConvert.imperial_units); } @@ -49,15 +49,15 @@ public abstract class AltosUnits { public String show_units() { return show_units(AltosConvert.imperial_units); } - + public String say_units() { return say_units(AltosConvert.imperial_units); } - + public int show_fraction(int width) { return show_fraction(width, AltosConvert.imperial_units); } - + int say_fraction(boolean imperial_units) { return 0; } |