Merge branch 'release/1.1.0'

Author: jabrena

README.md

@@ -9,9 +9,12 @@ require some configuration to run in the right way.
 
 This project tries to save time in this process.
 
-The installer will install the following libraries & utilities by default:
+The installer will install the following libraries by default:
 
 + Java JDK 8 (Only for BrickPi/PiStorms)
+
+If you like, you can install a utility to monitor the battery. (Recommended)
+
 + [BatteryMonitor](https://github.com/ev3dev-lang-java/batteryMonitor) (A Java utility to monitor the Battery)
 
 But it is possible to install the following libraries if your project requires them.

installer.sh

@@ -6,7 +6,7 @@ echo
 echo "##############################"
 echo "# EV3Dev-lang-java Installer #"
 echo "##############################"
-echo "# Last update: 2017/05/14    #"
+echo "# Last update: 2017/06/05    #"
 echo "##############################"
 echo
 
@@ -32,6 +32,7 @@ function initInstaller(){
 
 MODE_HELP="help"
 MODE_JDK="jdk"
+MODE_BATTERY_MONITOR="batteryMonitor"
 MODE_COPY_INSTALLER="copy-installer"
 MODE_EXTENDED="extended"
 
@@ -43,6 +44,7 @@ if [ "$1" == "$MODE_HELP" ]; then
     runModule help
 fi
 
+#TODO Disable this option if platform is not EV3BRICK
 CREDENTIAL=""
 if [ "$1" == "$MODE_JDK" ]; then
     CREDENTIAL=$2
@@ -56,7 +58,10 @@ fi
 
 runModule platform
 runModule java
-runModule battery-monitor
+
+if [ "$1" == "$MODE_BATTERY_MONITOR" ]; then
+    runModule battery-monitor
+fi
 
 if [ "$1" == "$MODE_EXTENDED" ]; then
     runModule native-libraries

modules/battery-monitor.sh

@@ -2,8 +2,9 @@
 
 function installBatteryMonitor() {
     cd /home/robot
-    wget https://github.com/ev3dev-lang-java/batteryMonitor/raw/develop/releases/batteryMonitor-0.2.0-SNAPSHOT.zip
+    wget https://github.com/ev3dev-lang-java/batteryMonitor/raw/release/v0.2.0-RELEASE/releases/batteryMonitor-0.2.0-RELEASE.zip
 
+    #TODO Move block to function
     isInstalled unzip
     if [ "$INSTALLED" == "$INSTALLED_NO" ]; then
         if [ "$PLATFORM" == "$EV3" ]; then
@@ -19,8 +20,9 @@ function installBatteryMonitor() {
 
     fi
 
-    unzip batteryMonitor-0.2.0-SNAPSHOT.zip
-    mv batteryMonitor-0.2.0-SNAPSHOT batteryMonitor
+    #TODO Move to a function
+    unzip batteryMonitor-0.2.0-RELEASE.zip
+    mv batteryMonitor-0.2.0-RELEASE batteryMonitor
     cd batteryMonitor
     chmod +x ./start.sh
     chmod +x ./stop.sh
@@ -29,8 +31,7 @@ function installBatteryMonitor() {
     chmod +x batteryMonitor-service.sh
     update-rc.d batteryMonitor-service.sh defaults
     cd /home/robot/batteryMonitor
-    ./start.sh
-    ps aux | grep java
+    ./start.sh &
 }
 
 if [ "$PLATFORM" == "$UNKNOWN" ]; then

modules/experimental/java-ev3-java8-installer.sh

@@ -2,6 +2,7 @@
 
 echo "Installer options:"
 echo "sudo ./installer.sh [Execute modules: platform, java & batteryMonitor]"
+echo "sudo ./installer.sh batteryMonitor [Install batteryMonitor]"
 echo "sudo ./installer.sh extended [Execute modules: platform, java, batteryMonitor & native-libraries]"
 echo "sudo ./installer.sh jdk [email protected] [Copy your local JRE to a remote brick]"
 echo "sudo ./installer.sh copy-installer [email protected] [Copy the installer to a remote brick]"

modules/help.sh

@@ -1,16 +1,5 @@
 #!/bin/bash
 
-function installJavaForBrickPi() {
-    apt-key adv --recv-key --keyserver keyserver.ubuntu.com EEA14886
-    echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | sudo tee -a /etc/apt/sources.list
-    echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | sudo tee -a /etc/apt/sources.list
-    sudo apt-get update
-    sudo apt-get install oracle-java8-installer
-
-    #Review in the future how to accept licence automatically
-    #https://askubuntu.com/questions/190582/installing-java-automatically-with-silent-option
-}
-
 function installJavaForEV3(){
     if [ -e "/home/robot/ejdk-8-fcs-b132-linux-arm-sflt-03_mar_2014.tar.gz" ]; then
         tar -zxvf "/home/robot/ejdk-8-fcs-b132-linux-arm-sflt-03_mar_2014.tar.gz" -C /opt
@@ -25,6 +14,17 @@ function installJavaForEV3(){
     fi
 }
 
+function installJavaForBrickPi() {
+    apt-key adv --recv-key --keyserver keyserver.ubuntu.com EEA14886
+    echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | sudo tee -a /etc/apt/sources.list
+    echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | sudo tee -a /etc/apt/sources.list
+    sudo apt-get update
+    sudo apt-get install oracle-java8-installer
+
+    #Review in the future how to accept licence automatically
+    #https://askubuntu.com/questions/190582/installing-java-automatically-with-silent-option
+}
+
 #1. Detect Java
 #1.1 Install Java
 #1.2 Create JAVA_HOME PENDING

modules/java.sh

@@ -2,6 +2,7 @@
 
 EV3="EV3"
 BRICKPI="BRICKPI"
+PISTORMS="PISTORMS"
 UNKNOWN="UNKNOWN"
 PLATFORM=$UNKNOWN
 
@@ -26,6 +27,9 @@ if [ -d "/sys/class/power_supply/legoev3-battery" ]; then
 elif [ -d "/sys/class/power_supply/brickpi-battery" ]; then
   echo "The user has a BrickPi+"
   PLATFORM=$BRICKPI
+elif [ -d "/sys/class/power_supply/pistorms-battery" ]; then
+  echo "The user has a PiStorms"
+  PLATFORM=$PISTORMS
 fi
 echo "Platform detected: $PLATFORM"
 echo