Browse Source

More parity with 1.1.x, plus whitespace

Scott Lahteine 7 years ago
parent
commit
de5ca96654

+ 3
- 3
Marlin/src/config/examples/MakerParts/Configuration.h View File

56
 //  If we could use 1.65A as motor current, then 3000 mm/s^2 as acceleration
56
 //  If we could use 1.65A as motor current, then 3000 mm/s^2 as acceleration
57
 // if perfectly achievable. Using 1A as motor current, 2400 mm/s^2 acceleration
57
 // if perfectly achievable. Using 1A as motor current, 2400 mm/s^2 acceleration
58
 // is perfectly possible without losing any steps
58
 // is perfectly possible without losing any steps
59
-// On A4988 drivers, maximum current can be calculated as I_TripMax= Vref/(8*Rs) 
59
+// On A4988 drivers, maximum current can be calculated as I_TripMax= Vref/(8*Rs)
60
 //
60
 //
61
 
61
 
62
 //===========================================================================
62
 //===========================================================================
548
  * Override with M92
548
  * Override with M92
549
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
549
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
550
  */
550
  */
551
-#define DEFAULT_AXIS_STEPS_PER_UNIT   {80,80,4000,97}  //motor bajos con varilla3200 y altos 1600 default steps per unit for Ultimaker
551
+#define DEFAULT_AXIS_STEPS_PER_UNIT     { 80, 80, 4000, 97 }
552
 
552
 
553
 /**
553
 /**
554
  * Default Max Feed Rate (mm/s)
554
  * Default Max Feed Rate (mm/s)
555
  * Override with M203
555
  * Override with M203
556
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
556
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
557
  */
557
  */
558
-#define DEFAULT_MAX_FEEDRATE            { 300, 300, 2, 30 } /* For 300mm/s printing */ 
558
+#define DEFAULT_MAX_FEEDRATE            { 300, 300, 2, 30 } // For 300mm/s printing
559
 
559
 
560
 /**
560
 /**
561
  * Default Max Acceleration (change/s) change = mm/s
561
  * Default Max Acceleration (change/s) change = mm/s

+ 2
- 2
Marlin/src/lcd/dogm/HAL_LCD_class_defines.h View File

65
 extern u8g_dev_t u8g_dev_st7920_128x64_custom_sw_spi;
65
 extern u8g_dev_t u8g_dev_st7920_128x64_custom_sw_spi;
66
 class U8GLIB_ST7920_128X64_CUSTOM_SW_SPI : public U8GLIB {
66
 class U8GLIB_ST7920_128X64_CUSTOM_SW_SPI : public U8GLIB {
67
   public:
67
   public:
68
-    U8GLIB_ST7920_128X64_CUSTOM_SW_SPI() 
69
-    : U8GLIB(&u8g_dev_st7920_128x64_custom_sw_spi) 
68
+    U8GLIB_ST7920_128X64_CUSTOM_SW_SPI()
69
+    : U8GLIB(&u8g_dev_st7920_128x64_custom_sw_spi)
70
     {  }
70
     {  }
71
 };
71
 };
72
 
72
 

+ 2
- 4
Marlin/src/lcd/ultralcd.cpp View File

2559
               lcd_bed_leveling
2559
               lcd_bed_leveling
2560
             #endif
2560
             #endif
2561
           );
2561
           );
2562
-    #else
2563
-      #if PLANNER_LEVELING
2564
-        MENU_ITEM(gcode, MSG_BED_LEVELING, PSTR("G28\nG29"));
2565
-      #endif
2562
+    #elif PLANNER_LEVELING && DISABLED(PROBE_MANUALLY)
2563
+      MENU_ITEM(gcode, MSG_BED_LEVELING, PSTR("G28\nG29"));
2566
     #endif
2564
     #endif
2567
 
2565
 
2568
     #if ENABLED(LEVEL_BED_CORNERS) && DISABLED(LCD_BED_LEVELING)
2566
     #if ENABLED(LEVEL_BED_CORNERS) && DISABLED(LCD_BED_LEVELING)

+ 2
- 2
Marlin/src/lcd/ultralcd_impl_DOGM.h View File

172
 #elif ENABLED(U8GLIB_ST7920) && defined(__arm__)
172
 #elif ENABLED(U8GLIB_ST7920) && defined(__arm__)
173
   // RepRap Discount Full Graphics Smart Controller on an ARM target
173
   // RepRap Discount Full Graphics Smart Controller on an ARM target
174
     U8GLIB_ST7920_128X64_CUSTOM_SW_SPI u8g;
174
     U8GLIB_ST7920_128X64_CUSTOM_SW_SPI u8g;
175
-    
175
+
176
 #elif ENABLED(U8GLIB_ST7920)
176
 #elif ENABLED(U8GLIB_ST7920)
177
   // RepRap Discount Full Graphics Smart Controller
177
   // RepRap Discount Full Graphics Smart Controller
178
     //U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_RS); // 2 stripes, HW SPI (shared with SD card, on AVR does not use standard LCD adapter)
178
     //U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_RS); // 2 stripes, HW SPI (shared with SD card, on AVR does not use standard LCD adapter)
180
     U8GLIB_ST7920_128X64_RRD u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS); // Number of stripes can be adjusted in ultralcd_st7920_u8glib_rrd.h with PAGE_HEIGHT
180
     U8GLIB_ST7920_128X64_RRD u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS); // Number of stripes can be adjusted in ultralcd_st7920_u8glib_rrd.h with PAGE_HEIGHT
181
                                                                            // AVR version ignores these pin settings
181
                                                                            // AVR version ignores these pin settings
182
                                                                            // HAL version uses these pin settings
182
                                                                            // HAL version uses these pin settings
183
-    
183
+
184
 #elif ENABLED(CARTESIO_UI)
184
 #elif ENABLED(CARTESIO_UI)
185
   // The CartesioUI display
185
   // The CartesioUI display
186
     //U8GLIB_DOGM128_2X u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0); // 4 stripes
186
     //U8GLIB_DOGM128_2X u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0); // 4 stripes

+ 1
- 1
Marlin/src/module/planner.cpp View File

1100
   float max_stepper_speed = 0, min_axis_accel_ratio = 1; // ratio < 1 means acceleration ramp needed
1100
   float max_stepper_speed = 0, min_axis_accel_ratio = 1; // ratio < 1 means acceleration ramp needed
1101
   LOOP_XYZE(i) {
1101
   LOOP_XYZE(i) {
1102
     const float cs = FABS((current_speed[i] = delta_mm[i] * inverse_secs));
1102
     const float cs = FABS((current_speed[i] = delta_mm[i] * inverse_secs));
1103
-    if (cs >  max_jerk[i]) 
1103
+    if (cs > max_jerk[i])
1104
       NOMORE(min_axis_accel_ratio, max_jerk[i] / cs);
1104
       NOMORE(min_axis_accel_ratio, max_jerk[i] / cs);
1105
     NOLESS(max_stepper_speed, cs);
1105
     NOLESS(max_stepper_speed, cs);
1106
     #if ENABLED(DISTINCT_E_FACTORS)
1106
     #if ENABLED(DISTINCT_E_FACTORS)

+ 1
- 1
Marlin/src/module/temperature.cpp View File

803
       meas_shift_index = filwidth_delay_index[0] - meas_delay_cm;
803
       meas_shift_index = filwidth_delay_index[0] - meas_delay_cm;
804
       if (meas_shift_index < 0) meas_shift_index += MAX_MEASUREMENT_DELAY + 1;  //loop around buffer if needed
804
       if (meas_shift_index < 0) meas_shift_index += MAX_MEASUREMENT_DELAY + 1;  //loop around buffer if needed
805
       meas_shift_index = constrain(meas_shift_index, 0, MAX_MEASUREMENT_DELAY);
805
       meas_shift_index = constrain(meas_shift_index, 0, MAX_MEASUREMENT_DELAY);
806
-      calculate_volumetric_for_width_sensor(measurement_delay[meas_shift_index])
806
+      planner.calculate_volumetric_for_width_sensor(measurement_delay[meas_shift_index]);
807
     }
807
     }
808
   #endif // FILAMENT_WIDTH_SENSOR
808
   #endif // FILAMENT_WIDTH_SENSOR
809
 
809
 

+ 1
- 1
Marlin/src/pins/pins_MIGHTYBOARD_REVE.h View File

124
 //
124
 //
125
 // Temperature Sensors
125
 // Temperature Sensors
126
 //
126
 //
127
-#define TEMP_BED_PIN        15   // K7 - 69 / ADC15 - 15 
127
+#define TEMP_BED_PIN        15   // K7 - 69 / ADC15 - 15
128
 
128
 
129
 // SPI for Max6675 or Max31855 Thermocouple
129
 // SPI for Max6675 or Max31855 Thermocouple
130
 // Uses a separate SPI bus
130
 // Uses a separate SPI bus

+ 1
- 1
Marlin/src/pins/pins_RAMPS.h View File

122
 #if ENABLED(HAVE_TMC2208)
122
 #if ENABLED(HAVE_TMC2208)
123
   /*
123
   /*
124
    * TMC2208 stepper drivers
124
    * TMC2208 stepper drivers
125
-   * 
125
+   *
126
    * Hardware serial communication ports.
126
    * Hardware serial communication ports.
127
    * If undefined software serial is used according to the pins below
127
    * If undefined software serial is used according to the pins below
128
    */
128
    */

Loading…
Cancel
Save