}
int say_fraction() {
- return 1;
+ if (AltosConvert.imperial_units)
+ return 1;
+ return 0;
}
}
\ No newline at end of file
state.state = AltosLib.ao_flight_pad;
state.accel_plus_g = 15758;
state.accel_minus_g = 16294;
+ state.flight_vel = 0;
/* Pull in static data from the flight and gps_date records */
if (flight_record != null)
}
public static void set_logdir(File new_logdir) {
- logdir = new_logdir;
- mapdir = new File(logdir, "maps");
- if (!mapdir.exists())
- mapdir.mkdirs();
synchronized (preferences) {
+ logdir = new_logdir;
+ mapdir = new File(logdir, "maps");
+ if (!mapdir.exists())
+ mapdir.mkdirs();
preferences.put(logdirPreference, logdir.getPath());
flush_preferences();
}
}
public static File logdir() {
- return logdir;
+ synchronized (preferences) {
+ return logdir;
+ }
}
public static File mapdir() {
- return mapdir;
+ synchronized (preferences) {
+ return mapdir;
+ }
}
public static void set_frequency(int serial, double new_frequency) {
- frequencies.put(serial, new_frequency);
synchronized (preferences) {
+ frequencies.put(serial, new_frequency);
preferences.putDouble(String.format(frequencyPreferenceFormat, serial), new_frequency);
flush_preferences();
}
}
public static double frequency(int serial) {
- if (frequencies.containsKey(serial))
- return frequencies.get(serial);
- double frequency = preferences.getDouble(String.format(frequencyPreferenceFormat, serial), 0);
- if (frequency == 0.0) {
- int channel = preferences.getInt(String.format(channelPreferenceFormat, serial), 0);
- frequency = AltosConvert.radio_channel_to_frequency(channel);
+ synchronized (preferences) {
+ if (frequencies.containsKey(serial))
+ return frequencies.get(serial);
+ double frequency = preferences.getDouble(String.format(frequencyPreferenceFormat, serial), 0);
+ if (frequency == 0.0) {
+ int channel = preferences.getInt(String.format(channelPreferenceFormat, serial), 0);
+ frequency = AltosConvert.radio_channel_to_frequency(channel);
+ }
+ frequencies.put(serial, frequency);
+ return frequency;
}
- frequencies.put(serial, frequency);
- return frequency;
}
public static void set_telemetry(int serial, int new_telemetry) {
- telemetries.put(serial, new_telemetry);
synchronized (preferences) {
+ telemetries.put(serial, new_telemetry);
preferences.putInt(String.format(telemetryPreferenceFormat, serial), new_telemetry);
flush_preferences();
}
}
public static int telemetry(int serial) {
- if (telemetries.containsKey(serial))
- return telemetries.get(serial);
- int telemetry = preferences.getInt(String.format(telemetryPreferenceFormat, serial),
- AltosLib.ao_telemetry_standard);
- telemetries.put(serial, telemetry);
- return telemetry;
+ synchronized (preferences) {
+ if (telemetries.containsKey(serial))
+ return telemetries.get(serial);
+ int telemetry = preferences.getInt(String.format(telemetryPreferenceFormat, serial),
+ AltosLib.ao_telemetry_standard);
+ telemetries.put(serial, telemetry);
+ return telemetry;
+ }
}
public static void set_scanning_telemetry(int new_scanning_telemetry) {
- scanning_telemetry = new_scanning_telemetry;
synchronized (preferences) {
+ scanning_telemetry = new_scanning_telemetry;
preferences.putInt(scanningTelemetryPreference, scanning_telemetry);
flush_preferences();
}
}
public static int scanning_telemetry() {
- return scanning_telemetry;
+ synchronized (preferences) {
+ return scanning_telemetry;
+ }
}
public static void set_voice(boolean new_voice) {
- voice = new_voice;
synchronized (preferences) {
+ voice = new_voice;
preferences.putBoolean(voicePreference, voice);
flush_preferences();
}
}
public static boolean voice() {
- return voice;
+ synchronized (preferences) {
+ return voice;
+ }
}
public static void set_callsign(String new_callsign) {
- callsign = new_callsign;
synchronized(preferences) {
+ callsign = new_callsign;
preferences.put(callsignPreference, callsign);
flush_preferences();
}
}
public static String callsign() {
- return callsign;
+ synchronized(preferences) {
+ return callsign;
+ }
}
public static void set_firmwaredir(File new_firmwaredir) {
- firmwaredir = new_firmwaredir;
synchronized (preferences) {
+ firmwaredir = new_firmwaredir;
preferences.put(firmwaredirPreference, firmwaredir.getPath());
flush_preferences();
}
}
public static File firmwaredir() {
- return firmwaredir;
+ synchronized (preferences) {
+ return firmwaredir;
+ }
}
public static void set_launcher_serial(int new_launcher_serial) {
- launcher_serial = new_launcher_serial;
synchronized (preferences) {
+ launcher_serial = new_launcher_serial;
preferences.putInt(launcherSerialPreference, launcher_serial);
flush_preferences();
}
}
public static int launcher_serial() {
- return launcher_serial;
+ synchronized (preferences) {
+ return launcher_serial;
+ }
}
public static void set_launcher_channel(int new_launcher_channel) {
- launcher_channel = new_launcher_channel;
synchronized (preferences) {
+ launcher_channel = new_launcher_channel;
preferences.putInt(launcherChannelPreference, launcher_channel);
flush_preferences();
}
}
public static int launcher_channel() {
- return launcher_channel;
+ synchronized (preferences) {
+ return launcher_channel;
+ }
}
public static Preferences bt_devices() {
- return preferences.node("bt_devices");
+ synchronized (preferences) {
+ return preferences.node("bt_devices");
+ }
}
public static AltosFrequency[] common_frequencies() {
- return common_frequencies;
+ synchronized (preferences) {
+ return common_frequencies;
+ }
}
public static void set_common_frequencies(AltosFrequency[] frequencies) {
- common_frequencies = frequencies;
synchronized(preferences) {
+ common_frequencies = frequencies;
save_common_frequencies(frequencies);
flush_preferences();
}
}
public static void add_common_frequency(AltosFrequency frequency) {
- AltosFrequency[] new_frequencies = new AltosFrequency[common_frequencies.length + 1];
+ AltosFrequency[] old_frequencies = common_frequencies();
+ AltosFrequency[] new_frequencies = new AltosFrequency[old_frequencies.length + 1];
int i;
- for (i = 0; i < common_frequencies.length; i++) {
- if (frequency.frequency == common_frequencies[i].frequency)
+ for (i = 0; i < old_frequencies.length; i++) {
+ if (frequency.frequency == old_frequencies[i].frequency)
return;
- if (frequency.frequency < common_frequencies[i].frequency)
+ if (frequency.frequency < old_frequencies[i].frequency)
break;
- new_frequencies[i] = common_frequencies[i];
+ new_frequencies[i] = old_frequencies[i];
}
new_frequencies[i] = frequency;
- for (; i < common_frequencies.length; i++)
- new_frequencies[i+1] = common_frequencies[i];
+ for (; i < old_frequencies.length; i++)
+ new_frequencies[i+1] = old_frequencies[i];
set_common_frequencies(new_frequencies);
}
public static boolean imperial_units() {
- return AltosConvert.imperial_units;
+ synchronized(preferences) {
+ return AltosConvert.imperial_units;
+ }
}
public static void set_imperial_units(boolean imperial_units) {
- AltosConvert.imperial_units = imperial_units;
synchronized (preferences) {
+ AltosConvert.imperial_units = imperial_units;
preferences.putBoolean(unitsPreference, imperial_units);
flush_preferences();
}
string_ref version;
string_ref product;
AltosConfigTDUI config_ui;
- boolean serial_started;
boolean made_visible;
boolean get_int(String line, String label, int_ref x) {
}
}
- void start_serial() throws InterruptedException, TimeoutException {
- serial_started = true;
- }
-
- void stop_serial() throws InterruptedException {
- if (!serial_started)
- return;
- serial_started = false;
- }
-
- void update_ui() {
+ synchronized void update_ui() {
config_ui.set_serial(serial.get());
config_ui.set_product(product.get());
config_ui.set_version(version.get());
}
}
- void process_line(String line) {
+ void finish_input(String line) {
if (line == null) {
abort();
return;
update_ui();
return;
}
- get_string(line, "Config version", config_version);
- get_int(line, "serial-number", serial);
- get_int(line, "Radio channel:", radio_channel);
- get_int(line, "Radio cal:", radio_calibration);
- get_int(line, "Frequency:", radio_frequency);
- get_int(line, "Radio setting:", radio_setting);
- get_string(line,"software-version", version);
- get_string(line,"product", product);
}
- final static int serial_mode_read = 0;
- final static int serial_mode_save = 1;
- final static int serial_mode_reboot = 2;
-
- class SerialData implements Runnable {
- AltosConfigTD config;
- int serial_mode;
-
- void process_line(String line) {
- config.process_line(line);
- }
- void callback(String in_line) {
- final String line = in_line;
+ synchronized void process_line(String line) {
+ if (line == null || line.equals("all finished")) {
+ final String last_line = line;
Runnable r = new Runnable() {
public void run() {
- process_line(line);
+ finish_input(last_line);
}
};
SwingUtilities.invokeLater(r);
+ } else {
+ get_string(line, "Config version", config_version);
+ get_int(line, "serial-number", serial);
+ get_int(line, "Radio channel:", radio_channel);
+ get_int(line, "Radio cal:", radio_calibration);
+ get_int(line, "Frequency:", radio_frequency);
+ get_int(line, "Radio setting:", radio_setting);
+ get_string(line,"software-version", version);
+ get_string(line,"product", product);
}
+ }
+
+ synchronized void reset_data() {
+ serial.set(0);
+ radio_channel.set(0);
+ radio_setting.set(0);
+ radio_frequency.set(0);
+ radio_calibration.set(1186611);
+ config_version.set("0.0");
+ version.set("unknown");
+ product.set("unknown");
+ }
- void reset_data() {
- serial.set(0);
+ synchronized double frequency() {
+ return AltosConvert.radio_to_frequency(radio_frequency.get(),
+ radio_setting.get(),
+ radio_calibration.get(),
+ radio_channel.get());
+ }
+
+ synchronized void set_frequency(double freq) {
+ int frequency = radio_frequency.get();
+ int setting = radio_setting.get();
+
+ if (frequency > 0) {
+ radio_frequency.set((int) Math.floor (freq * 1000 + 0.5));
+ } else if (setting > 0) {
+ radio_setting.set(AltosConvert.radio_frequency_to_setting(freq,
+ radio_calibration.get()));
radio_channel.set(0);
- radio_setting.set(0);
- radio_frequency.set(0);
- radio_calibration.set(1186611);
- config_version.set("0.0");
- version.set("unknown");
- product.set("unknown");
+ } else {
+ radio_channel.set(AltosConvert.radio_frequency_to_channel(freq));
}
+ }
+
+ final static int serial_mode_read = 0;
+ final static int serial_mode_save = 1;
+ final static int serial_mode_reboot = 2;
+
+ class SerialData implements Runnable {
+ AltosConfigTD config;
+ int serial_mode;
void get_data() {
try {
boolean been_there = false;
- config.start_serial();
- reset_data();
+ config.reset_data();
for (;;) {
- config.serial_line.printf("c s\nf\nl\nv\n");
+ config.serial_line.printf("c s\nf\nv\n");
for (;;) {
try {
String line = config.serial_line.get_reply(5000);
- if (line == null)
- stop_serial();
- callback(line);
- if (line.startsWith("software-version"))
+ config.process_line(line);
+ if (line != null && line.startsWith("software-version"))
break;
} catch (Exception e) {
break;
config.serial_line.flush_input();
}
} catch (InterruptedException ie) {
- } catch (TimeoutException te) {
- } finally {
- try {
- stop_serial();
- } catch (InterruptedException ie) {
- }
}
- double pref_frequency = AltosPreferences.frequency(serial.get());
- if (pref_frequency != 0)
- radio_frequency.set((int) Math.floor (pref_frequency * 1000 + 0.5));
- callback("all finished");
+ /*
+ * This makes sure the displayed frequency respects the limits that the
+ * available firmware version might place on the actual frequency
+ */
+ config.set_frequency(AltosPreferences.frequency(serial.get()));
+ config.process_line("all finished");
}
void save_data() {
update_ui();
}
- double frequency() {
- return AltosConvert.radio_to_frequency(radio_frequency.get(),
- radio_setting.get(),
- radio_calibration.get(),
- radio_channel.get());
- }
-
- void set_frequency(double freq) {
- int frequency = radio_frequency.get();
- int setting = radio_setting.get();
-
- if (frequency > 0) {
- radio_frequency.set((int) Math.floor (freq * 1000 + 0.5));
- } else if (setting > 0) {
- radio_setting.set(AltosConvert.radio_frequency_to_setting(freq,
- radio_calibration.get()));
- radio_channel.set(0);
- } else {
- radio_channel.set(AltosConvert.radio_frequency_to_channel(freq));
- }
- }
-
void save_data() {
-
- set_frequency(config_ui.radio_frequency());
+ double freq = config_ui.radio_frequency();
+ set_frequency(freq);
run_serial_thread(serial_mode_save);
}
c.anchor = GridBagConstraints.WEST;
pane.add(new JLabel("Imperial Units"), c);
- imperial_units = new JRadioButton("Enable", AltosUIPreferences.serial_debug());
+ imperial_units = new JRadioButton("Enable", AltosUIPreferences.imperial_units());
imperial_units.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
JRadioButton item = (JRadioButton) e.getSource();
GridBagConstraints c = new GridBagConstraints();
- java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
- if (imgURL != null)
- setIconImage(new ImageIcon(imgURL).getImage());
-
setTitle(String.format("AltOS %s", reader.name));
/* Stick channel selector at top of table for telemetry monitoring */
this.pack();
}
+ static final String[] icon_names = {
+ "/altus-metrum-16.png",
+ "/altus-metrum-32.png",
+ "/altus-metrum-48.png",
+ "/altus-metrum-64.png",
+ "/altus-metrum-128.png",
+ "/altus-metrum-256.png"
+ };
+
+ public void set_icon() {
+ ArrayList<Image> icons = new ArrayList<Image>();
+
+ for (int i = 0; i < icon_names.length; i++) {
+ java.net.URL imgURL = AltosUI.class.getResource(icon_names[i]);
+ if (imgURL != null)
+ icons.add(new ImageIcon(imgURL).getImage());
+ }
+
+ setIconImages(icons);
+ }
+
public AltosFrame() {
AltosUIPreferences.register_ui_listener(this);
addWindowListener(new AltosFrameListener());
+ set_icon();
}
public AltosFrame(String name) {
super(name);
AltosUIPreferences.register_ui_listener(this);
addWindowListener(new AltosFrameListener());
+ set_icon();
}
}
GridBagConstraints c = new GridBagConstraints();
- java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
- if (imgURL != null)
- setIconImage(new ImageIcon(imgURL).getImage());
-
setTitle(String.format("AltOS %s", device.toShortString()));
/* Stick frequency selector at top of table for telemetry monitoring */
load_library(null);
- java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
- if (imgURL != null)
- setIconImage(new ImageIcon(imgURL).getImage());
-
AltosUIPreferences.set_component(this);
pane = getContentPane();
}
}
public static int font_size() {
- return font_size;
+ synchronized (preferences) {
+ return font_size;
+ }
}
static void set_fonts() {
}
public static void set_font_size(int new_font_size) {
- font_size = new_font_size;
synchronized (preferences) {
+ font_size = new_font_size;
preferences.putInt(fontSizePreference, font_size);
flush_preferences();
Altos.set_fonts(font_size);
}
public static void set_look_and_feel(String new_look_and_feel) {
- look_and_feel = new_look_and_feel;
try {
- UIManager.setLookAndFeel(look_and_feel);
+ UIManager.setLookAndFeel(new_look_and_feel);
} catch (Exception e) {
}
synchronized(preferences) {
+ look_and_feel = new_look_and_feel;
preferences.put(lookAndFeelPreference, look_and_feel);
flush_preferences();
for (AltosUIListener l : ui_listeners)
}
public static String look_and_feel() {
- return look_and_feel;
+ synchronized (preferences) {
+ return look_and_feel;
+ }
}
public static void register_ui_listener(AltosUIListener l) {
}
}
public static void set_serial_debug(boolean new_serial_debug) {
- serial_debug = new_serial_debug;
- AltosLink.set_debug(serial_debug);
+ AltosLink.set_debug(new_serial_debug);
synchronized (preferences) {
+ serial_debug = new_serial_debug;
preferences.putBoolean(serialDebugPreference, serial_debug);
flush_preferences();
}
}
public static boolean serial_debug() {
- return serial_debug;
+ synchronized (preferences) {
+ return serial_debug;
+ }
}
}
\ No newline at end of file
AltosRomconfigUI.class \
AltosVoice.class
-JAVA_ICON=../icon/altus-metrum-16x16.jpg
+JAVA_ICONS=\
+ ../icon/altus-metrum-16.png \
+ ../icon/altus-metrum-32.png \
+ ../icon/altus-metrum-48.png \
+ ../icon/altus-metrum-64.png \
+ ../icon/altus-metrum-128.png \
+ ../icon/altus-metrum-256.png
+
WINDOWS_ICON=../icon/altus-metrum.ico
# where altosui.jar gets installed
classes/images:
mkdir -p classes/images
- ln -sf ../$(JAVA_ICON) classes/images
+ ln -sf ../$(JAVA_ICONS) classes/images
altosui:
echo "#!/bin/sh" > $@
echo 'exec java -Djava.library.path="$$DIR" -jar "$$DIR"/altosui.jar' >> $@
chmod +x $@
-fat/altosui.jar: $(CLASSFILES) $(JAVA_ICON) fat/classes/Manifest.txt
+fat/altosui.jar: $(CLASSFILES) $(JAVA_ICONS) fat/classes/Manifest.txt
mkdir -p fat/classes
test -L fat/classes/altosui || ln -sf ../.. fat/classes/altosui
mkdir -p fat/classes/images
- cp $(JAVA_ICON) fat/classes/images
+ cp $(JAVA_ICONS) fat/classes/images
test -L fat/classes/libaltosJNI || ln -sf ../../libaltos/libaltosJNI fat/classes/libaltosJNI
cd ./fat/classes && jar cfm ../../$@ Manifest.txt images/* altosui/*.class libaltosJNI/*.class
# Icons
ICONDIR=$(top_srcdir)/icon
-JAVA_ICON=$(ICONDIR)/altus-metrum-16x16.jpg
+JAVA_ICONS=\
+ $(ICONDIR)/altus-metrum-16.png \
+ $(ICONDIR)/altus-metrum-32.png \
+ $(ICONDIR)/altus-metrum-48.png \
+ $(ICONDIR)/altus-metrum-64.png \
+ $(ICONDIR)/altus-metrum-128.png \
+ $(ICONDIR)/altus-metrum-256.png
ICONS= $(ICONDIR)/redled.png $(ICONDIR)/redoff.png \
$(ICONDIR)/greenled.png $(ICONDIR)/greenoff.png \
$(ICONDIR)/grayled.png $(ICONDIR)/grayoff.png
# icon base names for jar
-ICONJAR= -C $(ICONDIR) altus-metrum-16x16.jpg \
+ICONJAR= -C $(ICONDIR) altus-metrum-16.png \
+ -C $(ICONDIR) altus-metrum-32.png \
+ -C $(ICONDIR) altus-metrum-48.png \
+ -C $(ICONDIR) altus-metrum-64.png \
+ -C $(ICONDIR) altus-metrum-128.png \
+ -C $(ICONDIR) altus-metrum-256.png \
-C $(ICONDIR) redled.png -C $(ICONDIR) redoff.png \
-C $(ICONDIR) greenled.png -C $(ICONDIR) greenoff.png \
-C $(ICONDIR) grayon.png -C $(ICONDIR) grayled.png
classes/altosui:
mkdir -p classes/altosui
-$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON) $(ALTOSLIB_CLASS)
+$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICONS) $(ALTOSLIB_CLASS)
jar cfm $@ Manifest.txt \
$(ICONJAR) \
-C classes altosui \
-C libaltos libaltosJNI
-$(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON)
+$(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICONS)
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
-C classes altosui \
Manifest.txt: Makefile
echo 'Main-Class: altosui.AltosUI' > $@
- echo "Class-Path: AltosLib.jar $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JCOMMON)/jcommon.jar" >> $@
+ echo "Class-Path: AltosLib.jar $(FREETTS)/freetts.jar $(JCOMMON)/jcommon.jar $(JFREECHART)/jfreechart.jar" >> $@
Manifest-fat.txt:
echo 'Main-Class: altosui.AltosUI' > $@
- echo "Class-Path: AltosLib.jar freetts.jar jfreechart.jar jcommon.jar" >> $@
+ echo "Class-Path: AltosLib.jar freetts.jar jcommon.jar jfreechart.jar" >> $@
altosui: Makefile
echo "#!/bin/sh" > $@
- echo 'exec java -cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
+ echo 'exec java -cp "$(FREETTS)/freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
chmod +x $@
altosui-test: Makefile
echo "#!/bin/sh" > $@
- echo 'exec java -cp "./*:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+ echo 'exec java -cp "./*:$(FREETTS)/freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="libaltos/.libs" -jar altosui.jar "$$@"' >> $@
chmod +x $@
altosui-jdb: Makefile
echo "#!/bin/sh" > $@
- echo 'exec jdb -classpath "classes:libaltos:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" altosui/AltosUI "$$@"' >> $@
+ echo 'exec jdb -classpath "classes:libaltos:$(FREETTS)/freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="libaltos/.libs" altosui/AltosUI "$$@"' >> $@
chmod +x $@
libaltos.so: build-libaltos
Add configuration for the new apogee-lockout value. A menu provides a list of
reasonable values, or the value can be set by hand.
</listitem>
+ <listitem>
+ Changed how flight data are downloaded. Now there's an initial
+ dialog asking which flights to download, and after that
+ finishes, a second dialog comes up asking which flights to delete.
+ </listitem>
<listitem>
Re-compute time spent in each state for the flight graph; this
figures out the actual boost and landing times instead of
projects / fw / altos / commitdiff
