From 6c6f6abfc0d6d057d4caee09b9161c94ba8f893b Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 29 Sep 2022 16:39:02 +0200 Subject: [PATCH] Rename EN_ONLY to EN_FARM remove DEBUG/DEVEL/ALPHA/BETA lcd warning Fix cherry-pick issues --- .travis.yml | 4 ++-- Firmware/Marlin.h | 2 ++ Firmware/Marlin_main.cpp | 11 +++++++---- Firmware/messages.cpp | 2 ++ Firmware/messages.h | 3 +++ Firmware/temperature.cpp | 8 ++++---- PF-build.sh | 32 ++++++++++++++++---------------- build.sh | 2 +- 8 files changed, 37 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0d638b4a..ba5f91e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +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; } + - bash -x build.sh EN_FARM || { echo "1_75mm_MK3S-EINSy10a-E3Dv6full EN_FARM 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; } + - bash -x build.sh EN_FARM || { echo "1_75mm_MK3-EINSy10a-E3Dv6full EN_FARM 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; } diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 12b48782..9809799f 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -385,7 +385,9 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_ void bed_check(float x_dimension, float y_dimension, int x_points_num, int y_points_num, float shift_x, float shift_y); #endif //HEATBED_ANALYSIS float temp_comp_interpolation(float temperature); +#if 0 void show_fw_version_warnings(); +#endif uint8_t check_printer_version(); #ifdef PINDA_THERMISTOR diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 628cb24c..7824706e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -839,7 +839,7 @@ void factory_reset() } KEEPALIVE_STATE(IN_HANDLER); } - +#if 0 void show_fw_version_warnings() { if (FW_DEV_VERSION == FW_VERSION_GOLD || FW_DEV_VERSION == FW_VERSION_RC) return; switch (FW_DEV_VERSION) { @@ -863,6 +863,7 @@ void show_fw_version_warnings() { } lcd_update_enable(true); } +#endif //! @brief try to check if firmware is on right type of printer static void check_if_fw_is_on_right_printer(){ @@ -1506,7 +1507,9 @@ void setup() if (!farm_mode) { check_if_fw_is_on_right_printer(); +#if 0 show_fw_version_warnings(); +#endif } switch (hw_changed) { @@ -1612,11 +1615,11 @@ void setup() manage_heater(); // Update temperatures #ifdef DEBUG_UVLO_AUTOMATIC_RECOVER printf_P(_N("Power panic detected!\nCurrent bed temp:%d\nSaved bed temp:%d\n"), (int)degBed(), eeprom_read_byte((uint8_t*)EEPROM_UVLO_TARGET_BED)); -#endif +#endif if ( degBed() > ( (float)eeprom_read_byte((uint8_t*)EEPROM_UVLO_TARGET_BED) - AUTOMATIC_UVLO_BED_TEMP_OFFSET) ){ #ifdef DEBUG_UVLO_AUTOMATIC_RECOVER puts_P(_N("Automatic recovery!")); - #endif + #endif recover_print(1); } else{ @@ -4542,7 +4545,7 @@ eeprom_update_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM,0xFFFF); retract(false,retracted_swap[active_extruder]); #else retract(false); - #endif + #endif break; #endif //FWRETRACT diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index f243a1d3..5573f00c 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -167,7 +167,9 @@ extern const char MSG_THERMAL_ANOMALY[] PROGMEM_I1 = ISTR("THERMAL ANOMALY");/// #endif //not internationalized messages +#if 0 const char MSG_FW_VERSION_BETA[] PROGMEM_N1 = "You are using a BETA firmware version! It is in a development state! Use this version with CAUTION as it may DAMAGE the printer!"; ////MSG_FW_VERSION_BETA c=20 r=8 +#endif const char MSG_AUTO_DEPLETE[] PROGMEM_N1 = "SpoolJoin"; ////MSG_AUTO_DEPLETE c=13 const char MSG_FIRMWARE[] PROGMEM_N1 = "Firmware"; ////MSG_FIRMWARE c=8 const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_N1 = "FlashAir"; ////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY c=8 diff --git a/Firmware/messages.h b/Firmware/messages.h index 2967ab40..b02dec61 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -127,6 +127,7 @@ extern const char MSG_V2_CALIBRATION[]; extern const char MSG_OFF[]; extern const char MSG_ON[]; extern const char MSG_NA[]; +extern const char MSG_CUTTER[]; extern const char MSG_NONE[]; extern const char MSG_WARN[]; extern const char MSG_STRICT[]; @@ -170,7 +171,9 @@ extern const char MSG_THERMAL_ANOMALY[]; #endif //not internationalized messages +#if 0 extern const char MSG_FW_VERSION_BETA[]; +#endif extern const char MSG_AUTO_DEPLETE[]; extern const char MSG_FIRMWARE[]; extern const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[]; diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index ab4d5d3e..5c52289e 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1212,27 +1212,27 @@ FORCE_INLINE static void soft_pwm_core() static unsigned char slow_pwm_count = 0; static unsigned char state_heater_0 = 0; static unsigned char state_timer_heater_0 = 0; -#endif +#endif #if (EXTRUDERS > 1) || defined(HEATERS_PARALLEL) static unsigned char soft_pwm_1; #ifdef SLOW_PWM_HEATERS static unsigned char state_heater_1 = 0; static unsigned char state_timer_heater_1 = 0; -#endif +#endif #endif #if EXTRUDERS > 2 static unsigned char soft_pwm_2; #ifdef SLOW_PWM_HEATERS static unsigned char state_heater_2 = 0; static unsigned char state_timer_heater_2 = 0; -#endif +#endif #endif #if HEATER_BED_PIN > -1 // @@DR static unsigned char soft_pwm_b; #ifdef SLOW_PWM_HEATERS static unsigned char state_heater_b = 0; static unsigned char state_timer_heater_b = 0; -#endif +#endif #endif #if defined(FILWIDTH_PIN) &&(FILWIDTH_PIN > -1) diff --git a/PF-build.sh b/PF-build.sh index 4396f7f2..5627b27b 100755 --- a/PF-build.sh +++ b/PF-build.sh @@ -85,7 +85,7 @@ # 15 Feb 2019, 3d-gussner, troubleshooting and minor fixes # 16 Feb 2019, 3d-gussner, Script can be run using arguments # $1 = variant, example "1_75mm_MK3-EINSy10a-E3Dv6full.h" at this moment it is not possible to use ALL -# $2 = multi language OR English only [ALL/EN_ONLY] +# $2 = multi language OR English only [ALL/EN_FARM] # $3 = development status [GOLD/RC/BETA/ALPHA/DEVEL/DEBUG] # If one argument is wrong a list of valid one will be shown # 13 Mar 2019, 3d-gussner, MKbel updated the Linux build environment to version 1.0.2 with an Fix maximum firmware flash size. @@ -124,7 +124,7 @@ # After compiling All multi-language variants it makes it easier to find missing or unused translations. # 12 May 2020, DRracer , Cleanup double MK2/s MK25/s `not_tran` and `not_used` files # 13 May 2020, leptun , If cleanup files do not exist don't try to. -# 01 Oct 2020, 3d-gussner, Bug fix if using argument EN_ONLY. Thank to @leptun for pointing out. +# 01 Oct 2020, 3d-gussner, Bug fix if using argument EN_FARM. Thank to @leptun for pointing out. # Change Build number to script commits 'git rev-list --count HEAD PF-build.sh' # 02 Oct 2020, 3d-gussner, Add UNKNOWN as argument option # 05 Oct 2020, 3d-gussner, Disable pause and warnings using command line with all needed arguments @@ -268,7 +268,7 @@ echo " -d : '$(tput setaf 2)GOLD$(tput sgr0)', '$(tput setaf 2)RC$(tput sgr0)', echo " -g : '$(tput setaf 2)0$(tput sgr0)' no '$(tput setaf 2)1$(tput sgr0)' lite '$(tput setaf 2)2$(tput sgr0)' fancy '$(tput setaf 2)3$(tput sgr0)' lite with Quad_HR '$(tput setaf 2)4$(tput sgr0)' fancy with Quad_HR" echo " -i : '$(tput setaf 2)1.8.5$(tput sgr0)', '$(tput setaf 2)1.8.19$(tput sgr0)'" echo " -j : '$(tput setaf 2)0$(tput sgr0)' no, '$(tput setaf 2)1$(tput sgr0)' yes" -echo " -l : '$(tput setaf 2)ALL$(tput sgr0)' for multi language or '$(tput setaf 2)EN_ONLY$(tput sgr0)' for English only" +echo " -l : '$(tput setaf 2)ALL$(tput sgr0)' for multi language or '$(tput setaf 2)EN_FARM$(tput sgr0)' for English only" echo " -m : '$(tput setaf 2)0$(tput sgr0)' no, '$(tput setaf 2)1$(tput sgr0)' yes '$(tput setaf 2)2$(tput sgr0)' with MMU2" echo " -n : '$(tput setaf 2)0$(tput sgr0)' no, '$(tput setaf 2)1$(tput sgr0)' yes" echo " -o : '$(tput setaf 2)1$(tput sgr0)' force or '$(tput setaf 2)0$(tput sgr0)' block output and delays" @@ -882,7 +882,7 @@ else fi fi -#'-l' argument defines if it is an English only version. Known values EN_ONLY / ALL +#'-l' argument defines if it is an English only version. Known values EN_FARM / ALL #Check default language mode MULTI_LANGUAGE_CHECK=$(grep --max-count=1 "^#define LANG_MODE *" $SCRIPT_PATH/Firmware/config.h|sed -e's/ */ /g'|cut -d ' ' -f3) @@ -897,7 +897,7 @@ if [ -z "$language_flag" ] ; then break ;; "English only") - LANGUAGES="EN_ONLY" + LANGUAGES="EN_FARM" break ;; *) @@ -906,11 +906,11 @@ if [ -z "$language_flag" ] ; then esac done else - if [[ "$language_flag" == "ALL" || "$language_flag" == "EN_ONLY" ]] ; then + if [[ "$language_flag" == "ALL" || "$language_flag" == "EN_FARM" ]] ; then LANGUAGES=$language_flag else echo "$(tput setaf 1)Language argument is wrong!$(tput sgr0)" - echo "Only $(tput setaf 2)'ALL'$(tput sgr0) or $(tput setaf 2)'EN_ONLY'$(tput sgr0) are allowed as language '-l' argument!" + echo "Only $(tput setaf 2)'ALL'$(tput sgr0) or $(tput setaf 2)'EN_FARM'$(tput sgr0) are allowed as language '-l' argument!" failures 5 fi fi @@ -1110,9 +1110,9 @@ prepare_hex_folders() if [ $OUTPUT == "1" ] ; then read -t 10 -p "Press Enter to continue..." fi - elif [[ -f "$SCRIPT_PATH/../$OUTPUT_FOLDER/$OUTPUT_FILENAME-EN_ONLY.hex" && "$LANGUAGES" == "EN_ONLY" ]]; then + elif [[ -f "$SCRIPT_PATH/../$OUTPUT_FOLDER/$OUTPUT_FILENAME-EN_FARM.hex" && "$LANGUAGES" == "EN_FARM" ]]; then echo "" - ls -1 $SCRIPT_PATH/../$OUTPUT_FOLDER/$OUTPUT_FILENAME-EN_ONLY.hex | xargs -n1 basename + ls -1 $SCRIPT_PATH/../$OUTPUT_FOLDER/$OUTPUT_FILENAME-EN_FARM.hex | xargs -n1 basename echo "$(tput setaf 6)This hex file to be compiled already exists! To cancel this process press CRTL+C and rename existing hex file.$(tput sgr 0)" if [ $OUTPUT == "1" ] ; then read -t 10 -p "Press Enter to continue..." @@ -1171,7 +1171,7 @@ prepare_variant_for_compiling() sed -i -- 's/#define FW_REPOSITORY "Unknown"/#define FW_REPOSITORY "Prusa3d"/g' $SCRIPT_PATH/Firmware/Configuration.h #Prepare English only or multi-language version to be build - if [ $LANGUAGES == "EN_ONLY" ]; then + if [ $LANGUAGES == "EN_FARM" ]; then echo " " 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 @@ -1379,17 +1379,17 @@ create_multi_firmware() } #### End: Create and save Multi Language Prusa Firmware -#### Start: Save EN_ONLY language Prusa Firmware +#### Start: Save EN_FARM language Prusa Firmware save_en_firmware() { #else echo "$(tput setaf 2)Copying English only firmware to PF-build-hex folder$(tput sgr 0)" - cp -f $BUILD_PATH/Firmware.ino.hex $SCRIPT_PATH/../$OUTPUT_FOLDER/$OUTPUT_FILENAME-EN_ONLY.hex || failures 12 + cp -f $BUILD_PATH/Firmware.ino.hex $SCRIPT_PATH/../$OUTPUT_FOLDER/$OUTPUT_FILENAME-EN_FARM.hex || failures 12 echo "$(tput setaf 2)Copying English only elf file to PF-build-hex folder$(tput sgr 0)" - cp -f $BUILD_PATH/Firmware.ino.elf $SCRIPT_PATH/../$OUTPUT_FOLDER/$OUTPUT_FILENAME-EN_ONLY.elf || failures 12 + cp -f $BUILD_PATH/Firmware.ino.elf $SCRIPT_PATH/../$OUTPUT_FOLDER/$OUTPUT_FILENAME-EN_FARM.elf || failures 12 #fi } -#### End: Save EN_ONLY language Prusa Firmware +#### End: Save EN_FARM language Prusa Firmware #### Start: Cleanup Firmware cleanup_firmware() @@ -1562,7 +1562,7 @@ if [[ ! -z "$mk404_flag" && "$variant_flag" != "All " ]]; then #cd ../MK404/master/build -#Decide which hex file to use EN_ONLY or Multi language +#Decide which hex file to use EN_FARM or Multi language if [ "$LANGUAGES" == "ALL" ]; then if [[ "$MK404_PRINTER" == "MK3" || "$MK404_PRINTER" == "MK3S" ]]; then MK404_firmware_file=$SCRIPT_PATH/../$OUTPUT_FOLDER/$OUTPUT_FILENAME.hex @@ -1575,7 +1575,7 @@ if [[ ! -z "$mk404_flag" && "$variant_flag" != "All " ]]; then done fi else - MK404_firmware_file=$SCRIPT_PATH/../$OUTPUT_FOLDER/$OUTPUT_FILENAME-EN_ONLY.hex + MK404_firmware_file=$SCRIPT_PATH/../$OUTPUT_FOLDER/$OUTPUT_FILENAME-EN_FARM.hex fi # Start MK404 diff --git a/build.sh b/build.sh index 3146e12b..8b09fde7 100755 --- a/build.sh +++ b/build.sh @@ -32,7 +32,7 @@ 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 +if [[ ! -z $LANGUAGES && $LANGUAGES == "EN_FARM" ]]; 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