Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

no x axis followup #25804

Merged
merged 2 commits into from
May 10, 2023
Merged

no x axis followup #25804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c299ec
no x axis followup
ellensp May 10, 2023
00aa51b
use NUM_AXES
thinkyhead May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Marlin/src/core/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,9 @@ class AxisBits {
el bits;
// x, y, z ... e0, e1, e2 ... hx, hy, hz
struct {
bool NUM_AXIS_LIST(x:1, y:1, z:1, i:1, j:1, k:1, u:1, v:1, w:1);
#if NUM_AXES
bool NUM_AXIS_LIST(x:1, y:1, z:1, i:1, j:1, k:1, u:1, v:1, w:1);
#endif
#define _EN_ITEM(N) bool e##N:1;
REPEAT(EXTRUDERS,_EN_ITEM)
#undef _EN_ITEM
Expand All @@ -834,7 +836,9 @@ class AxisBits {
};
// X, Y, Z ... E0, E1, E2 ... HX, HY, HZ
struct {
bool NUM_AXIS_LIST(X:1, Y:1, Z:1, I:1, J:1, K:1, U:1, V:1, W:1);
#if NUM_AXES
bool NUM_AXIS_LIST(X:1, Y:1, Z:1, I:1, J:1, K:1, U:1, V:1, W:1);
#endif
#define _EN_ITEM(N) bool E##N:1;
REPEAT(EXTRUDERS,_EN_ITEM)
#undef _EN_ITEM
Expand Down
4 changes: 3 additions & 1 deletion Marlin/src/module/stepper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ typedef struct {
union {
ena_mask_t bits;
struct {
bool NUM_AXIS_LIST(X:1, Y:1, Z:1, I:1, J:1, K:1, U:1, V:1, W:1);
#if NUM_AXES
bool NUM_AXIS_LIST(X:1, Y:1, Z:1, I:1, J:1, K:1, U:1, V:1, W:1);
#endif
#if E_STATES
bool LIST_N(E_STATES, E0:1, E1:1, E2:1, E3:1, E4:1, E5:1, E6:1, E7:1);
#endif
Expand Down
11 changes: 0 additions & 11 deletions Marlin/src/pins/stm32g0/pins_BTT_EBB42_V1_1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,6 @@
//
// Steppers
//
#define X_ENABLE_PIN -1
#define X_STEP_PIN PA10 // Unused. Assigned so Marlin will compile
#define X_DIR_PIN -1

#define Y_ENABLE_PIN -1
#define Y_STEP_PIN PA10 // Unused. Assigned so Marlin will compile
#define Y_DIR_PIN -1

#define Z_ENABLE_PIN -1
#define Z_STEP_PIN PA10 // Unused. Assigned so Marlin will compile
#define Z_DIR_PIN -1

#define E0_ENABLE_PIN PD2
#define E0_STEP_PIN PD0
Expand Down