3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix Malyan M300 build, which does not have BLTOUCH, and add NeoPixel and BLTOUCH to one GTR build

Browse source
This commit is contained in:
Jason Smith 2020-10-30 19:28:03 -07:00
parent d765c452e4
commit cde553790e
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/HAL/STM32/eeprom_flash.cpp
View file

@ -218,11 +218,11 @@ bool PersistentStore::access_finish() {
// Interrupts during this time can have unpredictable results, such as killing Servo // Interrupts during this time can have unpredictable results, such as killing Servo
// output. Servo output still glitches with interrupts disabled, but recovers after the // output. Servo output still glitches with interrupts disabled, but recovers after the
// erase. // erase.
PAUSE_SERVO_OUTPUT(); TERN_(HAS_PAUSE_SERVO_OUTPUT, PAUSE_SERVO_OUTPUT());
DISABLE_ISRS(); DISABLE_ISRS();
eeprom_buffer_flush(); eeprom_buffer_flush();
ENABLE_ISRS(); ENABLE_ISRS();
RESUME_SERVO_OUTPUT(); TERN_(HAS_PAUSE_SERVO_OUTPUT, RESUME_SERVO_OUTPUT());
eeprom_data_written = false; eeprom_data_written = false;
#endif #endif

2
Marlin/src/inc/Conditionals_post.h
View file

@ -1999,7 +1999,7 @@
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
#define HAS_SERVOS 1 #define HAS_SERVOS 1
#endif #endif
#if !HAS_SERVOS || !defined(HAS_PAUSE_SERVO_OUTPUT) #ifndef HAS_PAUSE_SERVO_OUTPUT
#define HAS_PAUSE_SERVO_OUTPUT 0 #define HAS_PAUSE_SERVO_OUTPUT 0
#endif #endif

3
buildroot/tests/BIGTREE_GTR_V1_0-tests
View file

@ -23,7 +23,8 @@ opt_set E1_AUTO_FAN_PIN PC11
opt_set E2_AUTO_FAN_PIN PC12 opt_set E2_AUTO_FAN_PIN PC12
opt_set X_DRIVER_TYPE TMC2208 opt_set X_DRIVER_TYPE TMC2208
opt_set Y_DRIVER_TYPE TMC2130 opt_set Y_DRIVER_TYPE TMC2130
opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER opt_set NEOPIXEL_PIN PF13
opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH NEOPIXEL_LED Z_SAFE_HOMING
exec_test $1 $2 "BigTreeTech GTR 8 Extruders with Auto-Fan and Mixed TMC Drivers" exec_test $1 $2 "BigTreeTech GTR 8 Extruders with Auto-Fan and Mixed TMC Drivers"
restore_configs restore_configs