Bug fixing, Debian package update

Also added CLI desktop launcher

deb-builder/AstroAllInOne/usr/bin/astroallinone

@@ -1,15 +1,8 @@
 #!/bin/bash
-close() {
-    echo "Bye!"
-    exit 0
-}
-trap close INT
-
 if [ -z "$(which java)" ]; then
     echo "Java not found!"
     exit 3
 fi
-
 dataDir="$HOME/.config/AstroAllInOne"
 mkdir -p "$dataDir"
 java -jar "/usr/share/AstroAllInOne/AstroAllInOne.jar" "--data-dir=$dataDir" "$@"

deb-builder/AstroAllInOne/usr/share/applications/AstroAllInOne-nogui.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=AstroAllInOne console
+Comment=AstroAllInOne by SquareBoot (terminal version)
+Exec=/usr/bin/astroallinone --no-gui
+Icon=/usr/share/AstroAllInOne/logo-terminal.png
+Terminal=true
+Type=Application
+Categories=Application;Science;Astronomy;
+StartupNotify=false

src/squareboot/astro/allinone/ControlPanel.java

@@ -258,8 +258,12 @@ private ArduinoPin askNewPin() {
         int value = 13;
         do {
             try {
-                value = Integer.valueOf(JOptionPane.showInputDialog(this, "New pin",
-                        "Control panel", JOptionPane.QUESTION_MESSAGE));
+                String input = JOptionPane.showInputDialog(this, "New pin",
+                        "Control panel", JOptionPane.QUESTION_MESSAGE);
+                if (input == null) {
+                    return null;
+                }
+                value = Integer.valueOf(input);
                 check = false;
 
             } catch (NumberFormatException e) {

src/squareboot/astro/allinone/Main.java

@@ -17,7 +17,7 @@
  * @author SquareBoot
  * @version 0.1
  */
-@SuppressWarnings({"unused", "WeakerAccess"})
+@SuppressWarnings("WeakerAccess")
 public class Main {
 
     /**
@@ -53,25 +53,11 @@ public class Main {
      */
     private static SplashScreen splash;
 
-    static {
-        try {
-            logo = Toolkit.getDefaultToolkit().getImage(Main.class.
-                    getResource("/squareboot/astro/allinone/res/logo.png"));
-
-        } catch (Exception e) {
-            System.err.println("Unable to load app image.");
-            e.printStackTrace();
-        }
-    }
-
     /**
      * Main. Configures the L&F and starts the application.
      */
     public static void main(String[] args) {
-        splash = new SplashScreen(0);
-
         CommandLineParser parser = new DefaultParser();
-
         Options options = new Options();
         options.addOption("d", "data-dir", true,
                 "The directory where AstroAllInOne will retrieve its settings.");
@@ -87,14 +73,25 @@ public static void main(String[] args) {
         try {
             CommandLine line = parser.parse(options, args);
 
-            if (!line.hasOption('g')) {
+            showGui = !line.hasOption('n');
+            if (showGui) {
+                splash = new SplashScreen(500);
                 try {
-                    System.out.println("Loading GTK...");
-                    UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
+                    logo = Toolkit.getDefaultToolkit().getImage(Main.class.
+                            getResource("/squareboot/astro/allinone/res/logo.png"));
 
                 } catch (Exception e) {
-                    System.err.println("Unable to set up GTK: " + e.getMessage());
-                    e.printStackTrace();
+                    System.err.println("Unable to load app image.");
+                }
+                if (!line.hasOption('g')) {
+                    try {
+                        System.out.println("Loading GTK...");
+                        UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
+
+                    } catch (Exception e) {
+                        System.err.println("Unable to set up GTK: " + e.getMessage());
+                        e.printStackTrace();
+                    }
                 }
             }
 
@@ -121,8 +118,6 @@ public static void main(String[] args) {
                 settings.setUsbPort(line.getOptionValue('s'));
             }
 
-            showGui = !line.hasOption('n');
-
         } catch (ParseException e) {
             System.err.println("The given arguments are not valid!");
             exit(ExitCodes.PARSE_ERROR);
@@ -171,7 +166,9 @@ private static void start() {
         server.loadJava(INDIArduinoDriver.class);
         SimpleSerialPort realArduino;
         try {
-            realArduino = new SimpleSerialPort(settings.getUsbPort());
+            String usbPort = settings.getUsbPort();
+            System.out.println("Connecting to serial port \"" + usbPort + "\"...");
+            realArduino = new SimpleSerialPort(usbPort);
 
         } catch (ConnectionError e) {
             System.err.println("Unable to connect to the given serial port!");
@@ -218,12 +215,18 @@ private static void start() {
             return;
         }
 
-        System.out.println("Starting status window...");
-        SwingUtilities.invokeLater(() -> {
-            splash.dispose();
-            splash = null;
-            new ServerMiniWindow(multiplexer.getMockedPort(), arduinoDriver);
-        });
+        System.out.println("Connect MoonLite to port " + multiplexer.getMockedPort());
+        if (showGui) {
+            System.out.println("Starting status window...");
+            SwingUtilities.invokeLater(() -> {
+                splash.dispose();
+                splash = null;
+                new ServerMiniWindow(multiplexer.getMockedPort(), arduinoDriver);
+            });
+
+        } else {
+            System.out.println("Control-C to close");
+        }
     }
 
     /**

src/squareboot/astro/allinone/indi/INDIArduinoDriver.java

@@ -88,18 +88,33 @@ public void init(GenericSerialPort serialPort, ArduinoPin[] switchPins, ArduinoP
         digitalPinProps = new INDISwitchProperty(this, "Digital pins", "Digital pins", "Control",
                 PropertyStates.OK, PropertyPermissions.RW, Constants.SwitchRules.ANY_OF_MANY);
         for (ArduinoPin pin : switchPins) {
-            printMessage("onDigitalPinCreate(" + pin + ")");
-            pinsMap.put(new INDISwitchElement(digitalPinProps, "Pin " + pin.getPin(),
-                    pin.getName(), pin.getValueIndi()), pin);
+            int p = checkPin(pin);
+            if (p != -1) {
+                pinsMap.put(new INDISwitchElement(digitalPinProps, "Pin " + p,
+                        pin.getName(), pin.getValueIndi()), pin);
+            }
         }
 
         pwmPinsProp = new INDINumberProperty(this, "PWM pins", "PWM pins", "Control",
                 PropertyStates.OK, PropertyPermissions.RW);
         for (ArduinoPin pin : pwmPins) {
-            printMessage("onPwmPinCreate(" + pin + ")");
-            pinsMap.put(new INDINumberElement(pwmPinsProp, "PWM pin" + pin.getPin(), pin.getName(),
-                    (double) pin.getValuePercentage(), 0.0, 100.0, 1.0, "%f"), pin);
+            int p = checkPin(pin);
+            if (p != -1) {
+                pinsMap.put(new INDINumberElement(pwmPinsProp, "PWM pin" + p, pin.getName(),
+                        (double) pin.getValuePercentage(), 0.0, 100.0, 1.0, "%f"), pin);
+            }
+        }
+    }
+
+    private int checkPin(ArduinoPin pin) {
+        printMessage("Defining pin: " + pin);
+        int p = pin.getPin();
+        if ((p < 2) || (p > 99)) {
+            System.err.println("Ignoring pin, \"" + p + "\" is out the allowed bounds!");
+            return -1;
         }
+        updatePin(pin);
+        return p;
     }
 
     /**