From 8f09d2e7904f8f743be149b6b213575e7f36ee29 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 22 Nov 2019 16:47:31 -0600 Subject: [PATCH] Add STM32F103RE_bigtree to Auto Build --- Marlin/src/core/boards.h | 2 +- Marlin/src/pins/pins.h | 2 +- buildroot/share/atom/auto_build.py | 21 +++++++++++---------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index 0ab5a28940..3ecdea7717 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -272,7 +272,7 @@ #define BOARD_BIGTREE_SKR_MINI_V1_1 4010 // BigTreeTech SKR Mini v1.1 (STM32F103RC) #define BOARD_BTT_SKR_MINI_E3_V1_0 4011 // BigTreeTech SKR Mini E3 (STM32F103RC) #define BOARD_BTT_SKR_MINI_E3_V1_2 4012 // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC) -#define BOARD_BIGTREE_SKR_E3_DIP 4013 // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC) +#define BOARD_BIGTREE_SKR_E3_DIP 4013 // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE) #define BOARD_JGAURORA_A5S_A1 4014 // JGAurora A5S A1 (STM32F103ZET6) #define BOARD_FYSETC_AIO_II 4015 // FYSETC AIO_II #define BOARD_FYSETC_CHEETAH 4016 // FYSETC Cheetah diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 2532e2f383..d234958891 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -476,7 +476,7 @@ #elif MB(BTT_SKR_MINI_E3_V1_2) #include "stm32/pins_BTT_SKR_MINI_E3_V1_2.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB #elif MB(BIGTREE_SKR_E3_DIP) - #include "stm32/pins_BTT_SKR_E3_DIP.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB env:STM32F103RE_bigtree + #include "stm32/pins_BTT_SKR_E3_DIP.h" // STM32F1 env:STM32F103RE_bigtree env:STM32F103RE_bigtree_NOUSB env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB #elif MB(JGAURORA_A5S_A1) #include "stm32/pins_JGAURORA_A5S_A1.h" // STM32F1 env:jgaurora_a5s_a1 #elif MB(FYSETC_AIO_II) diff --git a/buildroot/share/atom/auto_build.py b/buildroot/share/atom/auto_build.py index 001317103f..9e24c979c9 100644 --- a/buildroot/share/atom/auto_build.py +++ b/buildroot/share/atom/auto_build.py @@ -24,7 +24,7 @@ ####################################### # -# Revision: 2.0.1 +# Revision: 2.1.0 # # Description: script to automate PlatformIO builds # CLI: python auto_build.py build_option @@ -599,12 +599,16 @@ def get_env(board_name, ver_Marlin): target_env = 'DUE_USB' else: target_env = 'DUE' - elif env_A == 'STM32F103RC_bigtree': - get_answer(board_name, 'RCT6 Flash Size?', '512K', '256K') - if 1 == get_answer_val: - target_env = 'STM32F103RC_bigtree_512K' - else: - target_env = 'STM32F103RC_bigtree' + elif env_A == 'STM32F103RC_bigtree' or env_A == 'STM32F103RE_bigtree': + if env_A == 'STM32F103RE_bigtree': + get_answer(board_name, 'MCU Type?', 'STM32F103RC', 'STM32F103RE') + if 1 == get_answer_val: + env_A = 'STM32F103RC_bigtree' + target_env = env_A + if env_A == 'STM32F103RC_bigtree': + get_answer(board_name, 'RCT6 Flash Size?', '512K', '256K') + if 1 == get_answer_val: + target_env += '_512K' get_answer(board_name, 'USB Support?', 'No USB', 'USB') if 1 == get_answer_val: target_env += '_NOUSB' @@ -1203,7 +1207,6 @@ class output_window(Text): pass def cut(self, event): - try: selection = self.get(*self.tag_ranges('sel')) self.clipboard_clear() @@ -1224,7 +1227,6 @@ class output_window(Text): self.popup.grab_release() def _cut(self): - try: selection = self.get(*self.tag_ranges('sel')) self.clipboard_clear() @@ -1249,7 +1251,6 @@ class output_window(Text): self._copy() def _paste(self): - self.insert('insert', self.selection_get(selection='CLIPBOARD')) def _select_all(self):