Update branch from Devel

This commit is contained in:
InsanityAutomation
2020-06-15 09:33:18 -04:00
parent f1649d7846
commit 366ad20dfe
1321 changed files with 34363 additions and 22873 deletions
+5 -5
View File
@@ -2,7 +2,7 @@
#######################################
#
# Marlin 3D Printer Firmware
# Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
# Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
#
# Based on Sprinter and grbl.
# Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -600,13 +600,13 @@ def get_env(board_name, ver_Marlin):
target_env = 'DUE_USB'
else:
target_env = 'DUE'
elif env_A == 'STM32F103RC_bigtree' or env_A == 'STM32F103RE_bigtree':
if env_A == 'STM32F103RE_bigtree':
elif env_A == 'STM32F103RC_btt' or env_A == 'STM32F103RE_btt':
if env_A == 'STM32F103RE_btt':
get_answer(board_name, 'MCU Type?', 'STM32F103RC', 'STM32F103RE')
if 1 == get_answer_val:
env_A = 'STM32F103RC_bigtree'
env_A = 'STM32F103RC_btt'
target_env = env_A
if env_A == 'STM32F103RC_bigtree':
if env_A == 'STM32F103RC_btt':
get_answer(board_name, 'RCT6 Flash Size?', '512K', '256K')
if 1 == get_answer_val:
target_env += '_512K'