jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add IS and Runout Mode ExtUI Hooks

Browse Source
This commit is contained in:
InsanityAutomation
2023-03-26 19:21:35 -04:00
parent d873148f2f
commit 773a894209
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/lcd/extui/ui_api.cpp
+32 -1
View File
@@ -683,12 +683,23 @@ namespace ExtUI {
}
#if HAS_FILAMENT_SENSOR
bool getFilamentRunoutEnabled(const extruder_t extruder/*=E0*/) { return runout.enabled[extruder]; }
bool getFilamentRunoutEnabled(const extruder_t extruder/*=E0*/) { return (runout.enabled[extruder] && (runout.mode[extruder]!=0)); }
void setFilamentRunoutEnabled(const bool value, const extruder_t extruder/*=E0*/) { runout.enabled[extruder] = value; }
bool getFilamentRunoutState() { return runout.filament_ran_out; }
void setFilamentRunoutState(const bool value) { runout.filament_ran_out = value; }
float getFilamentRunoutDistance_mm() { return runout.runout_distance(); }
void setFilamentRunoutDistance_mm(const_float_t value) { runout.set_runout_distance(constrain(value, 0, 999)); }
int getRunoutMode(const extruder_t extruder/*=E0*/){
return (int)runout.mode[extruder];
}
void setRunoutMode(const int mode, const extruder_t extruder/*=E0*/){
if((mode >= 0 && mode <=2) || mode==7) {
runout.mode[extruder] = (RunoutMode)mode;
runout.setup();
}
}
#endif
#if ENABLED(CASE_LIGHT_ENABLE)
@@ -723,6 +734,26 @@ namespace ExtUI {
}
#endif
#if HAS_SHAPING
float getShapingZeta(const axis_t axis) {
return stepper.get_shaping_damping_ratio(AxisEnum(axis));
}
void setShapingZeta(const float zeta, const axis_t axis) {
if (WITHIN(zeta, 0, 1)) {
stepper.set_shaping_damping_ratio(AxisEnum(axis), zeta);
}
}
float getShapingFrequency(const axis_t axis) {
return stepper.get_shaping_frequency(AxisEnum(axis));
}
void setShapingFrequency(const float freq, const axis_t axis) {
constexpr float min_freq = float(uint32_t(STEPPER_TIMER_RATE) / 2) / shaping_time_t(-2);
if (freq == 0.0f || freq > min_freq) {
stepper.set_shaping_frequency(AxisEnum(axis), freq);
}
}
#endif
#if HAS_JUNCTION_DEVIATION
float getJunctionDeviation_mm() { return planner.junction_deviation_mm; }
Marlin/src/lcd/extui/ui_api.h
+9
View File
@@ -250,6 +250,13 @@ namespace ExtUI {
void setLinearAdvance_mm_mm_s(const_float_t, const extruder_t);
#endif
#if HAS_SHAPING
float getShapingZeta(const axis_t);
void setShapingZeta(const float, const axis_t);
float getShapingFrequency(const axis_t);
void setShapingFrequency(const float, const axis_t);
#endif
#if HAS_JUNCTION_DEVIATION
float getJunctionDeviation_mm();
void setJunctionDeviation_mm(const_float_t);
@@ -306,6 +313,8 @@ namespace ExtUI {
void setFilamentRunoutState(const bool);
float getFilamentRunoutDistance_mm();
void setFilamentRunoutDistance_mm(const_float_t);
int getRunoutMode(const extruder_t extruder=E0);
void setRunoutMode(const int, const extruder_t extruder=E0);
#endif
#if ENABLED(CASE_LIGHT_ENABLE)