From 675677b5805722bced4eef503a0f21cec8777021 Mon Sep 17 00:00:00 2001 From: Matt Staniszewski Date: Tue, 29 Oct 2019 13:38:26 -0400 Subject: [PATCH] Clean up the Othermill Pro settings for clarity --- g2core/settings/settings_othermill_pro.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/g2core/settings/settings_othermill_pro.h b/g2core/settings/settings_othermill_pro.h index c5a912da..bf378d1d 100644 --- a/g2core/settings/settings_othermill_pro.h +++ b/g2core/settings/settings_othermill_pro.h @@ -43,13 +43,18 @@ // interim max values for testing #undef X_VELOCITY_MAX +#undef X_FEEDRATE_MAX #undef Y_VELOCITY_MAX +#undef Y_FEEDRATE_MAX +#define X_VELOCITY_MAX 2600 +#define X_FEEDRATE_MAX X_VELOCITY_MAX +#define Y_VELOCITY_MAX 2600 +#define Y_FEEDRATE_MAX Y_VELOCITY_MAX + #undef P1_CW_SPEED_HI #undef P1_CW_SPEED_LO #undef P1_CW_PHASE_HI #undef P1_CW_PHASE_LO -#define X_VELOCITY_MAX 2600 -#define Y_VELOCITY_MAX 2600 #define P1_CW_SPEED_HI 26000 #define P1_CW_SPEED_LO 8000 #define P1_CW_PHASE_HI 0.19