Skip to content

Commit

Permalink
Update -compile-configs, update XY_PROBE_FEEDRATE, use NONLINEAR_EXTR…
Browse files Browse the repository at this point in the history
…USION
  • Loading branch information
classicrocker883 committed Sep 10, 2024
1 parent 1485e78 commit 6b0c224
Show file tree
Hide file tree
Showing 14 changed files with 160 additions and 124 deletions.
192 changes: 117 additions & 75 deletions .github/workflows/compile-configs.yml

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions .github/workflows/compile-configs_Ender.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.3
with:
node-version: 16
node-version: 20
- name: Cache pip
uses: actions/cache@v4
with:
Expand Down Expand Up @@ -96,9 +96,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.3
with:
node-version: 16
node-version: 20
- name: Cache pip
uses: actions/cache@v4
with:
Expand Down Expand Up @@ -175,9 +175,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.3
with:
node-version: 16
node-version: 20
- name: Cache pip
uses: actions/cache@v4
with:
Expand Down Expand Up @@ -266,9 +266,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.3
with:
node-version: 16
node-version: 20
- name: Cache pip
uses: actions/cache@v4
with:
Expand Down Expand Up @@ -349,9 +349,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.3
with:
node-version: 16
node-version: 20
- name: Cache pip
uses: actions/cache@v4
with:
Expand Down Expand Up @@ -436,9 +436,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.3
with:
node-version: 16
node-version: 20
- name: Cache pip
uses: actions/cache@v4
with:
Expand Down Expand Up @@ -517,9 +517,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.3
with:
node-version: 16
node-version: 20
- name: Cache pip
uses: actions/cache@v4
with:
Expand Down Expand Up @@ -600,9 +600,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.3
with:
node-version: 16
node-version: 20
- name: Cache pip
uses: actions/cache@v4
with:
Expand Down Expand Up @@ -696,9 +696,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.3
with:
node-version: 16
node-version: 20
- name: Cache pip
uses: actions/cache@v4
with:
Expand Down Expand Up @@ -787,9 +787,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.3
with:
node-version: 16
node-version: 20
- name: Cache pip
uses: actions/cache@v4
with:
Expand Down Expand Up @@ -878,9 +878,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.3
with:
node-version: 16
node-version: 20
- name: Cache pip
uses: actions/cache@v4
with:
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/gcode/bedlevel/G26.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@
#endif

#ifndef G26_XY_FEEDRATE
#define G26_XY_FEEDRATE (PLANNER_XY_FEEDRATE_MM_S / 3.0)
#define G26_XY_FEEDRATE (XY_PROBE_FEEDRATE_MM_S / 3.0)
#endif

#ifndef G26_XY_FEEDRATE_TRAVEL
#define G26_XY_FEEDRATE_TRAVEL (PLANNER_XY_FEEDRATE_MM_S / 1.5)
#define G26_XY_FEEDRATE_TRAVEL (XY_PROBE_FEEDRATE_MM_S / 1.5)
#endif

#if CROSSHAIRS_SIZE >= INTERSECTION_CIRCLE_RADIUS
Expand Down Expand Up @@ -783,7 +783,7 @@ void GcodeSuite::G26() {

g26.recover_filament(destination);

{ REMEMBER(fr, feedrate_mm_s, PLANNER_XY_FEEDRATE_MM_S * 0.1f);
{ REMEMBER(fr, feedrate_mm_s, XY_PROBE_FEEDRATE_MM_S * 0.1f);
plan_arc(endpoint, arc_offset, false, 0); // Draw a counter-clockwise arc
destination = current_position;
}
Expand Down
10 changes: 7 additions & 3 deletions Marlin/src/inc/Conditionals-5-post.h
Original file line number Diff line number Diff line change
Expand Up @@ -3156,13 +3156,17 @@
#if ALL(ENDSTOPPULLUPS, USE_Z_MIN_PROBE)
#define ENDSTOPPULLUP_ZMIN_PROBE
#endif
#ifndef XY_PROBE_FEEDRATE
#define XY_PROBE_FEEDRATE ((homing_feedrate_mm_m.x + homing_feedrate_mm_m.y) / 2)
#endif
#ifndef NOZZLE_TO_PROBE_OFFSET
#define NOZZLE_TO_PROBE_OFFSET { 0, 0, 0 }
#endif
#endif
#ifndef XY_PROBE_FEEDRATE
#if ALL(HAS_X_AXIS, HAS_Y_AXIS)
#define XY_PROBE_FEEDRATE ((homing_feedrate_mm_m.x + homing_feedrate_mm_m.y) / 2)
#else
#define XY_PROBE_FEEDRATE 3600.0f
#endif
#endif

/**
* XYZ Bed Skew Correction
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/marlinui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ void MarlinUI::init() {
// Add a manual move to the queue?
if (axis == NO_AXIS_ENUM || PENDING(millis(), start_time) || planner.is_full()) return;

const feedRate_t fr_mm_s = (axis < LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : PLANNER_XY_FEEDRATE_MM_S;
const feedRate_t fr_mm_s = (axis < LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;

/**
* For a rotational axis apply the "inch" to "mm" conversion factor. This mimics behaviour of the G-code G1
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/module/motion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2060,7 +2060,7 @@ float get_move_distance(const xyze_pos_t &diff OPTARG(HAS_ROTATIONAL_AXES, bool
if (planner.buffer_line(raised, fr_zfast)) {
// 2. Move to the current native XY and raised Z. Presumably this is a null move.
xyze_pos_t curpos = current_position; curpos.z = raised_parked_position.z;
if (planner.buffer_line(curpos, PLANNER_XY_FEEDRATE_MM_S)) {
if (planner.buffer_line(curpos, XY_PROBE_FEEDRATE_MM_S)) {
// 3. Lower Z back down
line_to_current_position(fr_zfast);
}
Expand Down
2 changes: 0 additions & 2 deletions Marlin/src/module/motion.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ extern xyz_pos_t cartes;
#define XY_PROBE_FEEDRATE_MM_S xy_probe_feedrate_mm_s
#elif defined(XY_PROBE_FEEDRATE)
#define XY_PROBE_FEEDRATE_MM_S MMM_TO_MMS(XY_PROBE_FEEDRATE)
#else
#define XY_PROBE_FEEDRATE_MM_S PLANNER_XY_FEEDRATE_MM_S
#endif

#if HAS_BED_PROBE
Expand Down
14 changes: 3 additions & 11 deletions Marlin/src/module/planner.h
Original file line number Diff line number Diff line change
Expand Up @@ -356,12 +356,12 @@ typedef struct PlannerSettings {
#undef _DLIM
#endif

feedRate_t max_feedrate_mm_s[DISTINCT_AXES]; // (mm/s) M203 XYZE - Max speeds
feedRate_t max_feedrate_mm_s[DISTINCT_AXES], // (mm/s) M203 XYZE - Max speeds
min_feedrate_mm_s, // (mm/s) M205 S - Minimum linear feedrate
min_travel_feedrate_mm_s; // (mm/s) M205 T - Minimum travel feedrate
float acceleration, // (mm/s^2) M204 S - Normal acceleration. DEFAULT ACCELERATION for all printing moves.
retract_acceleration, // (mm/s^2) M204 R - Retract acceleration. Filament pull-back and push-forward while standing still in the other axes
travel_acceleration; // (mm/s^2) M204 T - Travel acceleration. DEFAULT ACCELERATION for all NON printing moves.
feedRate_t min_feedrate_mm_s, // (mm/s) M205 S - Minimum linear feedrate
min_travel_feedrate_mm_s; // (mm/s) M205 T - Minimum travel feedrate
} planner_settings_t;

#if ENABLED(IMPROVE_HOMING_RELIABILITY)
Expand Down Expand Up @@ -1113,14 +1113,6 @@ class Planner {
#endif // HAS_JUNCTION_DEVIATION
};

#if HAS_Y_AXIS
#define PLANNER_XY_FEEDRATE_MM_S _MIN(planner.settings.max_feedrate_mm_s[X_AXIS], planner.settings.max_feedrate_mm_s[Y_AXIS])
#elif HAS_X_AXIS
#define PLANNER_XY_FEEDRATE_MM_S planner.settings.max_feedrate_mm_s[X_AXIS]
#else
#define PLANNER_XY_FEEDRATE_MM_S 60.0f
#endif

#define ANY_AXIS_MOVES(BLOCK) \
(false NUM_AXIS_GANG( \
|| BLOCK->steps.a, || BLOCK->steps.b, || BLOCK->steps.c, \
Expand Down
2 changes: 1 addition & 1 deletion configurations/Voxelab Aquila/BLT/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -2370,7 +2370,7 @@
* underextrusion at high extruder speeds that are otherwise well-behaved (i.e., not skipping).
* For better results also enable ADAPTIVE_STEP_SMOOTHING.
*/
//#define NONLINEAR_EXTRUSION // (560 bytes of flash)
#define NONLINEAR_EXTRUSION // (560 bytes of flash)

// @section leveling

Expand Down
2 changes: 1 addition & 1 deletion configurations/Voxelab Aquila/Default/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -2370,7 +2370,7 @@
* underextrusion at high extruder speeds that are otherwise well-behaved (i.e., not skipping).
* For better results also enable ADAPTIVE_STEP_SMOOTHING.
*/
//#define NONLINEAR_EXTRUSION // (560 bytes of flash)
#define NONLINEAR_EXTRUSION // (560 bytes of flash)

// @section leveling

Expand Down
2 changes: 1 addition & 1 deletion configurations/Voxelab Aquila/MM/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -2370,7 +2370,7 @@
* underextrusion at high extruder speeds that are otherwise well-behaved (i.e., not skipping).
* For better results also enable ADAPTIVE_STEP_SMOOTHING.
*/
//#define NONLINEAR_EXTRUSION // (560 bytes of flash)
#define NONLINEAR_EXTRUSION // (560 bytes of flash)

// @section leveling

Expand Down
2 changes: 1 addition & 1 deletion configurations/Voxelab Aquila/UBL/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -2370,7 +2370,7 @@
* underextrusion at high extruder speeds that are otherwise well-behaved (i.e., not skipping).
* For better results also enable ADAPTIVE_STEP_SMOOTHING.
*/
//#define NONLINEAR_EXTRUSION // (560 bytes of flash)
#define NONLINEAR_EXTRUSION // (560 bytes of flash)

// @section leveling

Expand Down
2 changes: 1 addition & 1 deletion configurations/Voxelab Aquila/X3/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -2370,7 +2370,7 @@
* underextrusion at high extruder speeds that are otherwise well-behaved (i.e., not skipping).
* For better results also enable ADAPTIVE_STEP_SMOOTHING.
*/
//#define NONLINEAR_EXTRUSION // (560 bytes of flash)
#define NONLINEAR_EXTRUSION // (560 bytes of flash)

// @section leveling

Expand Down
2 changes: 1 addition & 1 deletion ini/features.ini
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ CONTROLLER_FAN_EDITABLE = build_src_filter=+<src/gcode/feature/co
HAS_ZV_SHAPING = build_src_filter=+<src/gcode/feature/input_shaping/M593.cpp>
GCODE_MACROS = build_src_filter=+<src/gcode/feature/macro/M810-M819.cpp>
GRADIENT_MIX = build_src_filter=+<src/gcode/feature/mixing/M166.cpp>
NONLINEAR_EXTRUSION = build_src_filter=+<src/gcode/feature/nonlinear>
NONLINEAR_EXTRUSION = build_src_filter=+<src/gcode/feature/nonlinear/M592.cpp>
HAS_SAVED_POSITIONS = build_src_filter=+<src/gcode/feature/pause/G60.cpp> +<src/gcode/feature/pause/G61.cpp>
PARK_HEAD_ON_PAUSE = build_src_filter=+<src/gcode/feature/pause/M125.cpp>
FILAMENT_LOAD_UNLOAD_GCODES = build_src_filter=+<src/gcode/feature/pause/M701_M702.cpp>
Expand Down

0 comments on commit 6b0c224

Please sign in to comment.