From efc3b2fc1ee752b6a86f14ff3d09d62dbd8d3d56 Mon Sep 17 00:00:00 2001 From: knutwurst Date: Sun, 1 Nov 2020 00:24:28 +0000 Subject: [PATCH 1/7] [cron] Bump distribution date (2020-11-01) --- Marlin/src/inc/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 9247007b..9311ba30 100755 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -44,7 +44,7 @@ #define CUSTOM_BUILD_VERSION "1.1.7-BETA2" #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2020-10-31" + #define STRING_DISTRIBUTION_DATE "2020-11-01" #endif /** -- 2.25.1 From ef7ff09648a26a41532ef3b27323f97f56ff25c1 Mon Sep 17 00:00:00 2001 From: knutwurst Date: Mon, 2 Nov 2020 00:23:02 +0000 Subject: [PATCH 2/7] [cron] Bump distribution date (2020-11-02) --- Marlin/src/inc/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 9311ba30..c3ea3bf5 100755 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -44,7 +44,7 @@ #define CUSTOM_BUILD_VERSION "1.1.7-BETA2" #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2020-11-01" + #define STRING_DISTRIBUTION_DATE "2020-11-02" #endif /** -- 2.25.1 From fed42db5bd18d29dce18a28fa0b5a4d989f67e62 Mon Sep 17 00:00:00 2001 From: Knutwurst <36196269+knutwurst@users.noreply.github.com> Date: Mon, 2 Nov 2020 21:19:58 +0100 Subject: [PATCH 3/7] Code Cleanup --- Marlin/Configuration.h | 55 +++++++------------------ Marlin/src/lcd/anycubic_touchscreen.cpp | 15 +++---- 2 files changed, 24 insertions(+), 46 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 72597b61..a613572a 100755 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -849,45 +849,22 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ -/* -#if ENABLED(KNUTWURST_TMC) - #define X_DRIVER_TYPE TMC2208_STANDALONE - #define Y_DRIVER_TYPE TMC2208_STANDALONE - #define Z_DRIVER_TYPE TMC2208_STANDALONE - //#define X2_DRIVER_TYPE TMC2208_STANDALONE - //#define Y2_DRIVER_TYPE TMC2208_STANDALONE - //#define Z2_DRIVER_TYPE TMC2208_STANDALONE - //#define Z3_DRIVER_TYPE TMC2208_STANDALONE - //#define Z4_DRIVER_TYPE TMC2208_STANDALONE - #define E0_DRIVER_TYPE TMC2208_STANDALONE - #define E1_DRIVER_TYPE TMC2208_STANDALONE - //#define E2_DRIVER_TYPE TMC2208_STANDALONE - //#define E3_DRIVER_TYPE TMC2208_STANDALONE - //#define E4_DRIVER_TYPE TMC2208_STANDALONE - //#define E5_DRIVER_TYPE TMC2208_STANDALONE - //#define E6_DRIVER_TYPE TMC2208_STANDALONE - //#define E7_DRIVER_TYPE TMC2208_STANDALONE -#endif - -#if DISABLED(KNUTWURST_TMC) -*/ - #define X_DRIVER_TYPE A4988 - #define Y_DRIVER_TYPE A4988 - #define Z_DRIVER_TYPE A4988 - //#define X2_DRIVER_TYPE A4988 - //#define Y2_DRIVER_TYPE A4988 - //#define Z2_DRIVER_TYPE A4988 - //#define Z3_DRIVER_TYPE A4988 - //#define Z4_DRIVER_TYPE A4988 - #define E0_DRIVER_TYPE A4988 - #define E1_DRIVER_TYPE A4988 - //#define E2_DRIVER_TYPE A4988 - //#define E3_DRIVER_TYPE A4988 - //#define E4_DRIVER_TYPE A4988 - //#define E5_DRIVER_TYPE A4988 - //#define E6_DRIVER_TYPE A4988 - //#define E7_DRIVER_TYPE A4988 -//#endif +#define X_DRIVER_TYPE A4988 +#define Y_DRIVER_TYPE A4988 +#define Z_DRIVER_TYPE A4988 +//#define X2_DRIVER_TYPE A4988 +//#define Y2_DRIVER_TYPE A4988 +//#define Z2_DRIVER_TYPE A4988 +//#define Z3_DRIVER_TYPE A4988 +//#define Z4_DRIVER_TYPE A4988 +#define E0_DRIVER_TYPE A4988 +#define E1_DRIVER_TYPE A4988 +//#define E2_DRIVER_TYPE A4988 +//#define E3_DRIVER_TYPE A4988 +//#define E4_DRIVER_TYPE A4988 +//#define E5_DRIVER_TYPE A4988 +//#define E6_DRIVER_TYPE A4988 +//#define E7_DRIVER_TYPE A4988 // Enable this feature if all enabled endstop pins are interrupt-capable. // This will remove the need to poll the interrupt pins, saving many CPU cycles. diff --git a/Marlin/src/lcd/anycubic_touchscreen.cpp b/Marlin/src/lcd/anycubic_touchscreen.cpp index 8de5885d..a64ef9f0 100755 --- a/Marlin/src/lcd/anycubic_touchscreen.cpp +++ b/Marlin/src/lcd/anycubic_touchscreen.cpp @@ -24,21 +24,22 @@ #include #include -#include "../MarlinCore.h" -#include "../core/language.h" -#include "../core/macros.h" -#include "../core/serial.h" #include "../gcode/queue.h" #include "../feature/e_parser.h" #include "../feature/pause.h" -#include "../inc/MarlinConfig.h" #include "../libs/buzzer.h" #include "../module/planner.h" #include "../module/printcounter.h" -#include "../module/stepper.h" #include "../module/temperature.h" #include "../sd/cardreader.h" -#include "../module/configuration_store.h" +//#include "../MarlinCore.h" +//#include "../core/language.h" +//#include "../core/macros.h" +//#include "../core/serial.h" +//#include "../module/stepper.h" +//#include "../inc/MarlinConfig.h" +//#include "../module/configuration_store.h" + #ifdef ANYCUBIC_TOUCHSCREEN #include "anycubic_touchscreen.h" -- 2.25.1 From 1362fe027a7636c83943d3aed216a4c3005cb5e9 Mon Sep 17 00:00:00 2001 From: knutwurst Date: Tue, 3 Nov 2020 00:23:18 +0000 Subject: [PATCH 4/7] [cron] Bump distribution date (2020-11-03) --- Marlin/src/inc/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index c3ea3bf5..ee22c222 100755 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -44,7 +44,7 @@ #define CUSTOM_BUILD_VERSION "1.1.7-BETA2" #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2020-11-02" + #define STRING_DISTRIBUTION_DATE "2020-11-03" #endif /** -- 2.25.1 From 30ee66db9f2263b14bbe4c7d40e9fcbd76d8e338 Mon Sep 17 00:00:00 2001 From: Knutwurst <36196269+knutwurst@users.noreply.github.com> Date: Tue, 3 Nov 2020 15:38:17 +0100 Subject: [PATCH 5/7] Bump Version to 1.1.7 Beta 3 --- Marlin/src/inc/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index ee22c222..6dcc549f 100755 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ - #define CUSTOM_BUILD_VERSION "1.1.7-BETA2" + #define CUSTOM_BUILD_VERSION "1.1.7-BETA3" #ifndef STRING_DISTRIBUTION_DATE #define STRING_DISTRIBUTION_DATE "2020-11-03" -- 2.25.1 From fe25adc816982880943f4923034b5a1bdbfcbc7e Mon Sep 17 00:00:00 2001 From: knutwurst Date: Wed, 4 Nov 2020 00:23:36 +0000 Subject: [PATCH 6/7] [cron] Bump distribution date (2020-11-04) --- Marlin/src/inc/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 6dcc549f..3b878c50 100755 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -44,7 +44,7 @@ #define CUSTOM_BUILD_VERSION "1.1.7-BETA3" #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2020-11-03" + #define STRING_DISTRIBUTION_DATE "2020-11-04" #endif /** -- 2.25.1 From da2b3d1a6a1829cb224c853874fc1f37d4b2a3a2 Mon Sep 17 00:00:00 2001 From: mbo Date: Wed, 4 Nov 2020 09:36:21 +0100 Subject: [PATCH 7/7] switched to dynamic paths, pushd popd instead of cd, make dir recursively --- deploy_firmware_files.sh | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/deploy_firmware_files.sh b/deploy_firmware_files.sh index c2274304..20a237af 100755 --- a/deploy_firmware_files.sh +++ b/deploy_firmware_files.sh @@ -1,23 +1,27 @@ #!/bin/bash -VERSION_FILE="/Users/OKoester/Documents/Arduino/Marlin-2-0-x-Anycubic-i3-MEGA-S-Master/Marlin/src/inc/Version.h" -FIRMWARE_FOLDER="/Users/OKoester/Documents/Arduino/Marlin-2-0-x-Anycubic-i3-MEGA-S-Master/.pio/build/" -OUTPUT_FOLDER="/Users/OKoester/Desktop/i3_FIRMWARE" +BASE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +CURRENT_USER="$(whoami)" + +VERSION_FILE="$BASE_PATH/Marlin/src/inc/Version.h" +FIRMWARE_FOLDER="$BASE_PATH/.pio/build/" +OUTPUT_FOLDER="/Users/$CURRENT_USER/Desktop/i3_FIRMWARE" CUSTOM_BUILD_VERSION=$(egrep -o "([0-9]{1,}\.)+[a-zA-Z0-9_.-]{1,}" $VERSION_FILE -m2 | tail -n1) if [ -d "$$OUTPUT_FOLDER/v$CUSTOM_BUILD_VERSION" ]; then echo "$$OUTPUT_FOLDER/$CUSTOM_BUILD_VERSION already exists." else - mkdir $OUTPUT_FOLDER/$CUSTOM_BUILD_VERSION + mkdir -p $OUTPUT_FOLDER/$CUSTOM_BUILD_VERSION fi echo "Knutwurst's Mega Firmware Version: $CUSTOM_BUILD_VERSION" -cd $FIRMWARE_FOLDER -for dir in $FIRMWARE_FOLDER/*/ -do - dir=${dir%*/} - echo ${dir##*/} - cp ${dir##*/}/firmware.hex /$OUTPUT_FOLDER/$CUSTOM_BUILD_VERSION/${dir##*/}_v$CUSTOM_BUILD_VERSION.hex -done \ No newline at end of file +pushd $FIRMWARE_FOLDER + for dir in $FIRMWARE_FOLDER/*/ + do + dir=${dir%*/} + echo ${dir##*/} + cp ${dir##*/}/firmware.hex /$OUTPUT_FOLDER/$CUSTOM_BUILD_VERSION/${dir##*/}_v$CUSTOM_BUILD_VERSION.hex + done +popd -- 2.25.1