Skip to content

Commit 59c8857

Browse files
thinkyheadthinkyhead
committed
🩹 Various simple fixes
1 parent 6e38ec3 commit 59c8857

File tree

16 files changed

+53
-64
lines changed

16 files changed

+53
-64
lines changed

‎Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ enum MeshLevelingState : char {
3232
MeshReset // G29 S5
3333
};
3434

35-
#define MESH_X_DIST (float(MESH_MAX_X - (MESH_MIN_X)) / (GRID_MAX_CELLS_X))
36-
#define MESH_Y_DIST (float(MESH_MAX_Y - (MESH_MIN_Y)) / (GRID_MAX_CELLS_Y))
35+
#define MESH_X_DIST (float((MESH_MAX_X) - (MESH_MIN_X)) / (GRID_MAX_CELLS_X))
36+
#define MESH_Y_DIST (float((MESH_MAX_Y) - (MESH_MIN_Y)) / (GRID_MAX_CELLS_Y))
3737

3838
class mesh_bed_leveling {
3939
public:

‎Marlin/src/feature/bedlevel/ubl/ubl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ enum MeshPointType : char { INVALID, REAL, SET_IN_BITMAP, CLOSEST };
3838

3939
struct mesh_index_pair;
4040

41-
#define MESH_X_DIST (float(MESH_MAX_X - (MESH_MIN_X)) / (GRID_MAX_CELLS_X))
42-
#define MESH_Y_DIST (float(MESH_MAX_Y - (MESH_MIN_Y)) / (GRID_MAX_CELLS_Y))
41+
#define MESH_X_DIST (float((MESH_MAX_X) - (MESH_MIN_X)) / (GRID_MAX_CELLS_X))
42+
#define MESH_Y_DIST (float((MESH_MAX_Y) - (MESH_MIN_Y)) / (GRID_MAX_CELLS_Y))
4343

4444
#if ENABLED(OPTIMIZED_MESH_STORAGE)
4545
typedef int16_t mesh_store_t[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];

‎Marlin/src/gcode/calibrate/G34.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void GcodeSuite::G34() {
5858
// Move XY to safe position
5959
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Parking XY");
6060
const xy_pos_t safe_pos = GANTRY_CALIBRATION_SAFE_POSITION;
61-
do_blocking_move_to(safe_pos, MMM_TO_MMS(GANTRY_CALIBRATION_XY_PARK_FEEDRATE));
61+
do_blocking_move_to_xy(safe_pos, MMM_TO_MMS(GANTRY_CALIBRATION_XY_PARK_FEEDRATE));
6262
#endif
6363

6464
const float move_distance = parser.intval('Z', GANTRY_CALIBRATION_EXTRA_HEIGHT),

‎Marlin/src/gcode/control/M350_M351.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929

3030
#if NUM_AXES == XYZ && EXTRUDERS >= 1
3131
#define HAS_M350_B_PARAM 1 // "5th axis" (after E0) for an original XYZEB setup.
32-
#if AXIS_COLLISION('B')
33-
#error "M350 parameter 'B' collision with axis name."
34-
#endif
3532
#endif
3633

3734
/**

‎Marlin/src/gcode/feature/camera/M240.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,19 +128,21 @@ void GcodeSuite::M240() {
128128

129129
if (homing_needed_error()) return;
130130

131-
const xyz_pos_t old_pos = {
131+
const xyz_pos_t old_pos = NUM_AXIS_ARRAY(
132132
current_position.x + parser.linearval('A'),
133133
current_position.y + parser.linearval('B'),
134-
current_position.z
135-
};
134+
current_position.z,
135+
current_position.i, current_position.j, current_position.k,
136+
current_position.u, current_position.v, current_position.w
137+
);
136138

137139
#ifdef PHOTO_RETRACT_MM
138140
const float rval = parser.linearval('R', _PHOTO_RETRACT_MM);
139141
const feedRate_t sval = parser.feedrateval('S', TERN(ADVANCED_PAUSE_FEATURE, PAUSE_PARK_RETRACT_FEEDRATE, TERN(FWRETRACT, RETRACT_FEEDRATE, 45)));
140142
e_move_m240(-rval, sval);
141143
#endif
142144

143-
feedRate_t fr_mm_s = MMM_TO_MMS(parser.linearval('F'));
145+
feedRate_t fr_mm_s = parser.feedrateval('F');
144146
if (fr_mm_s) NOLESS(fr_mm_s, 10.0f);
145147

146148
constexpr xyz_pos_t photo_position = PHOTO_POSITION;

‎Marlin/src/gcode/probe/G38.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,7 @@ void GcodeSuite::G38(const int8_t subcode) {
110110

111111
remember_feedrate_scaling_off();
112112

113-
const bool error_on_fail =
114-
#if ENABLED(G38_PROBE_AWAY)
115-
!TEST(subcode, 0)
116-
#else
117-
(subcode == 2)
118-
#endif
119-
;
113+
const bool error_on_fail = TERN(G38_PROBE_AWAY, !TEST(subcode, 0), subcode == 2);
120114

121115
// If any axis has enough movement, do the move
122116
LOOP_NUM_AXES(i)

‎Marlin/src/lcd/extui/ui_api.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -843,11 +843,13 @@ namespace ExtUI {
843843
#endif // BABYSTEPPING
844844

845845
float getZOffset_mm() {
846-
return (0.0f
846+
return (
847847
#if HAS_BED_PROBE
848-
+ probe.offset.z
848+
probe.offset.z
849849
#elif ENABLED(BABYSTEP_DISPLAY_TOTAL)
850-
+ planner.mm_per_step[Z_AXIS] * babystep.axis_total[BS_AXIS_IND(Z_AXIS)]
850+
planner.mm_per_step[Z_AXIS] * babystep.axis_total[BS_AXIS_IND(Z_AXIS)]
851+
#else
852+
0.0f
851853
#endif
852854
);
853855
}

‎Marlin/src/lcd/language/language_fr.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ namespace Language_fr {
367367
LSTR MSG_STOPPED = _UxGT("STOPPÉ");
368368
LSTR MSG_CONTROL_RETRACT = _UxGT("Rétractation mm");
369369
LSTR MSG_CONTROL_RETRACT_SWAP = _UxGT("Ech. rétr. mm");
370-
LSTR MSG_CONTROL_RETRACTF = _UxGT("Vit. rétract°");
370+
LSTR MSG_CONTROL_RETRACTF = _UxGT("Vit. rétract") LCD_STR_DEGREE;
371371
LSTR MSG_CONTROL_RETRACT_ZHOP = _UxGT("Saut Z mm");
372372
LSTR MSG_CONTROL_RETRACT_RECOVER = _UxGT("Rét.reprise mm");
373373
LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP = _UxGT("Ech.reprise mm");
@@ -378,7 +378,7 @@ namespace Language_fr {
378378
LSTR MSG_TOOL_CHANGE_ZLIFT = _UxGT("Augmenter Z");
379379
LSTR MSG_SINGLENOZZLE_PRIME_SPEED = _UxGT("Vitesse primaire");
380380
LSTR MSG_SINGLENOZZLE_WIPE_RETRACT = _UxGT("Purge Retract");
381-
LSTR MSG_SINGLENOZZLE_RETRACT_SPEED = _UxGT("Vitesse rétract°");
381+
LSTR MSG_SINGLENOZZLE_RETRACT_SPEED = _UxGT("Vitesse rétract") LCD_STR_DEGREE;
382382
LSTR MSG_FILAMENT_PARK_ENABLED = _UxGT("Garer Extrudeur");
383383
LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED = _UxGT("Vitesse reprise");
384384
LSTR MSG_SINGLENOZZLE_FAN_SPEED = _UxGT("Vit. ventil.");

‎Marlin/src/lcd/language/language_ru.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,10 @@ namespace Language_ru {
218218
LSTR MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Построить свою сетку");
219219
LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Правка сетки завершена");
220220
#else
221-
LSTR MSG_UBL_SET_TEMP_BED = LCD_STR_THERMOMETER _UxGT(" стола, ") LCD_STR_DEGREE "C";
222-
LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" стола,") LCD_STR_DEGREE "C";
223-
LSTR MSG_UBL_SET_TEMP_HOTEND = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE "C";
224-
LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" сопла,") LCD_STR_DEGREE "C";
221+
LSTR MSG_UBL_SET_TEMP_BED = LCD_STR_THERMOMETER _UxGT(" стола, ") LCD_STR_DEGREE _UxGT("C");
222+
LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" стола,") LCD_STR_DEGREE _UxGT("C");
223+
LSTR MSG_UBL_SET_TEMP_HOTEND = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE _UxGT("C");
224+
LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" сопла,") LCD_STR_DEGREE _UxGT("C");
225225
LSTR MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Построить свою");
226226
LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Правка завершена");
227227
#endif
@@ -343,12 +343,12 @@ namespace Language_ru {
343343
LSTR MSG_MOVE_100MM = _UxGT("Движение 100mm");
344344
LSTR MSG_SPEED = _UxGT("Скорость");
345345
LSTR MSG_BED_Z = _UxGT("Z стола");
346-
LSTR MSG_NOZZLE = _UxGT("Сопло, ") LCD_STR_DEGREE "C";
346+
LSTR MSG_NOZZLE = _UxGT("Сопло, ") LCD_STR_DEGREE _UxGT("C");
347347
LSTR MSG_NOZZLE_N = _UxGT("Сопло ~");
348348
LSTR MSG_NOZZLE_PARKED = _UxGT("Сопло запарковано");
349349
LSTR MSG_NOZZLE_STANDBY = _UxGT("Сопло ожидает");
350-
LSTR MSG_BED = _UxGT("Стол, ") LCD_STR_DEGREE "C";
351-
LSTR MSG_CHAMBER = _UxGT("Камера,") LCD_STR_DEGREE "C";
350+
LSTR MSG_BED = _UxGT("Стол, ") LCD_STR_DEGREE _UxGT("C");
351+
LSTR MSG_CHAMBER = _UxGT("Камера,") LCD_STR_DEGREE _UxGT("C");
352352
#if LCD_WIDTH > 21 || HAS_DWIN_E3V2
353353
LSTR MSG_COOLER = _UxGT("Охлаждение лазера");
354354
LSTR MSG_COOLER_TOGGLE = _UxGT("Переключ. охлажд.");

‎Marlin/src/lcd/language/language_uk.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,10 @@ namespace Language_uk {
213213
LSTR MSG_UBL_MOVING_TO_NEXT = _UxGT("Рух до наступної");
214214
LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("Активувати UBL");
215215
LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("Деактивувати UBL");
216-
LSTR MSG_UBL_SET_TEMP_BED = LCD_STR_THERMOMETER _UxGT(" столу, ") LCD_STR_DEGREE "C";
217-
LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" столу,") LCD_STR_DEGREE "C";
218-
LSTR MSG_UBL_SET_TEMP_HOTEND = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE "C";
219-
LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" сопла,") LCD_STR_DEGREE "C";
216+
LSTR MSG_UBL_SET_TEMP_BED = LCD_STR_THERMOMETER _UxGT(" столу, ") LCD_STR_DEGREE _UxGT("C");
217+
LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" столу,") LCD_STR_DEGREE _UxGT("C");
218+
LSTR MSG_UBL_SET_TEMP_HOTEND = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE _UxGT("C");
219+
LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" сопла,") LCD_STR_DEGREE _UxGT("C");
220220
#if LCD_WIDTH > 21 || HAS_DWIN_E3V2
221221
LSTR MSG_UBL_EDIT_CUSTOM_MESH = _UxGT("Редагувати свою сітку");
222222
LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Точне редагування сітки");
@@ -344,12 +344,12 @@ namespace Language_uk {
344344
LSTR MSG_MOVE_100MM = _UxGT("Рух 100mm");
345345
LSTR MSG_SPEED = _UxGT("Швидкість");
346346
LSTR MSG_BED_Z = _UxGT("Z Столу");
347-
LSTR MSG_NOZZLE = _UxGT("Сопло, ") LCD_STR_DEGREE "C";
347+
LSTR MSG_NOZZLE = _UxGT("Сопло, ") LCD_STR_DEGREE _UxGT("C");
348348
LSTR MSG_NOZZLE_N = _UxGT("Сопло ~");
349349
LSTR MSG_NOZZLE_PARKED = _UxGT("Сопло запарковане");
350350
LSTR MSG_NOZZLE_STANDBY = _UxGT("Сопло очікує");
351-
LSTR MSG_BED = _UxGT("Стіл, ") LCD_STR_DEGREE "C";
352-
LSTR MSG_CHAMBER = _UxGT("Камера,") LCD_STR_DEGREE "C";
351+
LSTR MSG_BED = _UxGT("Стіл, ") LCD_STR_DEGREE _UxGT("C");
352+
LSTR MSG_CHAMBER = _UxGT("Камера,") LCD_STR_DEGREE _UxGT("C");
353353
#if LCD_WIDTH > 21 || HAS_DWIN_E3V2
354354
LSTR MSG_COOLER = _UxGT("Охолодження лазеру");
355355
LSTR MSG_COOLER_TOGGLE = _UxGT("Перемк. охолодж.");

0 commit comments

Comments
 (0)