summaryrefslogtreecommitdiff
path: root/altoslib
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2018-08-22 17:42:13 -0700
committerKeith Packard <keithp@keithp.com>2018-08-22 17:42:13 -0700
commit378ebab2e70917b4182cbd840a3fa66e4e42fd92 (patch)
tree9d338cee8d8e4f9dea18b3dff25f7739ee1e19bf /altoslib
parent22005da598921ef6fe1a7f1bb5e56e41f44fe12f (diff)
altoslib: Use common constants for flash action messages
Place messages in AltosFlashListener instead of using the same strings in three different places. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib')
-rw-r--r--altoslib/AltosFlash.java4
-rw-r--r--altoslib/AltosFlashListener.java4
-rw-r--r--altoslib/AltosSelfFlash.java4
3 files changed, 8 insertions, 4 deletions
diff --git a/altoslib/AltosFlash.java b/altoslib/AltosFlash.java
index 520663b7..e6b05713 100644
--- a/altoslib/AltosFlash.java
+++ b/altoslib/AltosFlash.java
@@ -257,7 +257,7 @@ public class AltosFlash extends AltosProgrammer {
int flash_addr = (int) image.address;
int image_start = 0;
- action("start", 0);
+ action(AltosFlashListener.flash_start, 0);
action(0, image.data.length);
while (remain > 0 && !aborted) {
int this_time = remain;
@@ -293,7 +293,7 @@ public class AltosFlash extends AltosProgrammer {
action(image.data.length - remain, image.data.length);
}
if (!aborted) {
- action("done", 100);
+ action(AltosFlashListener.flash_done, 100);
if (debug != null) {
debug.set_pc((int) image.address);
debug.resume();
diff --git a/altoslib/AltosFlashListener.java b/altoslib/AltosFlashListener.java
index f9eaf00f..120e7146 100644
--- a/altoslib/AltosFlashListener.java
+++ b/altoslib/AltosFlashListener.java
@@ -19,5 +19,9 @@
package org.altusmetrum.altoslib_13;
public interface AltosFlashListener {
+
+ public final static String flash_start = "start";
+ public final static String flash_done = "done";
+
public void position(String label, int percent);
}
diff --git a/altoslib/AltosSelfFlash.java b/altoslib/AltosSelfFlash.java
index 75fc7946..20839ce4 100644
--- a/altoslib/AltosSelfFlash.java
+++ b/altoslib/AltosSelfFlash.java
@@ -101,7 +101,7 @@ public class AltosSelfFlash extends AltosProgrammer {
long flash_addr = image.address;
int image_start = 0;
- action("start", 0);
+ action(AltosFlashListener.flash_start, 0);
action(0, image.data.length);
while (remain > 0 && !aborted) {
int this_time = remain;
@@ -129,7 +129,7 @@ public class AltosSelfFlash extends AltosProgrammer {
action(image.data.length - remain, image.data.length);
}
if (!aborted) {
- action("done", 100);
+ action(AltosFlashListener.flash_done, 100);
}
close();
} catch (IOException ie) {