3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'MK3' into fix_compiler_warnings

Browse source
This commit is contained in:
Marek Bel 2018-07-12 14:10:02 +02:00
commit bf0bbb215e
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Firmware/Marlin_main.cpp
View file

@ -858,6 +858,7 @@ void factory_reset(char level, bool quiet)
eeprom_update_word((uint16_t *)EEPROM_POWER_COUNT_TOT, 0); eeprom_update_word((uint16_t *)EEPROM_POWER_COUNT_TOT, 0);
fsensor_enable(); fsensor_enable();
fautoload_set(true);
WRITE(BEEPER, HIGH); WRITE(BEEPER, HIGH);
_delay_ms(100); _delay_ms(100);

6
Firmware/fsensor.cpp
View file

@ -86,6 +86,12 @@ void fsensor_disable()
FSensorStateMenu = 0; 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) void pciSetup(byte pin)
{ {
*digitalPinToPCMSK(pin) |= bit (digitalPinToPCMSKbit(pin)); // enable pin *digitalPinToPCMSK(pin) |= bit (digitalPinToPCMSKbit(pin)); // enable pin

3
Firmware/fsensor.h
View file

@ -15,6 +15,9 @@ extern void fsensor_unblock();
extern bool fsensor_enable(); extern bool fsensor_enable();
extern void fsensor_disable(); extern void fsensor_disable();
extern bool filament_autoload_enabled;
extern void fautoload_set(bool State);
//update (perform M600 on filament runout) //update (perform M600 on filament runout)
extern void fsensor_update(); extern void fsensor_update();

4
Firmware/ultralcd.cpp
View file

@ -1,5 +1,6 @@
#include "temperature.h" #include "temperature.h"
#include "ultralcd.h" #include "ultralcd.h"
#include "fsensor.h"
#ifdef ULTRA_LCD #ifdef ULTRA_LCD
#include "MenuStack.h" #include "MenuStack.h"
#include "Marlin.h" #include "Marlin.h"
@ -2042,8 +2043,7 @@ void lcd_set_fan_check() {
} }
void lcd_set_filament_autoload() { void lcd_set_filament_autoload() {
filament_autoload_enabled = !filament_autoload_enabled; fautoload_set(!filament_autoload_enabled);
eeprom_update_byte((unsigned char *)EEPROM_FSENS_AUTOLOAD_ENABLED, filament_autoload_enabled);
} }
void lcd_unLoadFilament() void lcd_unLoadFilament()