Merge branch 'branch-1.3' into debian

Conflicts:
	ChangeLog
	altoslib/AltosRecordMM.java
	altosui/Makefile.am
	altosui/altos-windows.nsi.in
	configure.ac
	debian/changelog
	debian/control
	doc/Makefile
	doc/altusmetrum.xsl
	doc/release-notes-1.2.1.xsl
	doc/release-notes-1.2.xsl

1 files changed, 45 insertions, 0 deletions

diff --git a/altoslib/AltosEepromMonitor.java b/altoslib/AltosEepromMonitor.java
new file mode 100644
index 00000000..eeef0678
--- /dev/null
+++ b/altoslib/AltosEepromMonitor.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altoslib_2;
+
+public interface AltosEepromMonitor {
+
+	public void set_states(int min_state, int max_state);
+
+	public void set_value(String in_state_name, int in_state, int in_state_block, int in_block);
+
+	public void set_serial(int in_serial);
+
+	public void set_flight(int in_flight);
+
+	public void set_filename(String in_file);
+
+	public void set_thread(Thread eeprom_thread);
+
+	final static int INFO_MESSAGE = 0;
+	final static int WARNING_MESSAGE = 1;
+	final static int ERROR_MESSAGE = 2;
+
+	public void show_message(String message, String title, int message_type);
+
+	public void start();
+
+	public void done(boolean success);
+
+	public void reset();
+}