altosui: Add debug dongle API, split flash UI out

[fw/altos] / ao-tools / altosui / AltosSerial.java

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index 073bfb783bff4d3ca7c87c5390af02058026850b..a62f122550fd5240bb57e4feac2b46a7eb200e5c 100644 (file)
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -37,7 +37,9 @@ import libaltosJNI.SWIGTYPE_p_altos_list;
  * line in a queue. Dealing with that queue is left up to other
  * threads.
  */
  * line in a queue. Dealing with that queue is left up to other
  * threads.
  */

-class AltosSerialReader implements Runnable {
+
+public class AltosSerial implements Runnable {
+

        SWIGTYPE_p_altos_file altos;
        LinkedList<LinkedBlockingQueue<String>> monitors;
        LinkedBlockingQueue<String> reply_queue;
        SWIGTYPE_p_altos_file altos;
        LinkedList<LinkedBlockingQueue<String>> monitors;
        LinkedBlockingQueue<String> reply_queue;


@@ -77,6 +79,10 @@ class AltosSerialReader implements Runnable {
                }
        }
 
                }
        }
 

+       public void flush_reply() {
+               reply_queue.clear();
+       }
+

        public String get_reply() throws InterruptedException {
                return reply_queue.take();
        }
        public String get_reply() throws InterruptedException {
                return reply_queue.take();
        }


@@ -102,10 +108,8 @@ class AltosSerialReader implements Runnable {
        }
 
        public void close() {
        }
 
        public void close() {

-               if (altos != null) {
+               if (altos != null)

                        libaltos.altos_close(altos);
                        libaltos.altos_close(altos);

-                       altos = null;
-               }

                if (input_thread != null) {
                        try {
                                input_thread.interrupt();
                if (input_thread != null) {
                        try {
                                input_thread.interrupt();


@@ -114,52 +118,56 @@ class AltosSerialReader implements Runnable {
                        }
                        input_thread = null;
                }
                        }
                        input_thread = null;
                }

+               if (altos != null) {
+                       libaltos.altos_free(altos);
+                       altos = null;
+               }

        }
 
        }
 

-       public void open(altos_device device) throws FileNotFoundException {
-               close();
-               altos = libaltos.altos_open(device);
-               input_thread = new Thread(this);
-               input_thread.start();
-       }
-       public AltosSerialReader () {
-               altos = null;
-               input_thread = null;
-               line = "";
-               monitors = new LinkedList<LinkedBlockingQueue<String>> ();
-               reply_queue = new LinkedBlockingQueue<String> ();
+       public void putc(char c) {
+               if (altos != null)
+                       libaltos.altos_putchar(altos, c);

        }
        }

-}
-
-public class AltosSerial {
-       AltosSerialReader reader = null;

 
 

-       public void close() {
-               reader.close();
+       public void print(String data) {
+               for (int i = 0; i < data.length(); i++)
+                       putc(data.charAt(i));

        }
 
        }
 

-       public void open(altos_device device) throws FileNotFoundException {
-               reader.open(device);
+       public void printf(String format, Object ... arguments) {
+               print(String.format(format, arguments));

        }
 
        }
 

-       void init() {
-               reader = new AltosSerialReader();
+       public void open(altos_device device) throws FileNotFoundException {
+               close();
+               altos = libaltos.altos_open(device);
+               if (altos == null)
+                       throw new FileNotFoundException(device.getPath());
+               input_thread = new Thread(this);
+               input_thread.start();
+               print("\nE 0\n");
+               try {
+                       Thread.sleep(200);
+               } catch (InterruptedException e) {
+               }
+               flush();

        }
 
        }
 

-       public void add_monitor(LinkedBlockingQueue<String> q) {
-               reader.add_monitor(q);
+       public void set_channel(int channel) {
+               if (altos != null)
+                       printf("m 0\nc r %d\nm 1\n", channel);

        }
 
        }
 

-       public void remove_monitor(LinkedBlockingQueue<String> q) {
-               reader.remove_monitor(q);
+       public void set_callsign(String callsign) {
+               if (altos != null)
+                       printf ("c c %s\n", callsign);

        }
 
        public AltosSerial() {
        }
 
        public AltosSerial() {

-               init();
-       }
-
-       public AltosSerial(altos_device device) throws FileNotFoundException {
-               init();
-               open(device);
+               altos = null;
+               input_thread = null;
+               line = "";
+               monitors = new LinkedList<LinkedBlockingQueue<String>> ();
+               reply_queue = new LinkedBlockingQueue<String> ();

        }
 }
        }
 }