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

Merge pull request #292 from XPila/MK3

Browse Source 
Automatic filament load in M600
This commit is contained in:
XPila 2017-12-05 18:38:23 +01:00 committed by GitHub
commit 443dc53145
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Firmware/Marlin_main.cpp
View File

@ -5490,12 +5490,21 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
lcd_wait_interact();
//load_filament_time = millis();
KEEPALIVE_STATE(PAUSED_FOR_USER);
while(!lcd_clicked()){
pat9125_update_y(); //update sensor
uint16_t y_old = pat9125_y; //save current y value
uint8_t change_cnt = 0; //reset number of changes counter
while(!lcd_clicked())
{
manage_heater();
manage_inactivity(true);
pat9125_update_y(); //update sensor
if (y_old != pat9125_y) //? y value is different
{
if ((y_old - pat9125_y) > 0) //? delta-y value is positive (inserting)
change_cnt++; //increment change counter
y_old = pat9125_y; //save current value
if (change_cnt > 20) break; //number of positive changes > 20, start loading
}
/*#ifdef SNMM
target[E_AXIS] += 0.002;
plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 500, active_extruder);

1
Firmware/fsensor.cpp
View File

@ -41,6 +41,7 @@ int16_t fsensor_st_cnt = 0;
uint8_t fsensor_log = 1;
bool fsensor_enable()
{
puts_P(PSTR("fsensor_enable\n"));