Merge branch 'MK3' into fix_compiler_warnings
This commit is contained in:
commit
bf0bbb215e
4 changed files with 12 additions and 2 deletions
|
@ -858,6 +858,7 @@ void factory_reset(char level, bool quiet)
|
|||
eeprom_update_word((uint16_t *)EEPROM_POWER_COUNT_TOT, 0);
|
||||
|
||||
fsensor_enable();
|
||||
fautoload_set(true);
|
||||
|
||||
WRITE(BEEPER, HIGH);
|
||||
_delay_ms(100);
|
||||
|
|
|
@ -86,6 +86,12 @@ void fsensor_disable()
|
|||
FSensorStateMenu = 0;
|
||||
}
|
||||
|
||||
void fautoload_set(bool State)
|
||||
{
|
||||
filament_autoload_enabled = State;
|
||||
eeprom_update_byte((unsigned char *)EEPROM_FSENS_AUTOLOAD_ENABLED, filament_autoload_enabled);
|
||||
}
|
||||
|
||||
void pciSetup(byte pin)
|
||||
{
|
||||
*digitalPinToPCMSK(pin) |= bit (digitalPinToPCMSKbit(pin)); // enable pin
|
||||
|
|
|
@ -15,6 +15,9 @@ extern void fsensor_unblock();
|
|||
extern bool fsensor_enable();
|
||||
extern void fsensor_disable();
|
||||
|
||||
extern bool filament_autoload_enabled;
|
||||
extern void fautoload_set(bool State);
|
||||
|
||||
//update (perform M600 on filament runout)
|
||||
extern void fsensor_update();
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#include "temperature.h"
|
||||
#include "ultralcd.h"
|
||||
#include "fsensor.h"
|
||||
#ifdef ULTRA_LCD
|
||||
#include "MenuStack.h"
|
||||
#include "Marlin.h"
|
||||
|
@ -2042,8 +2043,7 @@ void lcd_set_fan_check() {
|
|||
}
|
||||
|
||||
void lcd_set_filament_autoload() {
|
||||
filament_autoload_enabled = !filament_autoload_enabled;
|
||||
eeprom_update_byte((unsigned char *)EEPROM_FSENS_AUTOLOAD_ENABLED, filament_autoload_enabled);
|
||||
fautoload_set(!filament_autoload_enabled);
|
||||
}
|
||||
|
||||
void lcd_unLoadFilament()
|
||||
|
|
Loading…
Reference in a new issue