Merge branch 'MP3DP_MRambo_16T_aero' into MP3DP_Ramps_16T_MK

.circleci/config.yml

@@ -240,10 +240,10 @@ jobs:
             build_marlin_pio ./ ${TEST_PLATFORM}
             restore_configs
             echo testing STM32F1 targets...
-            export TEST_PLATFORM="-e STM32F103R"
+            export TEST_PLATFORM="-e STM32F103RE"
             restore_configs
-            echo use_example_configs STM32/STM32F103R
-            use_example_configs STM32/STM32F103R
+            echo use_example_configs STM32/STM32F103RE
+            use_example_configs STM32/STM32F103RE
             build_marlin_pio ./ ${TEST_PLATFORM}
             restore_configs
             echo use_example_configs STM32/stm32f103ret6

.travis.yml

@@ -16,7 +16,7 @@ env:
   - TEST_PLATFORM="LPC1768"
   - TEST_PLATFORM="LPC1769"
   - TEST_PLATFORM="megaatmega2560"
-  - TEST_PLATFORM="STM32F103R"
+  - TEST_PLATFORM="STM32F103RE"
   - TEST_PLATFORM="teensy31"
   - TEST_PLATFORM="teensy35"
 
@@ -31,22 +31,23 @@ env:
   - TEST_PLATFORM="ARMED"
   - TEST_PLATFORM="BIGTREE_BTT002"
   - TEST_PLATFORM="BIGTREE_SKR_PRO"
-  - TEST_PLATFORM="STM32F103R_bigtree"
+  - TEST_PLATFORM="STM32F103RC_bigtree"
   - TEST_PLATFORM="jgaurora_a5s_a1"
-  - TEST_PLATFORM="STM32F103V_longer"
+  - TEST_PLATFORM="STM32F103VE_longer"
   - TEST_PLATFORM="STM32F407VE_black"
 
   # Non-working environment tests
   #- TEST_PLATFORM="at90usb1286_cdc"
   #- TEST_PLATFORM="at90usb1286_dfu"
-  #- TEST_PLATFORM="malyanm200"
+  #- TEST_PLATFORM="STM32F103CB_malyan"
   #- TEST_PLATFORM="mks_robin"
   #- TEST_PLATFORM="mks_robin_lite"
   #- TEST_PLATFORM="mks_robin_mini"
   #- TEST_PLATFORM="mks_robin_nano"
   #- TEST_PLATFORM="SAMD51_grandcentral_m4"
-  #- TEST_PLATFORM="STM32F103R_bigtree"
-  #- TEST_PLATFORM="STM32F103R_fysetc"
+  #- TEST_PLATFORM="STM32F103RC_bigtree"
+  #- TEST_PLATFORM="STM32F103RC_bigtree_USB"
+  #- TEST_PLATFORM="STM32F103RC_fysetc"
   #- TEST_PLATFORM="STM32F4"
   #- TEST_PLATFORM="STM32F7"
 

Marlin/Configuration.h

@@ -71,7 +71,7 @@
 // @section info
 
 // Author info of this build printed to the host during boot and M115
-#define STRING_CONFIG_H_AUTHOR "(V1 Engineering, Ryan, 410)" // Who made the changes.
+#define STRING_CONFIG_H_AUTHOR "(V1 Engineering, Ryan, 412)" // Who made the changes.
 
 /**
  * *** VENDORS PLEASE READ ***
@@ -725,6 +725,11 @@
  */
 #define DEFAULT_MAX_FEEDRATE          { 150, 150, 15, 24 }
 
+//#define LIMITED_MAX_FR_EDITING        // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
+#if ENABLED(LIMITED_MAX_FR_EDITING)
+  #define MAX_FEEDRATE_EDIT_VALUES    { 600, 600, 10, 50 } // ...or, set your own edit limits
+#endif
+
 /**
  * Default Max Acceleration (change/s) change = mm/s
  * (Maximum start speed for accelerated moves)
@@ -733,6 +738,11 @@
  */
 #define DEFAULT_MAX_ACCELERATION      { 2000, 2000, 100, 3000 }
 
+//#define LIMITED_MAX_ACCEL_EDITING     // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
+#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
+  #define MAX_ACCEL_EDIT_VALUES       { 6000, 6000, 200, 20000 } // ...or, set your own edit limits
+#endif
+
 /**
  * Default Acceleration (change/s) change = mm/s
  * Override with M204
@@ -771,6 +781,11 @@
   #define DEFAULT_XJERK 5.0
   #define DEFAULT_YJERK 5.0
   #define DEFAULT_ZJERK  0.15
+
+  //#define LIMITED_JERK_EDITING        // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
+  #if ENABLED(LIMITED_JERK_EDITING)
+    #define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits
+  #endif
 #endif
 
 #define DEFAULT_EJERK    3.0  // May be used by Linear Advance
@@ -888,11 +903,10 @@
 
 /**
  * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
- * X and Y offsets must be integers.
  *
  * In the following example the X and Y offsets are both positive:
- * #define X_PROBE_OFFSET_FROM_EXTRUDER 10
- * #define Y_PROBE_OFFSET_FROM_EXTRUDER 10
+ *
+ *   #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
  *
  *     +-- BACK ---+
  *     |           |
@@ -904,10 +918,10 @@
  *     |           |
  *     O-- FRONT --+
  *   (0,0)
+ *
+ * Specify a Probe position as { X, Y, Z }
  */
-#define X_PROBE_OFFSET_FROM_EXTRUDER 10  // X offset: -left  +right  [of the nozzle]
-#define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
-#define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
+#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
 
 // Certain types of probes need to stay away from edges
 #define MIN_PROBE_EDGE 10
@@ -941,7 +955,7 @@
  *
  * Use these settings to specify the distance (mm) to raise the probe (or
  * lower the bed). The values set here apply over and above any (negative)
- * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
+ * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
  * Only integer values >= 1 are valid here.
  *
  * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
@@ -1199,12 +1213,6 @@
   #define GRID_MAX_POINTS_X 3
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
 
-  // Set the boundaries for probing (where the probe can reach).
-  //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
-  //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
-
   // Probe along the Y axis, advancing X after each column
   //#define PROBE_Y_FIRST
 
@@ -1258,19 +1266,6 @@
 
 #endif // BED_LEVELING
 
-/**
- * Points to probe for all 3-point Leveling procedures.
- * Override if the automatically selected points are inadequate.
- */
-#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
-  //#define PROBE_PT_1_X 15
-  //#define PROBE_PT_1_Y 180
-  //#define PROBE_PT_2_X 15
-  //#define PROBE_PT_2_Y 20
-  //#define PROBE_PT_3_X 170
-  //#define PROBE_PT_3_Y 20
-#endif
-
 /**
  * Add a bed leveling sub-menu for ABL or MBL.
  * Include a guided procedure if manual probing is enabled.
@@ -1876,6 +1871,11 @@
 //
 #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
 
+// If you want you can define your own set of delays in Configuration.h
+//#define ST7920_DELAY_1 DELAY_NS(0)
+#define ST7920_DELAY_2 DELAY_NS(250)
+#define ST7920_DELAY_3 DELAY_NS(250)
+
 //
 // ReprapWorld Graphical LCD
 // https://reprapworld.com/?products_details&products_id/1218