diff --git a/Marlin/src/HAL/HAL_STM32/HAL.cpp b/Marlin/src/HAL/HAL_STM32/HAL.cpp index 63db14f723d6..4d3693164d14 100644 --- a/Marlin/src/HAL/HAL_STM32/HAL.cpp +++ b/Marlin/src/HAL/HAL_STM32/HAL.cpp @@ -112,7 +112,7 @@ uint8_t HAL_get_reset_source() { RESET != __HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) ? RST_EXTERNAL : #endif #ifdef RCC_FLAG_PORRST - RESET != __HAL_RCC_GET_FLAG(RCC_FLAG_PORRST)) ? RST_POWER_ON : + RESET != __HAL_RCC_GET_FLAG(RCC_FLAG_PORRST) ? RST_POWER_ON : #endif 0 ; diff --git a/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h index e103951397d5..c61d50611705 100644 --- a/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h +++ b/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h @@ -29,7 +29,9 @@ #define BOARD_INFO_NAME "BIGTREE Btt002 1.0" -#define SRAM_EEPROM_EMULATION +// Use one of these or SDCard-based Emulation will be used +//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation +#define FLASH_EEPROM_EMULATION // Use Flash-based EEPROM emulation // Ignore temp readings during development. //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000 diff --git a/buildroot/bin/restore_configs b/buildroot/bin/restore_configs index a1ac70aa96a2..5e24d8d7ccc0 100755 --- a/buildroot/bin/restore_configs +++ b/buildroot/bin/restore_configs @@ -1,11 +1,17 @@ #!/usr/bin/env bash -cp config/default/Configuration*.h Marlin +RESTORE="https://raw.githubusercontent.com/MarlinFirmware/Configurations/master/config/default" -PINS="Marlin/src/pins" +cd Marlin + +rm -f Conf*.h _*screen.h + +PINS="src/pins" RAMPS="$PINS/ramps/pins_RAMPS.h" BKUP="$PINS/ramps/pins_RAMPS.backup.h" [ -f $BKUP ] && { cp "$BKUP" "$RAMPS" ; rm -f $BKUP ; } -rm -f Marlin/_Bootscreen.h -rm -f Marlin/_Statusscreen.h +wget -q "$RESTORE/Configuration.h" -O Configuration.h +wget -q "$RESTORE/Configuration_adv.h" -O Configuration_adv.h + +cd - >/dev/null diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs index a0a0dcd3dd8a..410091cbd579 100755 --- a/buildroot/bin/use_example_configs +++ b/buildroot/bin/use_example_configs @@ -2,18 +2,14 @@ restore_configs -if [ -f "config/examples/$@/Configuration.h" ]; then - cp "config/examples/$@/Configuration.h" Marlin/ -fi +EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/master/config/examples" -if [ -f "config/examples/$@/Configuration_adv.h" ]; then - cp "config/examples/$@/Configuration_adv.h" Marlin/ -fi +cd Marlin -if [ -f "config/examples/$@/_Bootscreen.h" ]; then - cp "config/examples/$@/_Bootscreen.h" Marlin/ -fi +wget -q "$EXAMPLES/$@/Configuration.h" -O wgot && mv wgot Configuration.h +wget -q "$EXAMPLES/$@/Configuration_adv.h" -O wgot && mv wgot Configuration_adv.h +wget -q "$EXAMPLES/$@/_Bootscreen.h" -O wgot && mv wgot _Bootscreen.h +wget -q "$EXAMPLES/$@/_Statusscreen.h" -O wgot && mv wgot _Statusscreen.h +rm -f wgot -if [ -f "config/examples/$@/_Statusscreen.h" ]; then - cp "config/examples/$@/_Statusscreen.h" Marlin/ -fi +cd - >/dev/null