فهرست منبع

Update build.sh and travis to build EN_ONLY
Change FARM_MODE
- Active only on EINSYs in EN_ONLY
- Active on miniRAMBo in all languages

3d-gussner 1 سال پیش
والد
کامیت
66b97683bb
5فایلهای تغییر یافته به همراه28 افزوده شده و 9 حذف شده
  1. 2 0
      .travis.yml
  2. 0 3
      Firmware/Configuration.h
  3. 1 1
      Firmware/Prusa_farm.h
  4. 7 0
      Firmware/config.h
  5. 18 5
      build.sh

+ 2 - 0
.travis.yml

@@ -11,9 +11,11 @@ before_install:
 script:
   - cp Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h Firmware/Configuration_prusa.h
   - bash -x build.sh || { echo "1_75mm_MK3S-EINSy10a-E3Dv6full variant failed" && false; }
+  - bash -x build.sh EN_ONLY || { echo "1_75mm_MK3S-EINSy10a-E3Dv6full EN_ONLY failed" && false; }
   - rm Firmware/Configuration_prusa.h
   - cp Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h Firmware/Configuration_prusa.h
   - bash -x build.sh || { echo "1_75mm_MK3-EINSy10a-E3Dv6full variant failed" && false; }
+  - bash -x build.sh EN_ONLY || { echo "1_75mm_MK3-EINSy10a-E3Dv6full EN_ONLY failed" && false; }
   - rm Firmware/Configuration_prusa.h
   - cp Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h Firmware/Configuration_prusa.h
   - bash -x build.sh || { echo "1_75mm_MK25S-RAMBo13a-E3Dv6full variant failed" && false; }

+ 0 - 3
Firmware/Configuration.h

@@ -567,7 +567,4 @@ enum CalibrationStatus
 #include "Configuration_adv.h"
 #include "thermistortables.h"
 
-// #define PRUSA_FARM
-
-
 #endif //__CONFIGURATION_H

+ 1 - 1
Firmware/Prusa_farm.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <inttypes.h>
-#include "Configuration.h"
+#include "config.h"
 
 #define FARM_PREHEAT_HOTEND_TEMP 250
 #define FARM_PREHEAT_HPB_TEMP 80

+ 7 - 0
Firmware/config.h

@@ -108,4 +108,11 @@
 #define EMERGENCY_HANDLERS
 #endif
 
+//FARM_MODE
+#if ( LANG_MODE == 0 ) && defined(XFLASH) //Save resources on EINSY and disable FARM_MODE on multi-language version
+#define PRUSA_FARM
+#endif //PRUSA_FARM only in english on EINSYs
+#ifndef XFLASH //enable FARM_MODE on miniRAMBo boards
+#define PRUSA_FARM
+#endif
 #endif //_CONFIG_H

+ 18 - 5
build.sh

@@ -1,21 +1,22 @@
 #!/bin/bash 
 BUILD_ENV="1.0.8"
 SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
+LANGUAGES=$1
 
 if [ ! -d "build-env" ]; then
     mkdir build-env || exit 1
 fi
 cd build-env || exit 2
 
-if [ ! -d "../../PF-build-env-$BUILD_ENV" ]; then
+if [ ! -d "../../PF-build-env-$BUILD_ENV-build" ]; then
     if [ ! -f "PF-build-env-Linux64-$BUILD_ENV.zip" ]; then
         #wget https://github.com/3d-gussner/PF-build-env-1/releases/download/$BUILD_ENV-Linux64/PF-build-env-Linux64-$BUILD_ENV.zip || exit 3
         wget https://github.com/prusa3d/PF-build-env/releases/download/$BUILD_ENV-Linux64/PF-build-env-Linux64-$BUILD_ENV.zip || exit 3
     fi
-    unzip -q PF-build-env-Linux64-$BUILD_ENV.zip -d ../../PF-build-env-$BUILD_ENV || exit 4
+    unzip -q PF-build-env-Linux64-$BUILD_ENV.zip -d ../../PF-build-env-$BUILD_ENV-build || exit 4
 fi
 
-cd ../../PF-build-env-$BUILD_ENV || exit 5
+cd ../../PF-build-env-$BUILD_ENV-build || exit 5
 BUILD_ENV_PATH="$( pwd -P )"
 
 cd ..
@@ -31,9 +32,21 @@ if [ ! -f "$SCRIPT_PATH/Firmware/Configuration_prusa.h" ]; then
     cp $SCRIPT_PATH/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 8
 fi
 
+if [[ ! -z $LANGUAGES && $LANGUAGES == "EN_ONLY" ]]; then
+    echo "English only language firmware will be built"
+    sed -i -- "s/^#define LANG_MODE *1/#define LANG_MODE              0/g" $SCRIPT_PATH/Firmware/config.h
+else
+    sed -i -- "s/^#define LANG_MODE *0/#define LANG_MODE              1/g" $SCRIPT_PATH/Firmware/config.h
+fi
+
 $BUILD_ENV_PATH/arduino $SCRIPT_PATH/Firmware/Firmware.ino --verify --board PrusaResearch:avr:prusa_einsy_rambo --pref build.path=$BUILD_PATH --pref compiler.warning_level=all || exit 9
 
 export ARDUINO=$BUILD_ENV_PATH
 
-cd $SCRIPT_PATH/lang
-./fw-build.sh || exit 10
+if [ -z $LANGUAGES ]; then
+    cd $SCRIPT_PATH/lang
+    ./fw-build.sh || exit 10
+fi
+
+#Reset lang_mode
+sed -i -- "s/^#define LANG_MODE *0/#define LANG_MODE              1/g" $SCRIPT_PATH/Firmware/config.h