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

Comms ACK working for new FS command 

Added FS command to MMU when filament is sensed at MK3 FSensor
This commit is contained in:
Rob McKenzie 2018-11-07 03:28:22 +10:00
parent 2c084d4fd9
commit 3d7841f3aa
7 changed files with 15653 additions and 15641 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

28538
Firmware/Firmware.ino.rambo.hex
View File

File diff suppressed because it is too large Load Diff

5
Firmware/Marlin_main.cpp
View File

@ -7456,9 +7456,6 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s
{ {
if ((lcd_commands_type != LCD_COMMAND_V2_CAL) && !wizard_active && mmuFSensorLoading) { if ((lcd_commands_type != LCD_COMMAND_V2_CAL) && !wizard_active && mmuFSensorLoading) {
fsensor_check_autoload(); fsensor_check_autoload();
} else {
fsensor_autoload_check_stop();
//fsensor_update();
} }
} }
} }
@ -9207,4 +9204,4 @@ void M600_load_filament() {
lcd_update_enable(false); lcd_update_enable(false);
} }
#define FIL_LOAD_LENGTH 60 #define FIL_LOAD_LENGTH 60

15
Firmware/fsensor.cpp
View File

@ -215,7 +215,7 @@ void fsensor_autoload_check_start(void)
printf_P(ERRMSG_PAT9125_NOT_RESP, 3); printf_P(ERRMSG_PAT9125_NOT_RESP, 3);
return; return;
} }
puts_P(_N("fsensor_autoload_check_start - autoload ENABLED\n")); if (mmu_enabled) puts_P(_N("fsensor_autoload_check_start - autoload ENABLED\n"));
fsensor_autoload_y = pat9125_y; //save current y value fsensor_autoload_y = pat9125_y; //save current y value
fsensor_autoload_c = 0; //reset number of changes counter fsensor_autoload_c = 0; //reset number of changes counter
fsensor_autoload_sum = 0; fsensor_autoload_sum = 0;
@ -233,7 +233,7 @@ void fsensor_autoload_check_stop(void)
if (!fsensor_autoload_enabled) return; if (!fsensor_autoload_enabled) return;
// puts_P(_N("fsensor_autoload_check_stop 2\n")); // puts_P(_N("fsensor_autoload_check_stop 2\n"));
if (!fsensor_watch_autoload) return; if (!fsensor_watch_autoload) return;
puts_P(_N("fsensor_autoload_check_stop - autoload DISABLED\n")); if (mmu_enabled) puts_P(_N("fsensor_autoload_check_stop - autoload DISABLED\n"));
fsensor_autoload_sum = 0; fsensor_autoload_sum = 0;
fsensor_watch_autoload = false; fsensor_watch_autoload = false;
fsensor_watch_runout = true; fsensor_watch_runout = true;
@ -284,11 +284,12 @@ bool fsensor_check_autoload(void)
// if ((fsensor_autoload_c >= 15) && (fsensor_autoload_sum > 30)) // if ((fsensor_autoload_c >= 15) && (fsensor_autoload_sum > 30))
if ((fsensor_autoload_c >= 12) && (fsensor_autoload_sum > 20)) if ((fsensor_autoload_c >= 12) && (fsensor_autoload_sum > 20))
{ {
puts_P(_N("fsensor_check_autoload = true !!!\n")); //puts_P(_N("fsensor_check_autoload = true !!!\n"));
//if (mmu_enabled) { if (mmu_enabled) {
mmuFilamentMK3Moving = true; //mmuFilamentMK3Moving = true;
fsensor_autoload_check_stop(); mmu_command(MMU_CMD_FS);
//} fsensor_autoload_check_stop();
}
return true; return true;
} }
return false; return false;

2
Firmware/fsensor.h
View File

@ -14,7 +14,7 @@ extern bool fsensor_not_responding;
//enable/disable quality meassurement //enable/disable quality meassurement
extern bool fsensor_oq_meassure_enabled; extern bool fsensor_oq_meassure_enabled;
extern bool mmuFilamentMK3Moving; //extern bool mmuFilamentMK3Moving;
extern bool mmuFSensorLoading; extern bool mmuFSensorLoading;

2729
Firmware/mmu.cpp
View File

File diff suppressed because it is too large Load Diff

5
Firmware/mmu.h
View File

@ -36,8 +36,7 @@ extern int16_t mmu_buildnr;
#define MMU_CMD_E4 0x54 #define MMU_CMD_E4 0x54
#define MMU_CMD_R0 0x60 #define MMU_CMD_R0 0x60
#define MMU_CMD_P0 0x70 #define MMU_CMD_P0 0x70
#define MMU_CMD_FS0 0x80 #define MMU_CMD_FS 0x81
#define MMU_CMD_FS1 0x81
extern int mmu_puts_P(const char* str); extern int mmu_puts_P(const char* str);
@ -103,4 +102,4 @@ extern void mmu_eject_fil_0();
extern void mmu_eject_fil_1(); extern void mmu_eject_fil_1();
extern void mmu_eject_fil_2(); extern void mmu_eject_fil_2();
extern void mmu_eject_fil_3(); extern void mmu_eject_fil_3();
extern void mmu_eject_fil_4(); extern void mmu_eject_fil_4();