forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

overworked autotemp, removed one layer of nesting from the ultralcd.

Browse Source
master
Bernhard 13 years ago
parent 4f909963e4
commit dfd240b260
5 changed files with 449 additions and 410 deletions
Show Stats Download Patch File Download Diff File

1
Marlin/Marlin.pde
Unescape View File

@ -670,6 +670,7 @@ FORCE_INLINE void process_commands()
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHOLN(time); SERIAL_ECHOLN(time);
LCD_MESSAGE(time); LCD_MESSAGE(time);
autotempShutdown();
} }
break; break;
case 42: //M42 -Change pin status via gcode case 42: //M42 -Change pin status via gcode

1
Marlin/cardreader.pde
Unescape View File

@ -436,5 +436,6 @@ void CardReader::printingHasFinished()
{ {
finishAndDisableSteppers(); finishAndDisableSteppers();
} }
autotempShutdown();
} }
#endif //SDSUPPORT #endif //SDSUPPORT

2
Marlin/planner.cpp
Unescape View File

@ -91,7 +91,7 @@ static float previous_nominal_speed; // Nominal speed of previous path line segm
#ifdef AUTOTEMP #ifdef AUTOTEMP
float autotemp_max=250; float autotemp_max=250;
float autotemp_min=210; float autotemp_min=210;
float autotemp_factor=1; float autotemp_factor=0.1;
bool autotemp_enabled=false; bool autotemp_enabled=false;
#endif #endif

10
Marlin/temperature.h
Unescape View File

@ -108,6 +108,16 @@ FORCE_INLINE float isCoolingHotend(uint8_t extruder){
}; };
FORCE_INLINE bool isCoolingBed() {return target_raw[TEMPSENSOR_BED] < current_raw[TEMPSENSOR_BED];}; FORCE_INLINE bool isCoolingBed() {return target_raw[TEMPSENSOR_BED] < current_raw[TEMPSENSOR_BED];};
FORCE_INLINE void autotempShutdown(){
#ifdef AUTOTEMP
if(autotemp_enabled)
{
autotemp_enabled=false;
if(degTargetHotend0()>autotemp_min)
setTargetHotend0(0);
}
#endif
}
void disable_heater(); void disable_heater();
void setWatch(); void setWatch();
void updatePID(); void updatePID();

845
Marlin/ultralcd.pde
Unescape View File

@ -503,31 +503,32 @@ void MainMenu::showTune()
lcd.setCursor(13,line);lcd.print(ftostr3(feedmultiply)); lcd.setCursor(13,line);lcd.print(ftostr3(feedmultiply));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED) //nalogWrite(FAN_PIN, fanpwm);
{ {
if(CLICKED) //nalogWrite(FAN_PIN, fanpwm); linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=feedmultiply;
if(linechanging)
{
encoderpos=feedmultiply;
}
else
{
encoderpos=activeline*lcdslow;
beepshort();
}
BLOCK;
} }
if(linechanging) else
{ {
if(encoderpos<1) encoderpos=1; encoderpos=activeline*lcdslow;
if(encoderpos>400) encoderpos=400; beepshort();
feedmultiply = encoderpos;
feedmultiplychanged=true;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
BLOCK;
}
if(linechanging)
{
if(encoderpos<1) encoderpos=1;
if(encoderpos>400) encoderpos=400;
feedmultiply = encoderpos;
feedmultiplychanged=true;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
}break; }break;
case ItemT_nozzle: case ItemT_nozzle:
{ {
@ -537,29 +538,29 @@ void MainMenu::showTune()
lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetHotend0()))); lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetHotend0())));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=intround(degTargetHotend0());
if(linechanging)
{
encoderpos=intround(degTargetHotend0());
}
else
{
setTargetHotend0(encoderpos);
encoderpos=activeline*lcdslow;
beepshort();
}
BLOCK;
} }
if(linechanging) else
{ {
if(encoderpos<0) encoderpos=0; setTargetHotend0(encoderpos);
if(encoderpos>260) encoderpos=260; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos)); beepshort();
} }
BLOCK;
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>260) encoderpos=260;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
}break; }break;
@ -571,31 +572,32 @@ void MainMenu::showTune()
lcd.setCursor(13,line);lcd.print(ftostr3(fanpwm)); lcd.setCursor(13,line);lcd.print(ftostr3(fanpwm));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED) //nalogWrite(FAN_PIN, fanpwm);
{ {
if(CLICKED) //nalogWrite(FAN_PIN, fanpwm); linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=fanpwm;
if(linechanging)
{
encoderpos=fanpwm;
}
else
{
encoderpos=activeline*lcdslow;
beepshort();
}
BLOCK;
} }
if(linechanging) else
{ {
if(encoderpos<0) encoderpos=0; encoderpos=activeline*lcdslow;
if(encoderpos>255) encoderpos=255; beepshort();
fanpwm=encoderpos;
analogWrite(FAN_PIN, fanpwm);
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
BLOCK;
} }
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>255) encoderpos=255;
fanpwm=encoderpos;
analogWrite(FAN_PIN, fanpwm);
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break; }break;
case ItemT_flow://axis_steps_per_unit[i] = code_value(); case ItemT_flow://axis_steps_per_unit[i] = code_value();
{ {
@ -605,34 +607,35 @@ void MainMenu::showTune()
lcd.setCursor(13,line);lcd.print(itostr4(axis_steps_per_unit[3])); lcd.setCursor(13,line);lcd.print(itostr4(axis_steps_per_unit[3]));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=(int)axis_steps_per_unit[3];
if(linechanging)
{
encoderpos=(int)axis_steps_per_unit[3];
}
else
{
float factor=float(encoderpos)/float(axis_steps_per_unit[3]);
position[E_AXIS]=lround(position[E_AXIS]*factor);
//current_position[3]*=factor;
axis_steps_per_unit[E_AXIS]= encoderpos;
encoderpos=activeline*lcdslow;
}
BLOCK;
beepshort();
} }
if(linechanging) else
{ {
if(encoderpos<5) encoderpos=5; float factor=float(encoderpos)/float(axis_steps_per_unit[3]);
if(encoderpos>9999) encoderpos=9999; position[E_AXIS]=lround(position[E_AXIS]*factor);
lcd.setCursor(13,line);lcd.print(itostr4(encoderpos)); //current_position[3]*=factor;
axis_steps_per_unit[E_AXIS]= encoderpos;
encoderpos=activeline*lcdslow;
} }
BLOCK;
beepshort();
} }
if(linechanging)
{
if(encoderpos<5) encoderpos=5;
if(encoderpos>9999) encoderpos=9999;
lcd.setCursor(13,line);lcd.print(itostr4(encoderpos));
}
}break; }break;
default: default:
break; break;
@ -688,30 +691,31 @@ void MainMenu::showControlTemp()
lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetHotend0()))); lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetHotend0())));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=intround(degTargetHotend0());
if(linechanging)
{
encoderpos=intround(degTargetHotend0());
}
else
{
setTargetHotend0(encoderpos);
encoderpos=activeline*lcdslow;
beepshort();
}
BLOCK;
} }
if(linechanging) else
{ {
if(encoderpos<0) encoderpos=0; setTargetHotend0(encoderpos);
if(encoderpos>260) encoderpos=260; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos)); beepshort();
} }
BLOCK;
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>260) encoderpos=260;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
}break; }break;
#ifdef AUTOTEMP #ifdef AUTOTEMP
case ItemCT_autotempmin: case ItemCT_autotempmin:
@ -719,33 +723,34 @@ void MainMenu::showControlTemp()
if(force_lcd_update) if(force_lcd_update)
{ {
lcd.setCursor(0,line);lcdprintPGM(" \002 Min:"); lcd.setCursor(0,line);lcdprintPGM(" \002 Min:");
lcd.setCursor(13,line);lcd.print(ftostr3(autotemp_max)); lcd.setCursor(13,line);lcd.print(ftostr3(autotemp_min));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=intround(autotemp_min);
if(linechanging)
{
encoderpos=intround(autotemp_max);
}
else
{
autotemp_max=encoderpos;
encoderpos=activeline*lcdslow;
beepshort();
}
BLOCK;
} }
if(linechanging) else
{ {
if(encoderpos<0) encoderpos=0; autotemp_min=encoderpos;
if(encoderpos>260) encoderpos=260; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos)); beepshort();
} }
BLOCK;
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>260) encoderpos=260;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
}break; }break;
case ItemCT_autotempmax: case ItemCT_autotempmax:
{ {
@ -755,30 +760,31 @@ void MainMenu::showControlTemp()
lcd.setCursor(13,line);lcd.print(ftostr3(autotemp_max)); lcd.setCursor(13,line);lcd.print(ftostr3(autotemp_max));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=intround(autotemp_max);
if(linechanging)
{
encoderpos=intround(autotemp_max);
}
else
{
autotemp_max=encoderpos;
encoderpos=activeline*lcdslow;
beepshort();
}
BLOCK;
} }
if(linechanging) else
{ {
if(encoderpos<0) encoderpos=0; autotemp_max=encoderpos;
if(encoderpos>260) encoderpos=260; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos)); beepshort();
} }
BLOCK;
} }
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>260) encoderpos=260;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break; }break;
case ItemCT_autotempfact: case ItemCT_autotempfact:
{ {
@ -788,30 +794,31 @@ void MainMenu::showControlTemp()
lcd.setCursor(13,line);lcd.print(ftostr32(autotemp_factor)); lcd.setCursor(13,line);lcd.print(ftostr32(autotemp_factor));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=intround(autotemp_factor*100);
if(linechanging)
{
encoderpos=intround(autotemp_factor*100);
}
else
{
autotemp_max=encoderpos;
encoderpos=activeline*lcdslow;
beepshort();
}
BLOCK;
} }
if(linechanging) else
{ {
if(encoderpos<0) encoderpos=0; autotemp_max=encoderpos;
if(encoderpos>99) encoderpos=99; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(ftostr32(encoderpos/100.)); beepshort();
} }
BLOCK;
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>99) encoderpos=99;
lcd.setCursor(13,line);lcd.print(ftostr32(encoderpos/100.));
} }
}break; }break;
case ItemCT_autotempactive: case ItemCT_autotempactive:
{ {
@ -819,20 +826,26 @@ void MainMenu::showControlTemp()
{ {
lcd.setCursor(0,line);lcdprintPGM(" Autotemp:"); lcd.setCursor(0,line);lcdprintPGM(" Autotemp:");
lcd.setCursor(13,line); lcd.setCursor(13,line);
if(autotemp_enabled) if(autotemp_enabled)
lcdprintPGM("On"); lcdprintPGM("On");
else else
lcdprintPGM("Off"); lcdprintPGM("Off");
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) autotemp_enabled=!autotemp_enabled;
{ lcd.setCursor(13,line);
autotemp_enabled=!autotemp_enabled; if(autotemp_enabled)
BLOCK; lcdprintPGM("On ");
} else
lcdprintPGM("Off");
BLOCK;
} }
}break; }break;
#endif //autotemp #endif //autotemp
case ItemCT_fan: case ItemCT_fan:
@ -843,31 +856,32 @@ void MainMenu::showControlTemp()
lcd.setCursor(13,line);lcd.print(ftostr3(fanpwm)); lcd.setCursor(13,line);lcd.print(ftostr3(fanpwm));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED) //nalogWrite(FAN_PIN, fanpwm);
{ {
if(CLICKED) //nalogWrite(FAN_PIN, fanpwm); linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=fanpwm;
if(linechanging)
{
encoderpos=fanpwm;
}
else
{
encoderpos=activeline*lcdslow;
beepshort();
}
BLOCK;
} }
if(linechanging) else
{ {
if(encoderpos<0) encoderpos=0; encoderpos=activeline*lcdslow;
if(encoderpos>255) encoderpos=255; beepshort();
fanpwm=encoderpos;
analogWrite(FAN_PIN, fanpwm);
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
BLOCK;
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>255) encoderpos=255;
fanpwm=encoderpos;
analogWrite(FAN_PIN, fanpwm);
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
}break; }break;
case ItemCT_PID_P: case ItemCT_PID_P:
{ {
@ -877,31 +891,32 @@ void MainMenu::showControlTemp()
lcd.setCursor(13,line);lcd.print(itostr4(Kp)); lcd.setCursor(13,line);lcd.print(itostr4(Kp));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=(int)Kp;
if(linechanging)
{
encoderpos=(int)Kp;
}
else
{
Kp= encoderpos;
encoderpos=activeline*lcdslow;
}
BLOCK;
beepshort();
} }
if(linechanging) else
{ {
if(encoderpos<1) encoderpos=1; Kp= encoderpos;
if(encoderpos>9990) encoderpos=9990; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(itostr4(encoderpos));
} }
BLOCK;
beepshort();
}
if(linechanging)
{
if(encoderpos<1) encoderpos=1;
if(encoderpos>9990) encoderpos=9990;
lcd.setCursor(13,line);lcd.print(itostr4(encoderpos));
} }
}break; }break;
case ItemCT_PID_I: case ItemCT_PID_I:
{ {
@ -911,31 +926,32 @@ void MainMenu::showControlTemp()
lcd.setCursor(13,line);lcd.print(ftostr51(Ki/PID_dT)); lcd.setCursor(13,line);lcd.print(ftostr51(Ki/PID_dT));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=(int)(Ki*10/PID_dT);
if(linechanging)
{
encoderpos=(int)(Ki*10/PID_dT);
}
else
{
Ki= encoderpos/10.*PID_dT;
encoderpos=activeline*lcdslow;
}
BLOCK;
beepshort();
} }
if(linechanging) else
{ {
if(encoderpos<0) encoderpos=0; Ki= encoderpos/10.*PID_dT;
if(encoderpos>9990) encoderpos=9990; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(ftostr51(encoderpos/10.));
} }
BLOCK;
beepshort();
} }
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>9990) encoderpos=9990;
lcd.setCursor(13,line);lcd.print(ftostr51(encoderpos/10.));
}
}break; }break;
case ItemCT_PID_D: case ItemCT_PID_D:
{ {
@ -945,31 +961,33 @@ void MainMenu::showControlTemp()
lcd.setCursor(13,line);lcd.print(itostr4(Kd*PID_dT)); lcd.setCursor(13,line);lcd.print(itostr4(Kd*PID_dT));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=(int)(Kd/5./PID_dT);
if(linechanging)
{
encoderpos=(int)(Kd/5./PID_dT);
}
else
{
Kd= encoderpos;
encoderpos=activeline*lcdslow;
}
BLOCK;
beepshort();
} }
if(linechanging) else
{ {
if(encoderpos<0) encoderpos=0; Kd= encoderpos;
if(encoderpos>9990) encoderpos=9990; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(itostr4(encoderpos));
} }
BLOCK;
beepshort();
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>9990) encoderpos=9990;
lcd.setCursor(13,line);lcd.print(itostr4(encoderpos));
} }
}break; }break;
case ItemCT_PID_C: case ItemCT_PID_C:
#ifdef PID_ADD_EXTRUSION_RATE #ifdef PID_ADD_EXTRUSION_RATE
@ -980,31 +998,32 @@ void MainMenu::showControlTemp()
lcd.setCursor(13,line);lcd.print(itostr3(Kc)); lcd.setCursor(13,line);lcd.print(itostr3(Kc));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=(int)Kc;
if(linechanging)
{
encoderpos=(int)Kc;
}
else
{
Kc= encoderpos;
encoderpos=activeline*lcdslow;
}
BLOCK;
beepshort();
} }
if(linechanging) else
{ {
if(encoderpos<0) encoderpos=0; Kc= encoderpos;
if(encoderpos>990) encoderpos=990; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
BLOCK;
beepshort();
} }
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
} }
#endif #endif
break; break;
@ -1051,30 +1070,31 @@ void MainMenu::showControlMotion()
lcd.setCursor(13,line);lcd.print(itostr3(acceleration/100));lcdprintPGM("00"); lcd.setCursor(13,line);lcd.print(itostr3(acceleration/100));lcdprintPGM("00");
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=(int)acceleration/100;
if(linechanging)
{
encoderpos=(int)acceleration/100;
}
else
{
acceleration= encoderpos*100;
encoderpos=activeline*lcdslow;
}
BLOCK;
beepshort();
} }
if(linechanging) else
{ {
if(encoderpos<5) encoderpos=5; acceleration= encoderpos*100;
if(encoderpos>990) encoderpos=990; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));lcdprintPGM("00");
} }
BLOCK;
beepshort();
} }
if(linechanging)
{
if(encoderpos<5) encoderpos=5;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));lcdprintPGM("00");
}
}break; }break;
case ItemCM_xyjerk: //max_xy_jerk case ItemCM_xyjerk: //max_xy_jerk
{ {
@ -1084,31 +1104,32 @@ void MainMenu::showControlMotion()
lcd.setCursor(13,line);lcd.print(itostr3(max_xy_jerk)); lcd.setCursor(13,line);lcd.print(itostr3(max_xy_jerk));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=(int)max_xy_jerk;
if(linechanging)
{
encoderpos=(int)max_xy_jerk;
}
else
{
max_xy_jerk= encoderpos;
encoderpos=activeline*lcdslow;
}
BLOCK;
beepshort();
} }
if(linechanging) else
{ {
if(encoderpos<1) encoderpos=1; max_xy_jerk= encoderpos;
if(encoderpos>990) encoderpos=990; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
BLOCK;
beepshort();
} }
if(linechanging)
{
if(encoderpos<1) encoderpos=1;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break; }break;
case ItemCM_vmaxx: case ItemCM_vmaxx:
@ -1126,31 +1147,32 @@ void MainMenu::showControlMotion()
lcd.setCursor(13,line);lcd.print(itostr3(max_feedrate[i-ItemCM_vmaxx])); lcd.setCursor(13,line);lcd.print(itostr3(max_feedrate[i-ItemCM_vmaxx]));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=(int)max_feedrate[i-ItemCM_vmaxx];
if(linechanging)
{
encoderpos=(int)max_feedrate[i-ItemCM_vmaxx];
}
else
{
max_feedrate[i-ItemCM_vmaxx]= encoderpos;
encoderpos=activeline*lcdslow;
}
BLOCK;
beepshort();
} }
if(linechanging) else
{ {
if(encoderpos<1) encoderpos=1; max_feedrate[i-ItemCM_vmaxx]= encoderpos;
if(encoderpos>990) encoderpos=990; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
BLOCK;
beepshort();
}
if(linechanging)
{
if(encoderpos<1) encoderpos=1;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
}break; }break;
case ItemCM_vmin: case ItemCM_vmin:
@ -1161,31 +1183,32 @@ void MainMenu::showControlMotion()
lcd.setCursor(13,line);lcd.print(itostr3(minimumfeedrate)); lcd.setCursor(13,line);lcd.print(itostr3(minimumfeedrate));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=(int)(minimumfeedrate);
if(linechanging)
{
encoderpos=(int)(minimumfeedrate);
}
else
{
minimumfeedrate= encoderpos;
encoderpos=activeline*lcdslow;
}
BLOCK;
beepshort();
} }
if(linechanging) else
{ {
if(encoderpos<0) encoderpos=0; minimumfeedrate= encoderpos;
if(encoderpos>990) encoderpos=990; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
BLOCK;
beepshort();
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
}break; }break;
case ItemCM_vtravmin: case ItemCM_vtravmin:
{ {
@ -1195,31 +1218,32 @@ void MainMenu::showControlMotion()
lcd.setCursor(13,line);lcd.print(itostr3(mintravelfeedrate)); lcd.setCursor(13,line);lcd.print(itostr3(mintravelfeedrate));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=(int)mintravelfeedrate;
if(linechanging)
{
encoderpos=(int)mintravelfeedrate;
}
else
{
mintravelfeedrate= encoderpos;
encoderpos=activeline*lcdslow;
}
BLOCK;
beepshort();
} }
if(linechanging) else
{ {
if(encoderpos<0) encoderpos=0; mintravelfeedrate= encoderpos;
if(encoderpos>990) encoderpos=990; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
BLOCK;
beepshort();
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
} }
}break; }break;
case ItemCM_amaxx: case ItemCM_amaxx:
@ -1237,30 +1261,31 @@ void MainMenu::showControlMotion()
lcd.setCursor(13,line);lcd.print(itostr3(max_acceleration_units_per_sq_second[i-ItemCM_amaxx]/100));lcdprintPGM("00"); lcd.setCursor(13,line);lcd.print(itostr3(max_acceleration_units_per_sq_second[i-ItemCM_amaxx]/100));lcdprintPGM("00");
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=(int)max_acceleration_units_per_sq_second[i-ItemCM_amaxx]/100;
if(linechanging)
{
encoderpos=(int)max_acceleration_units_per_sq_second[i-ItemCM_amaxx]/100;
}
else
{
max_acceleration_units_per_sq_second[i-ItemCM_amaxx]= encoderpos*100;
encoderpos=activeline*lcdslow;
}
BLOCK;
beepshort();
} }
if(linechanging) else
{ {
if(encoderpos<1) encoderpos=1; max_acceleration_units_per_sq_second[i-ItemCM_amaxx]= encoderpos*100;
if(encoderpos>990) encoderpos=990; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));lcdprintPGM("00");
} }
BLOCK;
beepshort();
}
if(linechanging)
{
if(encoderpos<1) encoderpos=1;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));lcdprintPGM("00");
} }
}break; }break;
case ItemCM_aret://float retract_acceleration = 7000; case ItemCM_aret://float retract_acceleration = 7000;
{ {
@ -1270,31 +1295,32 @@ void MainMenu::showControlMotion()
lcd.setCursor(13,line);lcd.print(ftostr3(retract_acceleration/100));lcdprintPGM("00"); lcd.setCursor(13,line);lcd.print(ftostr3(retract_acceleration/100));lcdprintPGM("00");
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=(int)retract_acceleration/100;
if(linechanging)
{
encoderpos=(int)retract_acceleration/100;
}
else
{
retract_acceleration= encoderpos*100;
encoderpos=activeline*lcdslow;
}
BLOCK;
beepshort();
} }
if(linechanging) else
{ {
if(encoderpos<10) encoderpos=10; retract_acceleration= encoderpos*100;
if(encoderpos>990) encoderpos=990; encoderpos=activeline*lcdslow;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));lcdprintPGM("00");
} }
BLOCK;
beepshort();
}
if(linechanging)
{
if(encoderpos<10) encoderpos=10;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));lcdprintPGM("00");
} }
}break; }break;
case ItemCM_esteps://axis_steps_per_unit[i] = code_value(); case ItemCM_esteps://axis_steps_per_unit[i] = code_value();
{ {
@ -1304,34 +1330,35 @@ void MainMenu::showControlMotion()
lcd.setCursor(13,line);lcd.print(itostr4(axis_steps_per_unit[3])); lcd.setCursor(13,line);lcd.print(itostr4(axis_steps_per_unit[3]));
} }
if((activeline==line) ) if((activeline!=line) )
break;
if(CLICKED)
{ {
if(CLICKED) linechanging=!linechanging;
if(linechanging)
{ {
linechanging=!linechanging; encoderpos=(int)axis_steps_per_unit[3];
if(linechanging)
{
encoderpos=(int)axis_steps_per_unit[3];
}
else
{
float factor=float(encoderpos)/float(axis_steps_per_unit[3]);
position[E_AXIS]=lround(position[E_AXIS]*factor);
//current_position[3]*=factor;
axis_steps_per_unit[E_AXIS]= encoderpos;
encoderpos=activeline*lcdslow;
}
BLOCK;
beepshort();
} }
if(linechanging) else
{ {
if(encoderpos<5) encoderpos=5; float factor=float(encoderpos)/float(axis_steps_per_unit[3]);
if(encoderpos>9999) encoderpos=9999; position[E_AXIS]=lround(position[E_AXIS]*factor);
lcd.setCursor(13,line);lcd.print(itostr4(encoderpos)); //current_position[3]*=factor;
axis_steps_per_unit[E_AXIS]= encoderpos;
encoderpos=activeline*lcdslow;
} }
BLOCK;
beepshort();
} }
if(linechanging)
{
if(encoderpos<5) encoderpos=5;
if(encoderpos>9999) encoderpos=9999;
lcd.setCursor(13,line);lcd.print(itostr4(encoderpos));
}
}break; }break;
default: default:
break; break;

Write Preview
Loading…
Cancel
Save