🚸 ExtUI: Shaping, Probing limits (#26754)
This commit is contained in:
committed by
GitHub
parent
95f81d2565
commit
ab0173b7e6
@@ -141,7 +141,7 @@ typedef Servo hal_servo_t;
|
|||||||
#error "LCD_SERIAL_PORT must be from 0 to 3."
|
#error "LCD_SERIAL_PORT must be from 0 to 3."
|
||||||
#endif
|
#endif
|
||||||
#define LCD_SERIAL lcdSerial
|
#define LCD_SERIAL lcdSerial
|
||||||
#if HAS_DGUS_LCD
|
#if ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
|
||||||
#define LCD_SERIAL_TX_BUFFER_FREE() LCD_SERIAL.get_tx_buffer_free()
|
#define LCD_SERIAL_TX_BUFFER_FREE() LCD_SERIAL.get_tx_buffer_free()
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@@ -629,7 +629,7 @@ MSerialT1 customizedSerial1(MSerialT1::HasEmergencyParser);
|
|||||||
template class MarlinSerial< LCDSerialCfg<LCD_SERIAL_PORT> >;
|
template class MarlinSerial< LCDSerialCfg<LCD_SERIAL_PORT> >;
|
||||||
MSerialLCD lcdSerial(MSerialLCD::HasEmergencyParser);
|
MSerialLCD lcdSerial(MSerialLCD::HasEmergencyParser);
|
||||||
|
|
||||||
#if HAS_DGUS_LCD
|
#if ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
|
||||||
template<typename Cfg>
|
template<typename Cfg>
|
||||||
typename MarlinSerial<Cfg>::ring_buffer_pos_t MarlinSerial<Cfg>::get_tx_buffer_free() {
|
typename MarlinSerial<Cfg>::ring_buffer_pos_t MarlinSerial<Cfg>::get_tx_buffer_free() {
|
||||||
const ring_buffer_pos_t t = tx_buffer.tail, // next byte to send.
|
const ring_buffer_pos_t t = tx_buffer.tail, // next byte to send.
|
||||||
|
@@ -205,7 +205,7 @@
|
|||||||
static ring_buffer_pos_t available();
|
static ring_buffer_pos_t available();
|
||||||
static void write(const uint8_t c);
|
static void write(const uint8_t c);
|
||||||
static void flushTX();
|
static void flushTX();
|
||||||
#if HAS_DGUS_LCD
|
#if ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
|
||||||
static ring_buffer_pos_t get_tx_buffer_free();
|
static ring_buffer_pos_t get_tx_buffer_free();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -100,7 +100,7 @@ extern DefaultSerial1 USBSerial;
|
|||||||
#else
|
#else
|
||||||
#error "LCD_SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
|
#error "LCD_SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
|
||||||
#endif
|
#endif
|
||||||
#if HAS_DGUS_LCD
|
#if ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
|
||||||
#define LCD_SERIAL_TX_BUFFER_FREE() LCD_SERIAL.available()
|
#define LCD_SERIAL_TX_BUFFER_FREE() LCD_SERIAL.available()
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@@ -112,7 +112,7 @@
|
|||||||
#else
|
#else
|
||||||
#error "LCD_SERIAL_PORT must be from 1 to 9, or -1 for Native USB."
|
#error "LCD_SERIAL_PORT must be from 1 to 9, or -1 for Native USB."
|
||||||
#endif
|
#endif
|
||||||
#if HAS_DGUS_LCD
|
#if ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
|
||||||
#define LCD_SERIAL_TX_BUFFER_FREE() LCD_SERIAL.availableForWrite()
|
#define LCD_SERIAL_TX_BUFFER_FREE() LCD_SERIAL.availableForWrite()
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@@ -138,7 +138,7 @@
|
|||||||
#define LCD_SERIAL MSERIAL(1) // dummy port
|
#define LCD_SERIAL MSERIAL(1) // dummy port
|
||||||
static_assert(false, "LCD_SERIAL_PORT must be from 1 to " STRINGIFY(NUM_UARTS) ". You can also use -1 if the board supports Native USB.")
|
static_assert(false, "LCD_SERIAL_PORT must be from 1 to " STRINGIFY(NUM_UARTS) ". You can also use -1 if the board supports Native USB.")
|
||||||
#endif
|
#endif
|
||||||
#if HAS_DGUS_LCD
|
#if ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
|
||||||
#define LCD_SERIAL_TX_BUFFER_FREE() LCD_SERIAL.availableForWrite()
|
#define LCD_SERIAL_TX_BUFFER_FREE() LCD_SERIAL.availableForWrite()
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@@ -34,7 +34,7 @@
|
|||||||
#include "../../feature/probe_temp_comp.h"
|
#include "../../feature/probe_temp_comp.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ANY(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
|
#if ANY(DWIN_CREALITY_LCD_JYERSUI, EXTENSIBLE_UI)
|
||||||
#define VERBOSE_SINGLE_PROBE
|
#define VERBOSE_SINGLE_PROBE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -765,6 +765,24 @@ namespace ExtUI {
|
|||||||
}
|
}
|
||||||
#endif
|
#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)) return;
|
||||||
|
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
|
#if HAS_JUNCTION_DEVIATION
|
||||||
|
|
||||||
float getJunctionDeviation_mm() { return planner.junction_deviation_mm; }
|
float getJunctionDeviation_mm() { return planner.junction_deviation_mm; }
|
||||||
@@ -933,6 +951,7 @@ namespace ExtUI {
|
|||||||
#if HAS_BED_PROBE
|
#if HAS_BED_PROBE
|
||||||
float getProbeOffset_mm(const axis_t axis) { return probe.offset.pos[axis]; }
|
float getProbeOffset_mm(const axis_t axis) { return probe.offset.pos[axis]; }
|
||||||
void setProbeOffset_mm(const_float_t val, const axis_t axis) { probe.offset.pos[axis] = val; }
|
void setProbeOffset_mm(const_float_t val, const axis_t axis) { probe.offset.pos[axis] = val; }
|
||||||
|
probe_limits_t getBedProbeLimits() { return probe_limits_t({ probe.min_x(), probe.min_y(), probe.max_x(), probe.max_y() }); }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(BACKLASH_GCODE)
|
#if ENABLED(BACKLASH_GCODE)
|
||||||
|
@@ -74,6 +74,7 @@ namespace ExtUI {
|
|||||||
#if ENABLED(MPC_AUTOTUNE)
|
#if ENABLED(MPC_AUTOTUNE)
|
||||||
enum mpcresult_t : uint8_t { MPC_STARTED, MPC_TEMP_ERROR, MPC_INTERRUPTED, MPC_DONE };
|
enum mpcresult_t : uint8_t { MPC_STARTED, MPC_TEMP_ERROR, MPC_INTERRUPTED, MPC_DONE };
|
||||||
#endif
|
#endif
|
||||||
|
struct probe_limits_t { float xmin, ymin, xmax, ymax; };
|
||||||
|
|
||||||
constexpr uint8_t extruderCount = EXTRUDERS;
|
constexpr uint8_t extruderCount = EXTRUDERS;
|
||||||
constexpr uint8_t hotendCount = HOTENDS;
|
constexpr uint8_t hotendCount = HOTENDS;
|
||||||
@@ -327,6 +328,13 @@ namespace ExtUI {
|
|||||||
void setLinearAdvance_mm_mm_s(const_float_t, const extruder_t);
|
void setLinearAdvance_mm_mm_s(const_float_t, const extruder_t);
|
||||||
#endif
|
#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
|
||||||
|
|
||||||
// JD or Jerk Control
|
// JD or Jerk Control
|
||||||
#if HAS_JUNCTION_DEVIATION
|
#if HAS_JUNCTION_DEVIATION
|
||||||
float getJunctionDeviation_mm();
|
float getJunctionDeviation_mm();
|
||||||
@@ -367,6 +375,7 @@ namespace ExtUI {
|
|||||||
#if HAS_BED_PROBE
|
#if HAS_BED_PROBE
|
||||||
float getProbeOffset_mm(const axis_t);
|
float getProbeOffset_mm(const axis_t);
|
||||||
void setProbeOffset_mm(const_float_t, const axis_t);
|
void setProbeOffset_mm(const_float_t, const axis_t);
|
||||||
|
probe_limits_t getBedProbeLimits();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Backlash Control
|
// Backlash Control
|
||||||
|
Reference in New Issue
Block a user