Merge branch 'experimental'

.gitattributes

@@ -12,7 +12,7 @@ Makefile eol=lf
 *.pdf binary
 *.exe binary
 *.tar binary
+*.a binary
 
 *.axp   text diff=html
 *.axo   text diff=html
-

.gitignore

@@ -13,6 +13,7 @@ portaudio/*
 win32tools/
 chibios/
 chibios_2.6.5/
+ChibiOS_*/
 patch/xpatch.c
 patch/xpatch.cpp
 patch/xpatch.elf
@@ -94,6 +95,7 @@ local.properties
 .classpath
 .settings/
 .loadpath
+workbench.xmi
 
 # External tool builders
 .externalToolBuilders/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "firmware/elfloader"]
+	path = firmware/elfloader
+	url = https://github.com/JohannesTaelman/elfloader

.travis.yml

@@ -1,31 +1,44 @@
 language: java
-jdk:
-  - oraclejdk8
 matrix:
   include:
     - os: linux
       dist: trusty
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
 before_install:
   - >
     case "${TRAVIS_OS_NAME:-linux}" in
     linux)
       sudo apt-get update -qq
       sudo apt-get install -qq fakeroot
-      ./platform_linux/build.sh
+      curl https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2 -o gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2
+      tar xfj gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2 -C platform_linux/
+      rm gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2
+      curl https://d3pxv6yz143wms.cloudfront.net/8.232.09.1/java-1.8.0-amazon-corretto-jdk_8.232.09-1_amd64.deb > java-1.8.0-amazon-corretto-jdk_8.232.09-1_amd64.deb
+      sudo dpkg -i java-1.8.0-amazon-corretto-jdk_8.232.09-1_amd64.deb
+      rm java-1.8.0-amazon-corretto-jdk_8.232.09-1_amd64.deb
+      export JAVA_HOME="/usr/lib/jvm/java-1.8.0-amazon-corretto"
+      ./platform_linux/build.sh --noninteractive
       ;;
     osx)
-      brew install ant
+      brew update
+      brew install ant p7zip
+      curl https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-mac.tar.bz2 -o gcc-arm-none-eabi-7-2018-q2-update-mac.tar.bz2
+      tar xfj gcc-arm-none-eabi-7-2018-q2-update-mac.tar.bz2 -C /Applications/
+      rm gcc-arm-none-eabi-7-2018-q2-update-mac.tar.bz2
+      curl https://d3pxv6yz143wms.cloudfront.net/8.232.09.1/amazon-corretto-8.232.09.1-macosx-x64.pkg > amazon-corretto-8.232.09.1-macosx-x64.pkg
+      sudo installer -pkg amazon-corretto-8.232.09.1-macosx-x64.pkg -target /
+      export JAVA_HOME=/Library/Java/JavaVirtualMachines/amazon-corretto-8.jdk/Contents/Home
+      rm amazon-corretto-8.232.09.1-macosx-x64.pkg
       ./platform_osx/build.sh
       ;;
     esac;
     javac -version;
 
 script:
   - ant
+  - ant check_fw
   - ant -Dbuild.bundle=true bundle
-  - ant -Dbuild.runtime=true runtime
 
 before_deploy:
   - pwd

Axoloti.bat

@@ -9,7 +9,7 @@ set KEY="HKLM\SOFTWARE\JavaSoft\Java Runtime Environment"
 set VALUE=CurrentVersion
 reg query %KEY% /v %VALUE% 2>nul || (
 	set KEY="HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Runtime Environment"
-	reg query %KEY% /v %VALUE% 2>nul 
+	reg query %KEY% /v %VALUE% 2>nul
 	) || (echo Java Runtime Environment not installed @ exit /b 1)
 set JRE_VERSION=
 for /f "tokens=2,*" %%a in ('reg query %KEY% /v %VALUE% ^| findstr %VALUE%') do (
@@ -44,11 +44,9 @@ if not defined JAVAHOME (
 )
 
 echo JavaHome: %JAVAHOME%
-
 set PATH=%JAVAHOME%\bin
-java -jar dist/axoloti.jar %*
+set MARLIN_JVMARGS="-Xbootclasspath/a:lib/marlin-0.9.1-Unsafe.jar -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine"
+java %MARLIN_JVMARGS% -jar dist/axoloti.jar %*
 
 :end
 endlocal
-
-

Axoloti.sh

@@ -22,18 +22,20 @@ export axoloti_runtime=${axoloti_runtime:="$rootdir"}
 export axoloti_firmware=${axoloti_firmware:="$axoloti_release/firmware"}
 export axoloti_home=${axoloti_home:="$rootdir"}
 
-which java >/dev/null || echo "java not found in path" 
+which java >/dev/null || echo "java not found in path"
 
-if [ -f $rootdir/dist/Axoloti.jar ]
+marlin_jvmargs='-Xbootclasspath/a:lib/marlin-0.9.1-Unsafe.jar -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine'
+
+if [ -f "$rootdir/dist/Axoloti.jar" ]
 then
     case "$platform" in
         mac)
-                echo java -Xdock:name=Axoloti -jar $rootdir/dist/Axoloti.jar $* 
-                java -Xdock:name=Axoloti -jar $rootdir/dist/Axoloti.jar $* 2>&1 | tee "$axoloti_home/axoloti.log"
+                echo java $marlin_jvmargs -Xdock:name=Axoloti -jar "$rootdir/dist/Axoloti.jar" $*
+                java $marlin_jvmargs -Xdock:name=Axoloti -jar "$rootdir/dist/Axoloti.jar" $* 2>&1 | tee "$axoloti_home/axoloti.log"
         ;;
         linux)
-                echo java -jar $rootdir/dist/Axoloti.jar $* 
-                java -jar $rootdir/dist/Axoloti.jar $* 2>&1 | tee "$axoloti_home/axoloti.log"
+                echo java $marlin_jvmargs -jar $rootdir/dist/Axoloti.jar $*
+                java $marlin_jvmargs -jar "$rootdir/dist/Axoloti.jar" $* 2>&1 | tee "$axoloti_home/axoloti.log"
         ;;
     esac
 else