Fix travis to build all variants (really)

Travis mod - single branch only

.travis.yml

@@ -9,27 +9,29 @@ language: c
 
 branches:
   only:
-    - private_build2
+    - private-build2
 
 before_install:
-#  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16"
-#  - sleep 3
-#  - export DISPLAY=:1.0
+# Not sure this is necessary in more recent SDKs
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16"
+  - sleep 3
+  - export DISPLAY=:1.0
+
+install:
   - wget http://downloads.arduino.cc/arduino-1.8.5-linux64.tar.xz
   - tar xf arduino-1.8.5-linux64.tar.xz
 
-install:
-  - cp Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h Firmware/Configuration_prusa.h
-
 script:
+  - GIT_BUILD=$(git rev-parse --short HEAD)
   - VARIANTS=$(ls Firmware/variants/)
   - for VARIANT in $VARIANTS; do
-      arduino-1.8.5/arduino --pref build.path=. --verify --verbose-build --board arduino:avr:mega $PWD/Firmware/Firmware.ino ;
-      cp Firmware.ino.hex "${VARIANT}"ex ;
+      cp Firmware/variants/${VARIANT} Firmware/Configuration_prusa.h ;
+      arduino-1.8.5/arduino --pref build.path=. --verify --verbose-build --board arduino:avr:mega:cpu=atmega2560 $PWD/Firmware/Firmware.ino ;
+      mv Firmware.ino.hex "${VARIANT}"ex ;
     done
-  - mkdir -p prusa3d_fw_$(git rev-parse --short HEAD)/MK1-175mm prusa3d_fw_$(git rev-parse --short HEAD)/MK2-MultiMaterial prusa3d_fw_$(git rev-parse --short HEAD)/MK2
-  - mv *_MK1-RAMBo* prusa3d_fw_$(git rev-parse --short HEAD)/MK1-175mm
-  - mv *_MK2-MultiMaterial-RAMBo* prusa3d_fw_$(git rev-parse --short HEAD)/MK2-MultiMaterial
-  - mv *_MK2-RAMBo* prusa3d_fw_$(git rev-parse --short HEAD)/MK2
-  - zip -r prusa3d_fw_$(git rev-parse --short HEAD).zip prusa3d_fw_* *.pdf
-  - curl --upload-file prusa3d_fw_$(git rev-parse --short HEAD).zip https://transfer.sh/prusa3d_fw_$(git rev-parse --short HEAD).zip
+  - mkdir -p prusa3d_fw_${GIT_BUILD}/MK1-175mm prusa3d_fw_${GIT_BUILD}/MK2-MultiMaterial prusa3d_fw_${GIT_BUILD}/MK2
+  - mv *_MK1-RAMBo* prusa3d_fw_${GIT_BUILD}/MK1-175mm
+  - mv *_MK2-MultiMaterial-RAMBo* prusa3d_fw_${GIT_BUILD}/MK2-MultiMaterial
+  - mv *_MK2-RAMBo* prusa3d_fw_${GIT_BUILD}/MK2
+  - zip -r prusa3d_fw_${GIT_BUILD}.zip prusa3d_fw_* *.pdf
+  - curl --upload-file prusa3d_fw_${GIT_BUILD}.zip https://transfer.sh/prusa3d_fw_${GIT_BUILD}.zip