Browse Source

Fixed small feedrate bug.

Copied Camiels comments in the Configuration.h file
Erik van der Zalm 12 years ago
parent
commit
b5f6482dce
2 changed files with 14 additions and 12 deletions
  1. 11
    9
      Marlin/Configuration.h
  2. 3
    3
      Marlin/Marlin.pde

+ 11
- 9
Marlin/Configuration.h View File

@@ -15,15 +15,17 @@
15 15
 
16 16
 
17 17
 //// Calibration variables
18
-// X, Y, Z, E steps per unit - Metric Prusa Mendel with V9 extruder:
19
-float axis_steps_per_unit[] = {40, 40, 3333.92,76.2}; 
18
+// X, Y, Z, E steps per unit - Metric Mendel / Orca with V9 extruder:
19
+float axis_steps_per_unit[] = {40, 40, 3333.92, 67}; 
20
+// For E steps per unit = 67 for v9 with direct drive (needs finetuning) for other extruders this needs to be changed 
20 21
 // Metric Prusa Mendel with Makergear geared stepper extruder:
21 22
 //float axis_steps_per_unit[] = {80,80,3200/1.25,1380}; 
22 23
 
23 24
 //// Endstop Settings
24 25
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
25 26
 // The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins.
26
-const bool ENDSTOPS_INVERTING = false; //set to true to invert the logic of the endstops
27
+const bool ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops. 
28
+// For optos H21LOB set to true, for Mendel-Parts newer optos TCST2103 set to false
27 29
 
28 30
 // This determines the communication speed of the printer
29 31
 #define BAUDRATE 250000
@@ -49,10 +51,10 @@ const bool ENDSTOPS_INVERTING = false; //set to true to invert the logic of the
49 51
 #define DISABLE_E false
50 52
 
51 53
 // Inverting axis direction
52
-#define INVERT_X_DIR false
53
-#define INVERT_Y_DIR true
54
-#define INVERT_Z_DIR false
55
-#define INVERT_E_DIR true
54
+#define INVERT_X_DIR true    // for Mendel set to false, for Orca set to true
55
+#define INVERT_Y_DIR false   // for Mendel set to true, for Orca set to false
56
+#define INVERT_Z_DIR true    // for Mendel set to false, for Orca set to true
57
+#define INVERT_E_DIR true   // for direct drive extruder v9 set to true, for geared extruder set to false
56 58
 
57 59
 //// ENDSTOP SETTINGS:
58 60
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -68,8 +70,8 @@ const bool ENDSTOPS_INVERTING = false; //set to true to invert the logic of the
68 70
 
69 71
 //// MOVEMENT SETTINGS
70 72
 #define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E
71
-float max_feedrate[] = {60000, 60000, 170, 500000};
72
-float homing_feedrate[] = {1500,1500,120,0};
73
+float max_feedrate[] = {60000, 60000, 100, 500000}; // set the max speeds
74
+float homing_feedrate[] = {2400, 2400, 80, 0};  // set the homing speeds
73 75
 bool axis_relative_modes[] = {false, false, false, false};
74 76
 
75 77
 //// Acceleration settings

+ 3
- 3
Marlin/Marlin.pde View File

@@ -33,7 +33,7 @@
33 33
 #include "Marlin.h"
34 34
 #include "speed_lookuptable.h"
35 35
 
36
-char version_string[] = "0.9.2";
36
+char version_string[] = "0.9.3";
37 37
 
38 38
 #ifdef SDSUPPORT
39 39
 #include "SdFat.h"
@@ -947,7 +947,7 @@ inline void get_coordinates()
947 947
 
948 948
 void prepare_move()
949 949
 {
950
-  plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60);
950
+  plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60.0);
951 951
   for(int i=0; i < NUM_AXIS; i++) {
952 952
     current_position[i] = destination[i];
953 953
   }
@@ -1490,9 +1490,9 @@ void plan_buffer_line(float x, float y, float z, float e, float feed_rate) {
1490 1490
   block->speed_x = delta_x_mm * multiplier;
1491 1491
   block->speed_y = delta_y_mm * multiplier;
1492 1492
   block->speed_e = delta_e_mm * multiplier; 
1493
-
1494 1493
   block->nominal_speed = block->millimeters * multiplier;
1495 1494
   block->nominal_rate = ceil(block->step_event_count * multiplier / 60);  
1495
+
1496 1496
   if(block->nominal_rate < 120) block->nominal_rate = 120;
1497 1497
   block->entry_speed = safe_speed(block);
1498 1498
 

Loading…
Cancel
Save