CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XYZ_CHAR macro

Browse Source
This commit is contained in:
Scott Lahteine 2020-03-01 10:36:15 -06:00
parent 3473b21710
commit c4db8e49a7
12 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/src/core/types.h
View File

@ -483,3 +483,4 @@ struct XYZEval {
#undef FI #undef FI
const xyze_char_t axis_codes { 'X', 'Y', 'Z', 'E' }; const xyze_char_t axis_codes { 'X', 'Y', 'Z', 'E' };
#define XYZ_CHAR(A) ('X' + char(A))

24
Marlin/src/core/utility.cpp
View File

@ -139,17 +139,17 @@ void safe_delay(millis_t ms) {
#endif #endif
#if HAS_ABL_OR_UBL #if HAS_ABL_OR_UBL
SERIAL_ECHOLNPGM("Auto Bed Leveling: " SERIAL_ECHOPGM("Auto Bed Leveling: ");
#if ENABLED(AUTO_BED_LEVELING_LINEAR) #if ENABLED(AUTO_BED_LEVELING_LINEAR)
"LINEAR" SERIAL_ECHOLNPGM("LINEAR");
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR) #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
"BILINEAR" SERIAL_ECHOLNPGM("BILINEAR");
#elif ENABLED(AUTO_BED_LEVELING_3POINT) #elif ENABLED(AUTO_BED_LEVELING_3POINT)
"3POINT" SERIAL_ECHOLNPGM("3POINT");
#elif ENABLED(AUTO_BED_LEVELING_UBL) #elif ENABLED(AUTO_BED_LEVELING_UBL)
"UBL" SERIAL_ECHOLNPGM("UBL");
#endif #endif
);
if (planner.leveling_active) { if (planner.leveling_active) {
SERIAL_ECHOLNPGM(" (enabled)"); SERIAL_ECHOLNPGM(" (enabled)");
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
@ -160,7 +160,7 @@ void safe_delay(millis_t ms) {
SERIAL_ECHOPGM("ABL Adjustment X"); SERIAL_ECHOPGM("ABL Adjustment X");
LOOP_XYZ(a) { LOOP_XYZ(a) {
float v = planner.get_axis_position_mm(AxisEnum(a)) - current_position[a]; float v = planner.get_axis_position_mm(AxisEnum(a)) - current_position[a];
SERIAL_CHAR(' ', 'X' + char(a)); SERIAL_CHAR(' ', XYZ_CHAR(a));
if (v > 0) SERIAL_CHAR('+'); if (v > 0) SERIAL_CHAR('+');
SERIAL_ECHO(v); SERIAL_ECHO(v);
} }

6
Marlin/src/gcode/calibrate/M425.cpp
View File

@ -47,7 +47,7 @@ void GcodeSuite::M425() {
bool noArgs = true; bool noArgs = true;
LOOP_XYZ(a) { LOOP_XYZ(a) {
if (parser.seen(axis_codes[a])) { if (parser.seen(XYZ_CHAR(a))) {
planner.synchronize(); planner.synchronize();
backlash.distance_mm[a] = parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a)); backlash.distance_mm[a] = parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a));
noArgs = false; noArgs = false;
@ -75,7 +75,7 @@ void GcodeSuite::M425() {
SERIAL_ECHOLNPAIR(" Correction Amount/Fade-out: F", backlash.get_correction(), " (F1.0 = full, F0.0 = none)"); SERIAL_ECHOLNPAIR(" Correction Amount/Fade-out: F", backlash.get_correction(), " (F1.0 = full, F0.0 = none)");
SERIAL_ECHOPGM(" Backlash Distance (mm): "); SERIAL_ECHOPGM(" Backlash Distance (mm): ");
LOOP_XYZ(a) { LOOP_XYZ(a) {
SERIAL_CHAR(' ', axis_codes[a]); SERIAL_CHAR(' ', XYZ_CHAR(a));
SERIAL_ECHO(backlash.distance_mm[a]); SERIAL_ECHO(backlash.distance_mm[a]);
SERIAL_EOL(); SERIAL_EOL();
} }
@ -88,7 +88,7 @@ void GcodeSuite::M425() {
SERIAL_ECHOPGM(" Average measured backlash (mm):"); SERIAL_ECHOPGM(" Average measured backlash (mm):");
if (backlash.has_any_measurement()) { if (backlash.has_any_measurement()) {
LOOP_XYZ(a) if (backlash.has_measurement(AxisEnum(a))) { LOOP_XYZ(a) if (backlash.has_measurement(AxisEnum(a))) {
SERIAL_CHAR(' ', axis_codes[a]); SERIAL_CHAR(' ', XYZ_CHAR(a));
SERIAL_ECHO(backlash.get_measurement(AxisEnum(a))); SERIAL_ECHO(backlash.get_measurement(AxisEnum(a)));
} }
} }

4
Marlin/src/gcode/calibrate/M666.cpp
View File

@ -40,10 +40,10 @@
void GcodeSuite::M666() { void GcodeSuite::M666() {
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(">>> M666"); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(">>> M666");
LOOP_XYZ(i) { LOOP_XYZ(i) {
if (parser.seen(axis_codes[i])) { if (parser.seen(XYZ_CHAR(i))) {
const float v = parser.value_linear_units(); const float v = parser.value_linear_units();
if (v * Z_HOME_DIR <= 0) delta_endstop_adj[i] = v; if (v * Z_HOME_DIR <= 0) delta_endstop_adj[i] = v;
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("delta_endstop_adj[", axis_codes[i], "] = ", delta_endstop_adj[i]); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("delta_endstop_adj[", XYZ_CHAR(i), "] = ", delta_endstop_adj[i]);
} }
} }
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< M666"); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< M666");

2
Marlin/src/gcode/control/M605.cpp
View File

@ -138,7 +138,7 @@
HOTEND_LOOP() { HOTEND_LOOP() {
DEBUG_ECHOPAIR_P(SP_T_STR, int(e)); DEBUG_ECHOPAIR_P(SP_T_STR, int(e));
LOOP_XYZ(a) DEBUG_ECHOPAIR(" hotend_offset[", int(e), "].", axis_codes[a] | 0x20, "=", hotend_offset[e][a]); LOOP_XYZ(a) DEBUG_ECHOPAIR(" hotend_offset[", int(e), "].", XYZ_CHAR(a) | 0x20, "=", hotend_offset[e][a]);
DEBUG_EOL(); DEBUG_EOL();
} }
DEBUG_EOL(); DEBUG_EOL();

4
Marlin/src/gcode/feature/pause/G61.cpp
View File

@ -56,10 +56,10 @@ void GcodeSuite::G61(void) {
SERIAL_ECHOPAIR(STR_RESTORING_POS " S", int(slot)); SERIAL_ECHOPAIR(STR_RESTORING_POS " S", int(slot));
LOOP_XYZ(i) { LOOP_XYZ(i) {
destination[i] = parser.seen(axis_codes[i]) destination[i] = parser.seen(XYZ_CHAR(i))
? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i) ? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
: current_position[i]; : current_position[i];
SERIAL_CHAR(' ', axis_codes[i]); SERIAL_CHAR(' ', XYZ_CHAR(i));
SERIAL_ECHO_F(destination[i]); SERIAL_ECHO_F(destination[i]);
} }
SERIAL_EOL(); SERIAL_EOL();

2
Marlin/src/gcode/feature/trinamic/M911-M914.cpp
View File

@ -348,7 +348,7 @@
bool report = true; bool report = true;
const uint8_t index = parser.byteval('I'); const uint8_t index = parser.byteval('I');
LOOP_XYZ(i) if (parser.seen(axis_codes[i])) { LOOP_XYZ(i) if (parser.seen(XYZ_CHAR(i))) {
const int16_t value = parser.value_int(); const int16_t value = parser.value_int();
report = false; report = false;
switch (i) { switch (i) {

2
Marlin/src/gcode/gcode.cpp
View File

@ -135,7 +135,7 @@ void GcodeSuite::get_destination_from_command() {
// Get new XYZ position, whether absolute or relative // Get new XYZ position, whether absolute or relative
LOOP_XYZ(i) { LOOP_XYZ(i) {
if ( (seen[i] = parser.seenval(axis_codes[i])) ) { if ( (seen[i] = parser.seenval(XYZ_CHAR(i))) ) {
const float v = parser.value_axis_units((AxisEnum)i); const float v = parser.value_axis_units((AxisEnum)i);
if (skip_move) if (skip_move)
destination[i] = current_position[i]; destination[i] = current_position[i];

2
Marlin/src/gcode/geometry/M206_M428.cpp
View File

@ -38,7 +38,7 @@
*/ */
void GcodeSuite::M206() { void GcodeSuite::M206() {
LOOP_XYZ(i) LOOP_XYZ(i)
if (parser.seen(axis_codes[i])) if (parser.seen(XYZ_CHAR(i)))
set_home_offset((AxisEnum)i, parser.value_linear_units()); set_home_offset((AxisEnum)i, parser.value_linear_units());
#if ENABLED(MORGAN_SCARA) #if ENABLED(MORGAN_SCARA)

4
Marlin/src/gcode/host/M114.cpp
View File

@ -45,8 +45,8 @@
void report_xyz(const xyz_pos_t &pos, const uint8_t precision=3) { void report_xyz(const xyz_pos_t &pos, const uint8_t precision=3) {
char str[12]; char str[12];
for (uint8_t a = X_AXIS; a <= Z_AXIS; a++) { LOOP_XYZ(a) {
SERIAL_CHAR(' ', axis_codes[a], ':'); SERIAL_CHAR(' ', XYZ_CHAR(a), ':');
SERIAL_ECHO(dtostrf(pos[a], 1, precision, str)); SERIAL_ECHO(dtostrf(pos[a], 1, precision, str));
} }
SERIAL_EOL(); SERIAL_EOL();

4
Marlin/src/gcode/motion/M290.cpp
View File

@ -76,8 +76,8 @@
*/ */
void GcodeSuite::M290() { void GcodeSuite::M290() {
#if ENABLED(BABYSTEP_XY) #if ENABLED(BABYSTEP_XY)
for (uint8_t a = X_AXIS; a <= Z_AXIS; a++) LOOP_XYZ(a)
if (parser.seenval(axis_codes[a]) || (a == Z_AXIS && parser.seenval('S'))) { if (parser.seenval(XYZ_CHAR(a)) || (a == Z_AXIS && parser.seenval('S'))) {
const float offs = constrain(parser.value_axis_units((AxisEnum)a), -2, 2); const float offs = constrain(parser.value_axis_units((AxisEnum)a), -2, 2);
babystep.add_mm((AxisEnum)a, offs); babystep.add_mm((AxisEnum)a, offs);
#if ENABLED(BABYSTEP_ZPROBE_OFFSET) #if ENABLED(BABYSTEP_ZPROBE_OFFSET)

4
Marlin/src/module/motion.cpp
View File

@ -587,7 +587,7 @@ void restore_feedrate_and_scaling() {
#endif #endif
if (DEBUGGING(LEVELING)) if (DEBUGGING(LEVELING))
SERIAL_ECHOLNPAIR("Axis ", axis_codes[axis], " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]); SERIAL_ECHOLNPAIR("Axis ", XYZ_CHAR(axis), " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
} }
/** /**
@ -1779,7 +1779,7 @@ void homeaxis(const AxisEnum axis) {
#if HAS_WORKSPACE_OFFSET #if HAS_WORKSPACE_OFFSET
void update_workspace_offset(const AxisEnum axis) { void update_workspace_offset(const AxisEnum axis) {
workspace_offset[axis] = home_offset[axis] + position_shift[axis]; workspace_offset[axis] = home_offset[axis] + position_shift[axis];
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Axis ", axis_codes[axis], " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Axis ", XYZ_CHAR(axis), " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
} }
#endif #endif