浏览代码

Merge branch 'Development' into fix_temperature_minmax

Latest upstream commits
Scott Lahteine 10 年前
父节点
当前提交
03fa9fae9f

+ 15
- 64
Marlin/Marlin_main.cpp 查看文件

4052
 }
4052
 }
4053
 
4053
 
4054
 #ifdef SCARA
4054
 #ifdef SCARA
4055
-
4056
-  /**
4057
-   * M360: SCARA calibration: Move to cal-position ThetaA (0 deg calibration)
4058
-   */
4059
-  inline bool gcode_M360() {
4060
-    SERIAL_ECHOLN(" Cal: Theta 0 ");
4055
+  bool SCARA_move_to_cal(uint8_t delta_x, uint8_t delta_y) {
4061
     //SoftEndsEnabled = false;              // Ignore soft endstops during calibration
4056
     //SoftEndsEnabled = false;              // Ignore soft endstops during calibration
4062
     //SERIAL_ECHOLN(" Soft endstops disabled ");
4057
     //SERIAL_ECHOLN(" Soft endstops disabled ");
4063
     if (! Stopped) {
4058
     if (! Stopped) {
4064
       //get_coordinates(); // For X Y Z E F
4059
       //get_coordinates(); // For X Y Z E F
4065
-      delta[X_AXIS] = 0;
4066
-      delta[Y_AXIS] = 120;
4060
+      delta[X_AXIS] = delta_x;
4061
+      delta[Y_AXIS] = delta_y;
4067
       calculate_SCARA_forward_Transform(delta);
4062
       calculate_SCARA_forward_Transform(delta);
4068
       destination[X_AXIS] = delta[X_AXIS]/axis_scaling[X_AXIS];
4063
       destination[X_AXIS] = delta[X_AXIS]/axis_scaling[X_AXIS];
4069
       destination[Y_AXIS] = delta[Y_AXIS]/axis_scaling[Y_AXIS];
4064
       destination[Y_AXIS] = delta[Y_AXIS]/axis_scaling[Y_AXIS];
4075
   }
4070
   }
4076
 
4071
 
4077
   /**
4072
   /**
4073
+   * M360: SCARA calibration: Move to cal-position ThetaA (0 deg calibration)
4074
+   */
4075
+  inline bool gcode_M360() {
4076
+    SERIAL_ECHOLN(" Cal: Theta 0 ");
4077
+    return SCARA_move_to_cal(0, 120);
4078
+  }
4079
+
4080
+  /**
4078
    * M361: SCARA calibration: Move to cal-position ThetaB (90 deg calibration - steps per degree)
4081
    * M361: SCARA calibration: Move to cal-position ThetaB (90 deg calibration - steps per degree)
4079
    */
4082
    */
4080
   inline bool gcode_M361() {
4083
   inline bool gcode_M361() {
4081
     SERIAL_ECHOLN(" Cal: Theta 90 ");
4084
     SERIAL_ECHOLN(" Cal: Theta 90 ");
4082
-    //SoftEndsEnabled = false;              // Ignore soft endstops during calibration
4083
-    //SERIAL_ECHOLN(" Soft endstops disabled ");
4084
-    if (! Stopped) {
4085
-      //get_coordinates(); // For X Y Z E F
4086
-      delta[X_AXIS] = 90;
4087
-      delta[Y_AXIS] = 130;
4088
-      calculate_SCARA_forward_Transform(delta);
4089
-      destination[X_AXIS] = delta[X_AXIS]/axis_scaling[X_AXIS];
4090
-      destination[Y_AXIS] = delta[Y_AXIS]/axis_scaling[Y_AXIS];
4091
-      prepare_move();
4092
-      //ClearToSend();
4093
-      return true;
4094
-    }
4095
-    return false;
4085
+    return SCARA_move_to_cal(90, 130);
4096
   }
4086
   }
4097
 
4087
 
4098
   /**
4088
   /**
4100
    */
4090
    */
4101
   inline bool gcode_M362() {
4091
   inline bool gcode_M362() {
4102
     SERIAL_ECHOLN(" Cal: Psi 0 ");
4092
     SERIAL_ECHOLN(" Cal: Psi 0 ");
4103
-    //SoftEndsEnabled = false;              // Ignore soft endstops during calibration
4104
-    //SERIAL_ECHOLN(" Soft endstops disabled ");
4105
-    if (! Stopped) {
4106
-      //get_coordinates(); // For X Y Z E F
4107
-      delta[X_AXIS] = 60;
4108
-      delta[Y_AXIS] = 180;
4109
-      calculate_SCARA_forward_Transform(delta);
4110
-      destination[X_AXIS] = delta[X_AXIS]/axis_scaling[X_AXIS];
4111
-      destination[Y_AXIS] = delta[Y_AXIS]/axis_scaling[Y_AXIS];
4112
-      prepare_move();
4113
-      //ClearToSend();
4114
-      return true;
4115
-    }
4116
-    return false;
4093
+    return SCARA_move_to_cal(60, 180);
4117
   }
4094
   }
4118
 
4095
 
4119
   /**
4096
   /**
4121
    */
4098
    */
4122
   inline bool gcode_M363() {
4099
   inline bool gcode_M363() {
4123
     SERIAL_ECHOLN(" Cal: Psi 90 ");
4100
     SERIAL_ECHOLN(" Cal: Psi 90 ");
4124
-    //SoftEndsEnabled = false;              // Ignore soft endstops during calibration
4125
-    //SERIAL_ECHOLN(" Soft endstops disabled ");
4126
-    if (! Stopped) {
4127
-      //get_coordinates(); // For X Y Z E F
4128
-      delta[X_AXIS] = 50;
4129
-      delta[Y_AXIS] = 90;
4130
-      calculate_SCARA_forward_Transform(delta);
4131
-      destination[X_AXIS] = delta[X_AXIS]/axis_scaling[X_AXIS];
4132
-      destination[Y_AXIS] = delta[Y_AXIS]/axis_scaling[Y_AXIS];
4133
-      prepare_move();
4134
-      //ClearToSend();
4135
-      return true;
4136
-    }
4137
-    return false;
4101
+    return SCARA_move_to_cal(50, 90);
4138
   }
4102
   }
4139
 
4103
 
4140
   /**
4104
   /**
4142
    */
4106
    */
4143
   inline bool gcode_M364() {
4107
   inline bool gcode_M364() {
4144
     SERIAL_ECHOLN(" Cal: Theta-Psi 90 ");
4108
     SERIAL_ECHOLN(" Cal: Theta-Psi 90 ");
4145
-   // SoftEndsEnabled = false;              // Ignore soft endstops during calibration
4146
-    //SERIAL_ECHOLN(" Soft endstops disabled ");
4147
-    if (! Stopped) {
4148
-      //get_coordinates(); // For X Y Z E F
4149
-      delta[X_AXIS] = 45;
4150
-      delta[Y_AXIS] = 135;
4151
-      calculate_SCARA_forward_Transform(delta);
4152
-      destination[X_AXIS] = delta[X_AXIS] / axis_scaling[X_AXIS];
4153
-      destination[Y_AXIS] = delta[Y_AXIS] / axis_scaling[Y_AXIS];
4154
-      prepare_move();
4155
-      //ClearToSend();
4156
-      return true;
4157
-    }
4158
-    return false;
4109
+    return SCARA_move_to_cal(45, 135);
4159
   }
4110
   }
4160
 
4111
 
4161
   /**
4112
   /**

+ 0
- 1
Marlin/example_configurations/Felix/Configuration.h 查看文件

386
   // Note: this feature occupies 10'206 byte
386
   // Note: this feature occupies 10'206 byte
387
   #ifdef AUTO_BED_LEVELING_GRID
387
   #ifdef AUTO_BED_LEVELING_GRID
388
 
388
 
389
-home_offset    // set the rectangle in which to probe
390
     #define LEFT_PROBE_BED_POSITION 15
389
     #define LEFT_PROBE_BED_POSITION 15
391
     #define RIGHT_PROBE_BED_POSITION 170
390
     #define RIGHT_PROBE_BED_POSITION 170
392
     #define BACK_PROBE_BED_POSITION 180
391
     #define BACK_PROBE_BED_POSITION 180

+ 0
- 1
Marlin/example_configurations/Felix/Configuration_DUAL.h 查看文件

386
   // Note: this feature occupies 10'206 byte
386
   // Note: this feature occupies 10'206 byte
387
   #ifdef AUTO_BED_LEVELING_GRID
387
   #ifdef AUTO_BED_LEVELING_GRID
388
 
388
 
389
-home_offset    // set the rectangle in which to probe
390
     #define LEFT_PROBE_BED_POSITION 15
389
     #define LEFT_PROBE_BED_POSITION 15
391
     #define RIGHT_PROBE_BED_POSITION 170
390
     #define RIGHT_PROBE_BED_POSITION 170
392
     #define BACK_PROBE_BED_POSITION 180
391
     #define BACK_PROBE_BED_POSITION 180

+ 3
- 3
Marlin/ultralcd.cpp 查看文件

912
   START_MENU();
912
   START_MENU();
913
   MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
913
   MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
914
   #ifdef ENABLE_AUTO_BED_LEVELING
914
   #ifdef ENABLE_AUTO_BED_LEVELING
915
-    MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, 0.5, 50);
915
+    MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, 0.0, 50);
916
   #endif
916
   #endif
917
-  MENU_ITEM_EDIT(float5, MSG_ACC, &acceleration, 500, 99000);
917
+  MENU_ITEM_EDIT(float5, MSG_ACC, &acceleration, 10, 99000);
918
   MENU_ITEM_EDIT(float3, MSG_VXY_JERK, &max_xy_jerk, 1, 990);
918
   MENU_ITEM_EDIT(float3, MSG_VXY_JERK, &max_xy_jerk, 1, 990);
919
   MENU_ITEM_EDIT(float52, MSG_VZ_JERK, &max_z_jerk, 0.1, 990);
919
   MENU_ITEM_EDIT(float52, MSG_VZ_JERK, &max_z_jerk, 0.1, 990);
920
   MENU_ITEM_EDIT(float3, MSG_VE_JERK, &max_e_jerk, 1, 990);
920
   MENU_ITEM_EDIT(float3, MSG_VE_JERK, &max_e_jerk, 1, 990);
926
   MENU_ITEM_EDIT(float3, MSG_VTRAV_MIN, &mintravelfeedrate, 0, 999);
926
   MENU_ITEM_EDIT(float3, MSG_VTRAV_MIN, &mintravelfeedrate, 0, 999);
927
   MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_X, &max_acceleration_units_per_sq_second[X_AXIS], 100, 99000, reset_acceleration_rates);
927
   MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_X, &max_acceleration_units_per_sq_second[X_AXIS], 100, 99000, reset_acceleration_rates);
928
   MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_Y, &max_acceleration_units_per_sq_second[Y_AXIS], 100, 99000, reset_acceleration_rates);
928
   MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_Y, &max_acceleration_units_per_sq_second[Y_AXIS], 100, 99000, reset_acceleration_rates);
929
-  MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_Z, &max_acceleration_units_per_sq_second[Z_AXIS], 100, 99000, reset_acceleration_rates);
929
+  MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_Z, &max_acceleration_units_per_sq_second[Z_AXIS], 10, 99000, reset_acceleration_rates);
930
   MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_E, &max_acceleration_units_per_sq_second[E_AXIS], 100, 99000, reset_acceleration_rates);
930
   MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_E, &max_acceleration_units_per_sq_second[E_AXIS], 100, 99000, reset_acceleration_rates);
931
   MENU_ITEM_EDIT(float5, MSG_A_RETRACT, &retract_acceleration, 100, 99000);
931
   MENU_ITEM_EDIT(float5, MSG_A_RETRACT, &retract_acceleration, 100, 99000);
932
   MENU_ITEM_EDIT(float5, MSG_A_TRAVEL, &travel_acceleration, 100, 99000);
932
   MENU_ITEM_EDIT(float5, MSG_A_TRAVEL, &travel_acceleration, 100, 99000);

正在加载...
取消
保存