changed default acceleratrion and feedrate

MarginallyClever · Feb 2, 2019 · 45e43ff · 45e43ff
1 parent 0478561
commit 45e43ff
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/robot_polargraph.h b/robot_polargraph.h
@@ -26,15 +26,15 @@
 #define NUM_SERVOS           (1)
 #define NUM_TOOLS            (1)
 
-#define MAX_FEEDRATE         (20000.0)  // depends on timer interrupt & hardware
-#define MIN_FEEDRATE         (100)
-#define DEFAULT_FEEDRATE     (9000.0)
+#define MAX_FEEDRATE         (1500.0)  // depends on timer interrupt & hardware
+#define MIN_FEEDRATE         (1)
+#define DEFAULT_FEEDRATE     (900.0)
 
-#define MAX_ACCELERATION     (10000)
-#define MIN_ACCELERATION     (100)
-#define DEFAULT_ACCELERATION (1000)
+#define MAX_ACCELERATION     (1000)
+#define MIN_ACCELERATION     (1)
+#define DEFAULT_ACCELERATION (400)
 
-#define MAX_JERK             (15.0)
+#define MAX_JERK             (5.0)
 
 
 #if MACHINE_HARDWARE_VERSION == 5

diff --git a/robot_traditionalxy.cpp b/robot_traditionalxy.cpp
@@ -21,8 +21,8 @@ void IK(const float *const cartesian, long *motorStepArray) {
   float y = cartesian[1];
   float z = cartesian[2];
 
-  motorStepArray[0] = lround((x) / THREAD_PER_STEP);
-  motorStepArray[1] = lround((y) / THREAD_PER_STEP);
+  motorStepArray[0] = lround(x / THREAD_PER_STEP);
+  motorStepArray[1] = lround(y / THREAD_PER_STEP);
 
   motorStepArray[NUM_MOTORS] = z;
 }

diff --git a/robot_traditionalxy.h b/robot_traditionalxy.h
@@ -14,9 +14,6 @@
 
 #define STEP_DELAY           (50)  // delay between steps, in milliseconds, when doing fixed tasks like homing
 
-#define MAX_ACCELERATION     (5000)
-#define MIN_ACCELERATION     (100)
-
 // servo angles for pen control
 #define PEN_UP_ANGLE         (90)
 #define PEN_DOWN_ANGLE       (50)  // Some steppers don't like 0 degrees
@@ -26,11 +23,14 @@
 #define NUM_SERVOS           (1)
 #define NUM_TOOLS            (1)
 
-#define MAX_FEEDRATE         (40000.0)  // depends on timer interrupt & hardware
-#define MIN_FEEDRATE         (100)
+#define MAX_FEEDRATE         (1500.0)  // depends on timer interrupt & hardware
+#define MIN_FEEDRATE         (5)
+#define DEFAULT_FEEDRATE     (200.0)
+
+#define MAX_ACCELERATION     (2000)
+#define MIN_ACCELERATION     (2)
+#define DEFAULT_ACCELERATION (1000)
 #define MAX_JERK             (5.0)
-#define DEFAULT_FEEDRATE     (15000.0)
-#define DEFAULT_ACCELERATION (2500)
 
 #define SUBDIVIDE_LINES
 #define SEGMENT_PER_CM_LINE  (1)  // lines are subdivided.  How long are the divisions?