2.5 branch doesn't need/have all the variants

PrusaMK2Users · Apr 9, 2018 · feb1cf6 · feb1cf6
1 parent 36929a5
commit feb1cf6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,31 +13,16 @@ before_install:
 - find arduino-1.6.13/ -name platform.local.txt -delete
 script:
 - mkdir release
-- VARIANTS=$(ls Firmware/variants/ | grep -v MK1 | grep RAMBo13a)
-- for VARIANT in $VARIANTS; do
-    echo $VARIANT;
-    rm -fv Firmware/Configuration_prusa.h ;
-    cp -v Firmware/variants/${VARIANT} Firmware/Configuration_prusa.h ;
-    arduino-1.6.13/arduino --pref build.path=. --verify --board marlin:avr:rambo $PWD/Firmware/Firmware.ino ;
-    mv Firmware.ino.hex release/"${VARIANT::${#VARIANT}-2}-${TRAVIS_TAG}".hex ;
-  done;
-- for VARIANT in $VARIANTS; do
-    echo $VARIANT;
-    rm -fv Firmware/Configuration_prusa.h ;
-    cp -v Firmware/variants/${VARIANT} Firmware/Configuration_prusa.h ;
-    Scripts/haribo_config.sh ;
-    arduino-1.6.13/arduino --pref build.path=. --verify --board marlin:avr:rambo $PWD/Firmware/Firmware.ino ;
-    mv Firmware.ino.hex release/Haribo_3030_Edition-"${VARIANT::${#VARIANT}-2}-${TRAVIS_TAG}".hex ;
-  done;
-- for VARIANT in $VARIANTS; do
-    echo $VARIANT;
-    rm -fv Firmware/Configuration_prusa.h ;
-    cp -v Firmware/variants/${VARIANT} Firmware/Configuration_prusa.h ;
-    Scripts/haribo_config.sh ;
-    Scripts/reprap_lcd_config.sh ;
-    arduino-1.6.13/arduino --pref build.path=. --verify --board marlin:avr:rambo $PWD/Firmware/Firmware.ino ;
-    mv Firmware.ino.hex release/Haribo_3030_Edition-RepRapLcd-"${VARIANT::${#VARIANT}-2}-${TRAVIS_TAG}".hex ;
-  done
+- arduino-1.6.13/arduino --pref build.path=. --verify --board marlin:avr:rambo $PWD/Firmware/Firmware.ino ;
+  mv Firmware.ino.hex release/"${VARIANT::${#VARIANT}-2}-${TRAVIS_TAG}".hex ;
+
+- Scripts/haribo_config.sh ;
+  arduino-1.6.13/arduino --pref build.path=. --verify --board marlin:avr:rambo $PWD/Firmware/Firmware.ino ;
+    mv Firmware.ino.hex release/Haribo_3030_Edition-MK25-"${TRAVIS_TAG}".hex ;
+
+- Scripts/reprap_lcd_config.sh ;
+  arduino-1.6.13/arduino --pref build.path=. --verify --board marlin:avr:rambo $PWD/Firmware/Firmware.ino ;
+  mv Firmware.ino.hex release/Haribo_3030_Edition-RepRapLcd-MK25-"${TRAVIS_TAG}".hex ;
 
 deploy:
   provider: releases

diff --git a/Scripts/haribo_config.sh b/Scripts/haribo_config.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sed -i '/CUSTOM_MENDEL_NAME/c\#define CUSTOM_MENDEL_NAME "3030 Haribo Edition"' Firmware/Configuration_prusa.h
+sed -i '/Z_MAX_POS/c\#define Z_MAX_POS 225' Firmware/Configuration_prusa.h
+sed -i '/FILAMENTCHANGE_XPOS/c\#define FILAMENTCHANGE_XPOS 221' Firmware/Configuration_prusa.h
diff --git a/Scripts/reprap_lcd_config.sh b/Scripts/reprap_lcd_config.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+#
+sed -i '/BTN_EN1 72/c\#define BTN_EN1 14' Firmware/pins.h
+sed -i '/BTN_EN2 14/c\#define BTN_EN2 72' Firmware/pins.h