update 2.0.x

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -110,6 +110,18 @@ body:
       label: Add-ons
       description: Please list any hardware add-ons that could be involved.
 
+  - type: dropdown
+    attributes:
+      label: Bed Leveling
+      description: What kind of bed leveling compensation are you using?
+      options:
+        - UBL Bilinear mesh
+        - ABL Bilinear mesh
+        - ABL Linear grid
+        - ABL 3-point
+        - MBL Manual Bed Leveling
+        - No Bed Leveling
+
   - type: dropdown
     attributes:
       label: Your Slicer

.github/workflows/bump-date.yml

@@ -28,6 +28,7 @@ jobs:
         # Inline Bump Script
         DIST=$( date +"%Y-%m-%d" )
         eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
+        eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/Version.h" && \
         git config user.name "${GITHUB_ACTOR}" && \
         git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \
         git add . && \

.github/workflows/test-builds.yml

@@ -58,9 +58,24 @@ jobs:
 
         #- STM32F103RC_btt_maple
         - STM32F103RC_btt_USB_maple
-        - STM32F103RC_fysetc
+        - STM32F103RC_fysetc_maple
         - STM32F103RC_meeb
-        - jgaurora_a5s_a1
+        - jgaurora_a5s_a1_maple
+        - STM32F103VE_longer_maple
+        #- mks_robin_maple
+        - mks_robin_lite_maple
+        - mks_robin_pro_maple
+        #- mks_robin_nano35_maple
+        #- STM32F103RET6_creality_maple
+        - STM32F103VE_ZM3E4V2_USB_maple
+
+        # STM32 (ST) Environments
+
+        - STM32F103RC_btt
+        #- STM32F103RC_btt_USB
+        - STM32F103RE_btt
+        - STM32F103RE_btt_USB
+        - STM32F103RET6_creality
         - STM32F103VE_longer
         #- mks_robin_maple
         - mks_robin_lite
@@ -95,6 +110,7 @@ jobs:
         - REMRAM_V1
         - BTT_SKR_SE_BX
         - chitu_f103
+        - Index_Mobo_Rev03
 
         # Put lengthy tests last
 

Marlin/src/HAL/NATIVE_SIM/MarlinSPI.h

@@ -24,3 +24,9 @@
 #include <SPI.h>
 
 using MarlinSPI = SPIClass;
+//
+// EEPROM
+//
+void eeprom_init();
+void eeprom_write_byte(uint8_t *pos, uint8_t value);
+uint8_t eeprom_read_byte(uint8_t *pos);

Marlin/src/HAL/shared/eeprom_if.h

@@ -1,7 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  *
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
  *
@@ -21,6 +21,9 @@
  */
 #pragma once
 
+#include <SPI.h>
+
+using MarlinSPI = SPIClass;
 //
 // EEPROM
 //
@@ -31,3 +34,4 @@ uint8_t eeprom_read_byte(uint8_t *pos);
 #if ENABLED(EEPROM_W25Q)
 void eeprom_hw_deinit(void);
 #endif
+

Marlin/src/MarlinCore.cpp

@@ -72,13 +72,13 @@
 
 #if HAS_DWIN_E3V2
   #include "lcd/e3v2/common/encoder.h"
-#if ENABLED(DWIN_CREALITY_LCD)
-  #include "lcd/e3v2/creality/dwin.h"
+  #if ENABLED(DWIN_CREALITY_LCD)
+    #include "lcd/e3v2/creality/dwin.h"
   #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
     #include "lcd/e3v2/enhanced/dwin.h"
   #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
     #include "lcd/e3v2/jyersui/dwin.h"
-#endif
+  #endif
 #endif
 
 #if HAS_ETHERNET

Marlin/src/sd/cardreader.cpp

@@ -332,7 +332,21 @@ void CardReader::printListing(
       }else{
       SERIAL_ECHO(createFilename(filename, p));
       SERIAL_CHAR(' ');
-      SERIAL_ECHOLN(p.fileSize);
+      #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
+        if (!includeLongNames)
+      #endif
+          SERIAL_ECHOLN(p.fileSize);
+      #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
+        else {
+          SERIAL_ECHO(p.fileSize);
+          SERIAL_CHAR(' ');
+          if (prependLong) {
+            SERIAL_ECHO(prependLong);
+            SERIAL_CHAR('/');
+          }
+          SERIAL_ECHOLN(longFilename[0] ? longFilename : "???");
+        }
+      #endif
     }
       #else
       SERIAL_ECHO(createFilename(filename, p));

buildroot/bin/opt_find

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+#
+# opt_find
+# Find one or more Marlin options - Configuration lines starting with #define
+#
+
+MYNAME=$(basename $0)
+
+[[ $# == 0 ]] && ONE="-h" || ONE=$1
+
+COMM="(//\\s*)?" ; TYPE=""
+case "$ONE" in
+  -d|--disabled )
+      shift ; COMM="(//\\s*)" ; TYPE="disabled " ;;
+  -e|--enabled )
+      shift ; COMM="" ; TYPE="enabled " ;;
+  -h|--help )
+      echo "$MYNAME [-d|--disabled|-e|--enabled] STRING ... Find matching Marlin configuration options."
+      echo ; shift ;;
+  -* )
+      echo "Unknown option $ONE" ; shift ;;
+esac
+
+while [[ $# > 0 ]]; do
+  DID=0
+  for FN in Configuration Configuration_adv; do
+    FOUND=$( grep -HEn "^\s*${COMM}#define\s+[A-Z0-9_]*${1}" "Marlin/$FN.h" 2>/dev/null )
+    [[ -n "$FOUND" ]] && { echo "$FOUND" ; DID=1 ; }
+  done
+  ((DID)) || { echo "ERROR: ${MYNAME} - No ${TYPE}match for ${1}" ; exit 9; }
+  shift
+  echo
+done