Adjust spacing in Marlin_main.cpp and stepper.*
This commit is contained in:
		@@ -6093,8 +6093,8 @@ void prepare_move() {
 | 
			
		||||
#endif // HAS_CONTROLLERFAN
 | 
			
		||||
 | 
			
		||||
#ifdef SCARA
 | 
			
		||||
void calculate_SCARA_forward_Transform(float f_scara[3])
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
  void calculate_SCARA_forward_Transform(float f_scara[3]) {
 | 
			
		||||
    // Perform forward kinematics, and place results in delta[3]
 | 
			
		||||
    // The maths and first version has been done by QHARLEY . Integrated into masterbranch 06/2014 and slightly restructured by Joachim Cerny in June 2014
 | 
			
		||||
 | 
			
		||||
@@ -6165,10 +6165,11 @@ void calculate_delta(float cartesian[3]){
 | 
			
		||||
    SERIAL_ECHOPGM(" S2="); SERIAL_ECHO(SCARA_S2);
 | 
			
		||||
    SERIAL_ECHOPGM(" Theta="); SERIAL_ECHO(SCARA_theta);
 | 
			
		||||
    SERIAL_ECHOPGM(" Psi="); SERIAL_ECHOLN(SCARA_psi);
 | 
			
		||||
  SERIAL_ECHOLN(" ");*/
 | 
			
		||||
    SERIAL_EOL;
 | 
			
		||||
    */
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
#endif // SCARA
 | 
			
		||||
 | 
			
		||||
#ifdef TEMP_STAT_LEDS
 | 
			
		||||
 | 
			
		||||
@@ -6399,25 +6400,14 @@ void kill()
 | 
			
		||||
      st_synchronize();
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
void Stop() {
 | 
			
		||||
  disable_all_heaters();
 | 
			
		||||
  if (IsRunning()) {
 | 
			
		||||
    Running = false;
 | 
			
		||||
    Stopped_gcode_LastN = gcode_LastN; // Save last g_code for restart
 | 
			
		||||
    SERIAL_ERROR_START;
 | 
			
		||||
    SERIAL_ERRORLNPGM(MSG_ERR_STOPPED);
 | 
			
		||||
    LCD_MESSAGEPGM(MSG_STOPPED);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
#endif // FILAMENT_RUNOUT_SENSOR
 | 
			
		||||
 | 
			
		||||
#ifdef FAST_PWM_FAN
 | 
			
		||||
void setPwmFrequency(uint8_t pin, int val)
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
  void setPwmFrequency(uint8_t pin, int val) {
 | 
			
		||||
    val &= 0x07;
 | 
			
		||||
  switch(digitalPinToTimer(pin))
 | 
			
		||||
  {
 | 
			
		||||
    switch (digitalPinToTimer(pin)) {
 | 
			
		||||
 | 
			
		||||
      #if defined(TCCR0A)
 | 
			
		||||
        case TIMER0A:
 | 
			
		||||
@@ -6480,8 +6470,20 @@ void setPwmFrequency(uint8_t pin, int val)
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
#endif // FAST_PWM_FAN
 | 
			
		||||
 | 
			
		||||
void Stop() {
 | 
			
		||||
  disable_all_heaters();
 | 
			
		||||
  if (IsRunning()) {
 | 
			
		||||
    Running = false;
 | 
			
		||||
    Stopped_gcode_LastN = gcode_LastN; // Save last g_code for restart
 | 
			
		||||
    SERIAL_ERROR_START;
 | 
			
		||||
    SERIAL_ERRORLNPGM(MSG_ERR_STOPPED);
 | 
			
		||||
    LCD_MESSAGEPGM(MSG_STOPPED);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool setTargetedHotend(int code){
 | 
			
		||||
  target_extruder = active_extruder;
 | 
			
		||||
  if (code_seen('T')) {
 | 
			
		||||
 
 | 
			
		||||
@@ -1110,9 +1110,8 @@ long st_get_position(uint8_t axis) {
 | 
			
		||||
 | 
			
		||||
#ifdef ENABLE_AUTO_BED_LEVELING
 | 
			
		||||
 | 
			
		||||
  float st_get_position_mm(uint8_t axis) {
 | 
			
		||||
    float steper_position_in_steps = st_get_position(axis);
 | 
			
		||||
    return steper_position_in_steps / axis_steps_per_unit[axis];
 | 
			
		||||
  float st_get_position_mm(AxisEnum axis) {
 | 
			
		||||
    return st_get_position(axis) / axis_steps_per_unit[axis];
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
#endif  // ENABLE_AUTO_BED_LEVELING
 | 
			
		||||
 
 | 
			
		||||
@@ -68,8 +68,8 @@ long st_get_position(uint8_t axis);
 | 
			
		||||
 | 
			
		||||
#ifdef ENABLE_AUTO_BED_LEVELING
 | 
			
		||||
  // Get current position in mm
 | 
			
		||||
float st_get_position_mm(uint8_t axis);
 | 
			
		||||
#endif  //ENABLE_AUTO_BED_LEVELING
 | 
			
		||||
  float st_get_position_mm(AxisEnum axis);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
// The stepper subsystem goes to sleep when it runs out of things to execute. Call this
 | 
			
		||||
// to notify the subsystem that it is time to go to work.
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user