josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merging, testing in progress.

This commit is contained in:
Rob McKenzie 2018-11-14 16:42:30 +10:00
parent ec8844d744
commit 0ff1f3c71c
3 changed files with 14223 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14216
Firmware/Firmware.ino.rambo.hex Normal file
View File

File diff suppressed because it is too large Load Diff

7
Firmware/Marlin_main.cpp Executable file → Normal file
View File

@ -2925,6 +2925,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
{ {
st_synchronize(); st_synchronize();
float lastpos[4]; float lastpos[4];
mmuFSensorLoading = false;
if (farm_mode) if (farm_mode)
{ {
@ -7438,7 +7439,11 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s
fsensor_update(); fsensor_update();
} }
} }
} } else {
if ((lcd_commands_type != LCD_COMMAND_V2_CAL) && !wizard_active && mmuFSensorLoading) {
fsensor_check_autoload();
}
}
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
#ifdef SAFETYTIMER #ifdef SAFETYTIMER

1
Firmware/mmu.h
View File

@ -4,6 +4,7 @@
extern bool mmu_enabled; extern bool mmu_enabled;
extern bool mmuFSensorLoading;
extern int8_t mmu_state; extern int8_t mmu_state;
extern uint8_t mmu_extruder; extern uint8_t mmu_extruder;