Merge PR16

Marlin/Configuration.h

@@ -558,7 +558,7 @@
   //#define PID_DEBUG             // Sends debug data to the serial port. Use 'M303 D' to toggle activation.
   //#define PID_OPENLOOP          // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
   //#define SLOW_PWM_HEATERS      // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
-  #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
+  #define PID_FUNCTIONAL_RANGE 20 // If the temperature difference between the target temperature and the actual temperature
                                   // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
 #endif
 

Marlin/Configuration_adv.h

@@ -794,7 +794,7 @@
 //
 // Add the G35 command to read bed corners to help adjust screws. Requires a bed probe.
 //
-#define ASSISTED_TRAMMING
+//#define ASSISTED_TRAMMING
 #if ENABLED(ASSISTED_TRAMMING)
 
   // Define positions for probing points, use the hotend as reference not the sensor.
@@ -3158,7 +3158,7 @@
  *  - M206 and M428 are disabled.
  *  - G92 will revert to its behavior from Marlin 1.0.
  */
-//#define NO_WORKSPACE_OFFSETS
+#define NO_WORKSPACE_OFFSETS
 
 // Extra options for the M114 "Current Position" report
 //#define M114_DETAIL         // Use 'M114` for details to check planner calculations

Marlin/src/MarlinCore.cpp

@@ -969,9 +969,13 @@ void setup() {
   uint32_t serial_connect_timeout = millis() + 1000UL;
   while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
   #if HAS_MULTI_SERIAL
-    MYSERIAL1.begin(BAUDRATE);
-    serial_connect_timeout = millis() + 1000UL;
-    while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
+  #if ENABLED(MKS_WIFI)
+  MYSERIAL1.begin(MKS_WIFI_BAUDRATE);
+  #else
+  MYSERIAL1.begin(BAUDRATE);
+  #endif
+  serial_connect_timeout = millis() + 1000UL;
+  while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
   #endif
   SERIAL_ECHO_MSG("start");
 

Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h

@@ -279,6 +279,8 @@ BlTouch
 #define MKS_WIFI
 
 #ifdef MKS_WIFI
+
+ #define MKS_WIFI_BAUDRATE                  115200
  #undef PLATFORM_M997_SUPPORT
 
  #define MKS_WIFI_IO0                       PA8

Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h

@@ -439,6 +439,7 @@ https://easyeda.com/sst78rust/fb4s-led-control
 */
 #define MKS_WIFI
 #ifdef MKS_WIFI
+ #define MKS_WIFI_BAUDRATE                  115200
  #undef PLATFORM_M997_SUPPORT
 
  #define MKS_WIFI_IO0                       PC13