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

farmMode updates

Browse source
This commit is contained in:
MRprusa3d 2019-03-19 19:48:40 +01:00
parent 1f131f66e0
commit 7d98177716
11 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Firmware/Marlin.h
View file

@ -213,6 +213,9 @@ void manage_inactivity(bool ignore_stepper_queue=false);
#endif #endif
#define FARM_FILAMENT_COLOR_NONE 99;
enum AxisEnum {X_AXIS=0, Y_AXIS=1, Z_AXIS=2, E_AXIS=3, X_HEAD=4, Y_HEAD=5}; enum AxisEnum {X_AXIS=0, Y_AXIS=1, Z_AXIS=2, E_AXIS=3, X_HEAD=4, Y_HEAD=5};
#define X_AXIS_MASK 1 #define X_AXIS_MASK 1
#define Y_AXIS_MASK 2 #define Y_AXIS_MASK 2

5
Firmware/Marlin_main.cpp
View file

@ -1039,6 +1039,9 @@ void setup()
//disabled filament autoload (PFW360) //disabled filament autoload (PFW360)
fsensor_autoload_set(false); fsensor_autoload_set(false);
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
// ~ FanCheck -> on
if(!(eeprom_read_byte((uint8_t*)EEPROM_FAN_CHECK_ENABLED)))
eeprom_update_byte((unsigned char *)EEPROM_FAN_CHECK_ENABLED,true);
} }
MYSERIAL.begin(BAUDRATE); MYSERIAL.begin(BAUDRATE);
fdev_setup_stream(uartout, uart_putchar, NULL, _FDEV_SETUP_WRITE); //setup uart out stream fdev_setup_stream(uartout, uart_putchar, NULL, _FDEV_SETUP_WRITE); //setup uart out stream
@ -7537,7 +7540,7 @@ static void handleSafetyTimer()
{ {
safetyTimer.start(); safetyTimer.start();
} }
else if (safetyTimer.expired(safetytimer_inactive_time)) else if (safetyTimer.expired(farm_mode?FARM_DEFAULT_SAFETYTIMER_TIME_ms:safetytimer_inactive_time))
{ {
setTargetBed(0); setTargetBed(0);
setAllTargetHotends(0); setAllTargetHotends(0);

14
Firmware/ultralcd.cpp
View file

@ -2167,7 +2167,6 @@ static void lcd_preheat_menu()
MENU_ITEM_FUNCTION_P(PSTR("farm - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FARM_PREHEAT_HPB_TEMP)), lcd_preheat_farm); MENU_ITEM_FUNCTION_P(PSTR("farm - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FARM_PREHEAT_HPB_TEMP)), lcd_preheat_farm);
MENU_ITEM_FUNCTION_P(PSTR("nozzle - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/0"), lcd_preheat_farm_nozzle); MENU_ITEM_FUNCTION_P(PSTR("nozzle - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/0"), lcd_preheat_farm_nozzle);
MENU_ITEM_FUNCTION_P(_T(MSG_COOLDOWN), lcd_cooldown); MENU_ITEM_FUNCTION_P(_T(MSG_COOLDOWN), lcd_cooldown);
MENU_ITEM_FUNCTION_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)), lcd_preheat_abs);
} else { } else {
MENU_ITEM_FUNCTION_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)), lcd_preheat_pla); MENU_ITEM_FUNCTION_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)), lcd_preheat_pla);
MENU_ITEM_FUNCTION_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)), lcd_preheat_pet); MENU_ITEM_FUNCTION_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)), lcd_preheat_pet);
@ -6317,10 +6316,11 @@ void lcd_confirm_print()
} }
if (lcd_clicked()) if (lcd_clicked())
{ {
filament_type = FARM_FILAMENT_COLOR_NONE;
if (cursor_pos == 1) if (cursor_pos == 1)
{ {
_ret = 1; _ret = 1;
filament_type = lcd_choose_color(); // filament_type = lcd_choose_color();
prusa_statistics(4, filament_type); prusa_statistics(4, filament_type);
no_response = true; //we need confirmation by recieving PRUSA thx no_response = true; //we need confirmation by recieving PRUSA thx
important_status = 4; important_status = 4;
@ -6330,7 +6330,7 @@ void lcd_confirm_print()
if (cursor_pos == 2) if (cursor_pos == 2)
{ {
_ret = 2; _ret = 2;
filament_type = lcd_choose_color(); // filament_type = lcd_choose_color();
prusa_statistics(5, filament_type); prusa_statistics(5, filament_type);
no_response = true; //we need confirmation by recieving PRUSA thx no_response = true; //we need confirmation by recieving PRUSA thx
important_status = 5; important_status = 5;
@ -6663,6 +6663,14 @@ static void lcd_tune_menu()
SETTINGS_CUTTER; SETTINGS_CUTTER;
if(farm_mode)
{
if (fans_check_enabled == true)
MENU_ITEM_FUNCTION_P(_i("Fans check [on]"), lcd_set_fan_check);////MSG_FANS_CHECK_ON c=17 r=1
else
MENU_ITEM_FUNCTION_P(_i("Fans check [off]"), lcd_set_fan_check);////MSG_FANS_CHECK_OFF c=17 r=1
}
#ifdef TMC2130 #ifdef TMC2130
if(!farm_mode) if(!farm_mode)
{ {

3
Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h
View file

@ -312,7 +312,7 @@ PREHEAT SETTINGS
*------------------------------------*/ *------------------------------------*/
#define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HOTEND_TEMP 250
#define FARM_PREHEAT_HPB_TEMP 40 #define FARM_PREHEAT_HPB_TEMP 80
#define FARM_PREHEAT_FAN_SPEED 0 #define FARM_PREHEAT_FAN_SPEED 0
#define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HOTEND_TEMP 215
@ -435,6 +435,7 @@ THERMISTORS SETTINGS
// Safety timer // Safety timer
#define SAFETYTIMER #define SAFETYTIMER
#define DEFAULT_SAFETYTIMER_TIME_MINS 30 #define DEFAULT_SAFETYTIMER_TIME_MINS 30
#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul)
#define M600_TIMEOUT 600 //seconds #define M600_TIMEOUT 600 //seconds

3
Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h
View file

@ -312,7 +312,7 @@ PREHEAT SETTINGS
*------------------------------------*/ *------------------------------------*/
#define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HOTEND_TEMP 250
#define FARM_PREHEAT_HPB_TEMP 40 #define FARM_PREHEAT_HPB_TEMP 80
#define FARM_PREHEAT_FAN_SPEED 0 #define FARM_PREHEAT_FAN_SPEED 0
#define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HOTEND_TEMP 215
@ -435,6 +435,7 @@ THERMISTORS SETTINGS
// Safety timer // Safety timer
#define SAFETYTIMER #define SAFETYTIMER
#define DEFAULT_SAFETYTIMER_TIME_MINS 30 #define DEFAULT_SAFETYTIMER_TIME_MINS 30
#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul)
#define M600_TIMEOUT 600 //seconds #define M600_TIMEOUT 600 //seconds

3
Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h
View file

@ -109,6 +109,7 @@
// Safety timer // Safety timer
#define SAFETYTIMER #define SAFETYTIMER
#define DEFAULT_SAFETYTIMER_TIME_MINS 30 #define DEFAULT_SAFETYTIMER_TIME_MINS 30
#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul)
// Filament sensor // Filament sensor
#define FILAMENT_SENSOR #define FILAMENT_SENSOR
@ -368,7 +369,7 @@
*------------------------------------*/ *------------------------------------*/
#define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HOTEND_TEMP 250
#define FARM_PREHEAT_HPB_TEMP 40 #define FARM_PREHEAT_HPB_TEMP 80
#define FARM_PREHEAT_FAN_SPEED 0 #define FARM_PREHEAT_FAN_SPEED 0
#define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HOTEND_TEMP 215

3
Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h
View file

@ -110,6 +110,7 @@
// Safety timer // Safety timer
#define SAFETYTIMER #define SAFETYTIMER
#define DEFAULT_SAFETYTIMER_TIME_MINS 30 #define DEFAULT_SAFETYTIMER_TIME_MINS 30
#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul)
// Filament sensor // Filament sensor
#define FILAMENT_SENSOR #define FILAMENT_SENSOR
@ -369,7 +370,7 @@
*------------------------------------*/ *------------------------------------*/
#define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HOTEND_TEMP 250
#define FARM_PREHEAT_HPB_TEMP 40 #define FARM_PREHEAT_HPB_TEMP 80
#define FARM_PREHEAT_FAN_SPEED 0 #define FARM_PREHEAT_FAN_SPEED 0
#define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HOTEND_TEMP 215

3
Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h
View file

@ -109,6 +109,7 @@
// Safety timer // Safety timer
#define SAFETYTIMER #define SAFETYTIMER
#define DEFAULT_SAFETYTIMER_TIME_MINS 30 #define DEFAULT_SAFETYTIMER_TIME_MINS 30
#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul)
// Filament sensor // Filament sensor
#define FILAMENT_SENSOR #define FILAMENT_SENSOR
@ -368,7 +369,7 @@
*------------------------------------*/ *------------------------------------*/
#define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HOTEND_TEMP 250
#define FARM_PREHEAT_HPB_TEMP 40 #define FARM_PREHEAT_HPB_TEMP 80
#define FARM_PREHEAT_FAN_SPEED 0 #define FARM_PREHEAT_FAN_SPEED 0
#define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HOTEND_TEMP 215

3
Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h
View file

@ -110,6 +110,7 @@
// Safety timer // Safety timer
#define SAFETYTIMER #define SAFETYTIMER
#define DEFAULT_SAFETYTIMER_TIME_MINS 30 #define DEFAULT_SAFETYTIMER_TIME_MINS 30
#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul)
// Filament sensor // Filament sensor
#define FILAMENT_SENSOR #define FILAMENT_SENSOR
@ -369,7 +370,7 @@
*------------------------------------*/ *------------------------------------*/
#define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HOTEND_TEMP 250
#define FARM_PREHEAT_HPB_TEMP 40 #define FARM_PREHEAT_HPB_TEMP 80
#define FARM_PREHEAT_FAN_SPEED 0 #define FARM_PREHEAT_FAN_SPEED 0
#define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HOTEND_TEMP 215

3
Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
View file

@ -131,6 +131,7 @@
// Safety timer // Safety timer
#define SAFETYTIMER #define SAFETYTIMER
#define DEFAULT_SAFETYTIMER_TIME_MINS 30 #define DEFAULT_SAFETYTIMER_TIME_MINS 30
#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul)
// Filament sensor // Filament sensor
#define FILAMENT_SENSOR #define FILAMENT_SENSOR
@ -480,7 +481,7 @@
*------------------------------------*/ *------------------------------------*/
#define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HOTEND_TEMP 250
#define FARM_PREHEAT_HPB_TEMP 60 #define FARM_PREHEAT_HPB_TEMP 80
#define FARM_PREHEAT_FAN_SPEED 0 #define FARM_PREHEAT_FAN_SPEED 0
#define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HOTEND_TEMP 215

3
Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h
View file

@ -131,6 +131,7 @@
// Safety timer // Safety timer
#define SAFETYTIMER #define SAFETYTIMER
#define DEFAULT_SAFETYTIMER_TIME_MINS 30 #define DEFAULT_SAFETYTIMER_TIME_MINS 30
#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul)
// Filament sensor // Filament sensor
#define FILAMENT_SENSOR #define FILAMENT_SENSOR
@ -480,7 +481,7 @@
*------------------------------------*/ *------------------------------------*/
#define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HOTEND_TEMP 250
#define FARM_PREHEAT_HPB_TEMP 60 #define FARM_PREHEAT_HPB_TEMP 80
#define FARM_PREHEAT_FAN_SPEED 0 #define FARM_PREHEAT_FAN_SPEED 0
#define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HOTEND_TEMP 215