Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit aa09046
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Aug 30 00:41:13 2022 +0000

    [cron] Bump distribution date (2022-08-30)

commit 6542f61
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Aug 29 19:23:53 2022 -0500

    🔖  Config version 02010200

commit b229fba
Author: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date:   Tue Aug 30 02:52:02 2022 +0300

    🐛 Fix back button (MarlinFirmware#24694)

commit 8a3cd2f
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sat Aug 27 00:22:42 2022 +0000

    [cron] Bump distribution date (2022-08-27)

commit 9b7b1a3
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Aug 25 23:45:07 2022 -0500

    ✏️ Fix http:// links

commit 15a100d
Author: Lefteris Garyfalakis <46350667+lefterisgar@users.noreply.github.com>
Date:   Fri Aug 26 07:40:31 2022 +0300

    ✏️ Fix LCD sleep conditional (MarlinFirmware#24685)

commit c918e90
Author: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date:   Thu Aug 25 23:23:54 2022 -0500

    🩹 Constrain UBL within mesh bounds (MarlinFirmware#24631)

    Fixes MarlinFirmware#24630

commit 2635182
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Fri Aug 26 00:25:25 2022 +0000

    [cron] Bump distribution date (2022-08-26)

commit ace3583
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Thu Aug 25 16:14:50 2022 -0700

    🚸 Up to 10 Preheat Constants (MarlinFirmware#24636)

commit eabab43
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Fri Aug 26 11:07:41 2022 +1200

    🔧 Fix Auto-Fan / Controller-Fan pin conflict check (MarlinFirmware#24648)

commit 66e61f4
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Fri Aug 26 10:51:11 2022 +1200

    🩹 Fix PID debug output (MarlinFirmware#24647)

commit 42f8cc4
Author: Mark <niujl123@sina.com>
Date:   Fri Aug 26 06:50:03 2022 +0800

    🐛 Fix Bed Distance Sensor reading (MarlinFirmware#24649)

commit 82d1851
Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date:   Fri Aug 26 00:14:54 2022 +0200

    ✨ M20_TIMESTAMP_SUPPORT (MarlinFirmware#24679)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 6053fae
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Thu Aug 25 18:16:46 2022 +0000

    [cron] Bump distribution date (2022-08-25)

commit 2f91154
Author: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date:   Thu Aug 25 20:16:55 2022 +0300

    ♻️ Display sleep minutes, encoder disable option (MarlinFirmware#24618)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 6704c0b
Author: DejitaruJin <dejitarujin@gmail.com>
Date:   Thu Aug 25 13:10:43 2022 -0400

    🩹 Fix SainSmart LCD (MarlinFirmware#24672)

commit b19d44b
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Thu Aug 25 10:08:03 2022 -0700

    🩹 Fix Freeze Feature (MarlinFirmware#24664)

commit 2a2c161
Author: Lefteris Garyfalakis <46350667+lefterisgar@users.noreply.github.com>
Date:   Thu Aug 25 19:48:35 2022 +0300

    🔨 Suppressible Creality 4.2.2 warning (MarlinFirmware#24683)

commit f4a5db5
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Wed Aug 24 18:11:29 2022 +0000

    [cron] Bump distribution date (2022-08-24)

commit a76b92b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Aug 24 10:15:57 2022 -0500

    ✨ Robin Nano v1 CDC (USB mod)

    Followup to MarlinFirmware#24619

commit e201f4e
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon Aug 22 18:06:10 2022 +0000

    [cron] Bump distribution date (2022-08-22)

commit 2a1c2e2
Author: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date:   Mon Aug 22 18:31:02 2022 +0300

    ✨ Robin Nano v1 CDC (USB mod) (MarlinFirmware#24619)

commit 20c7284
Author: Alexey Galakhov <agalakhov@gmail.com>
Date:   Mon Aug 22 17:11:53 2022 +0200

    🐛 Fix JyersUI (MarlinFirmware#24652)

commit d770272
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon Aug 22 07:53:51 2022 -0700

    🔧 Fix Skew Correction defaults (MarlinFirmware#24601)

commit 6e39bd6
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sun Aug 21 00:22:59 2022 +0000

    [cron] Bump distribution date (2022-08-21)

commit 34f3e5b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Aug 20 06:41:00 2022 -0500

    🎨 Some automated cleanup

commit da3b7ab
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sat Aug 20 00:22:12 2022 +0000

    [cron] Bump distribution date (2022-08-20)

commit 6909f5f
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Fri Aug 19 11:37:43 2022 -0700

    📺 Add to MKS UI About Screen (MarlinFirmware#24610)

commit 03d9254
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Fri Aug 19 11:11:15 2022 -0700

    🔧 Remove STM32F4 Print Counter Sanity Check (MarlinFirmware#24605)

commit 4ae9bf3
Author: Protomosh <43253582+Protomosh@users.noreply.github.com>
Date:   Fri Aug 19 20:57:27 2022 +0300

    🐛 Fix DGUS Reloaded + STM32 (MarlinFirmware#24600)

commit 306e03b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Aug 19 11:00:52 2022 -0500

    🧑‍💻 Use spaces indent for Python

commit e701e0b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Aug 9 07:58:20 2022 -0500

    🔨 Misc. schema updates

commit dab60a1
Author: Graham Reed <greed@7deadly.org>
Date:   Fri Aug 19 16:48:27 2022 +0100

    🔨 Fix LPC1768 automatic upload port (MarlinFirmware#24599)

commit 1be5a7b
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Fri Aug 19 00:25:32 2022 +0000

    [cron] Bump distribution date (2022-08-19)

commit af1c7e1
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Aug 18 13:03:17 2022 -0500

    🩹 Fix strtof interpreting a hex value

    Bug introduced in MarlinFirmware#21532

commit 1766ee1
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Wed Aug 17 18:05:53 2022 +0000

    [cron] Bump distribution date (2022-08-17)

commit ce26fcc
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Aug 17 07:32:08 2022 -0500

    🔨 Add args to schema.py

commit 0100b7b
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Aug 16 18:07:16 2022 +0000

    [cron] Bump distribution date (2022-08-16)

commit fab4fb7
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Aug 16 09:41:45 2022 -0500

    🎨 Fix '…if_chain' Uncrustify option

commit b8bd331
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Aug 8 06:42:46 2022 -0500

    🔨 Misc. config py updates

commit e42cbe7
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Aug 11 12:41:41 2022 -0500

    🧑‍💻 Add operator== for C++20

commit c84f839
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sun Aug 14 12:07:06 2022 +0000

    [cron] Bump distribution date (2022-08-14)

commit c2874ca
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Aug 14 03:58:03 2022 -0500

    🔨 Update schema ignores, export value
  • Loading branch information
Bob-the-Kuhn committed Aug 31, 2022
1 parent e1b20ee commit 02397b2
Show file tree
Hide file tree
Showing 123 changed files with 2,947 additions and 2,795 deletions.
6 changes: 5 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ end_of_line = lf
indent_style = space
indent_size = 2

[{*.py,*.conf,*.sublime-project}]
[{*.py}]
indent_style = space
indent_size = 4

[{*.conf,*.sublime-project}]
indent_style = tab
indent_size = 4
2 changes: 1 addition & 1 deletion .github/workflows/check-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ jobs:
It may help to set your fork's default branch to `bugfix-2.0.x`.
See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
See [this page](https://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
6 changes: 4 additions & 2 deletions .github/workflows/test-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
#- mks_robin_maple
- mks_robin_lite_maple
- mks_robin_pro_maple
#- mks_robin_nano35_maple
#- mks_robin_nano_v1v2_maple
#- STM32F103RE_creality_maple
- STM32F103VE_ZM3E4V2_USB_maple

Expand All @@ -93,7 +93,9 @@ jobs:
- rumba32
- LERDGEX
- LERDGEK
- mks_robin_nano35
- mks_robin_nano_v1v2
- mks_robin_nano_v1_2_usbmod
- mks_robin_nano_v1_3_f4_usbmod
- NUCLEO_F767ZI
- REMRAM_V1
- BTT_SKR_SE_BX
Expand Down
31 changes: 19 additions & 12 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*
* Advanced settings can be found in Configuration_adv.h
*/
#define CONFIGURATION_H_VERSION 02010100
#define CONFIGURATION_H_VERSION 02010200

//===========================================================================
//============================= Getting Started =============================
Expand Down Expand Up @@ -141,6 +141,8 @@
// Choose your own or use a service like https://www.uuidgenerator.net/version4
//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"

// @section stepper drivers

/**
* Stepper Drivers
*
Expand Down Expand Up @@ -240,6 +242,8 @@
//#define SINGLENOZZLE_STANDBY_FAN
#endif

// @section multi-material

/**
* Multi-Material Unit
* Set to one of these predefined models:
Expand All @@ -252,6 +256,7 @@
*
* Requires NOZZLE_PARK_FEATURE to park print head in case MMU unit fails.
* See additional options in Configuration_adv.h.
* :["PRUSA_MMU1", "PRUSA_MMU2", "PRUSA_MMU2S", "EXTENDABLE_EMU_MMU2", "EXTENDABLE_EMU_MMU2S"]
*/
//#define MMU_MODEL PRUSA_MMU2

Expand Down Expand Up @@ -1629,7 +1634,7 @@
#define DISABLE_E false // Disable the extruder when not stepping
#define DISABLE_INACTIVE_EXTRUDER // Keep only the active extruder enabled

// @section machine
// @section motion

// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
#define INVERT_X_DIR false
Expand Down Expand Up @@ -2129,9 +2134,8 @@
#define XY_DIAG_BD 282.8427124746
#define XY_SIDE_AD 200

// Or, set the default skew factors directly here
// to override the above measurements:
#define XY_SKEW_FACTOR 0.0
// Or, set the XY skew factor directly:
//#define XY_SKEW_FACTOR 0.0

//#define SKEW_CORRECTION_FOR_Z
#if ENABLED(SKEW_CORRECTION_FOR_Z)
Expand All @@ -2140,8 +2144,10 @@
#define YZ_DIAG_AC 282.8427124746
#define YZ_DIAG_BD 282.8427124746
#define YZ_SIDE_AD 200
#define XZ_SKEW_FACTOR 0.0
#define YZ_SKEW_FACTOR 0.0

// Or, set the Z skew factors directly:
//#define XZ_SKEW_FACTOR 0.0
//#define YZ_SKEW_FACTOR 0.0
#endif

// Enable this option for M852 to set skew at runtime
Expand Down Expand Up @@ -2199,7 +2205,7 @@
// @section temperature

//
// Preheat Constants - Up to 6 are supported without changes
// Preheat Constants - Up to 10 are supported without changes
//
#define PREHEAT_1_LABEL "PLA"
#define PREHEAT_1_TEMP_HOTEND 180
Expand Down Expand Up @@ -2357,7 +2363,7 @@
*/
//#define PRINTCOUNTER
#if ENABLED(PRINTCOUNTER)
#define PRINTCOUNTER_SAVE_INTERVAL 60 // (minutes) EEPROM save interval during print
#define PRINTCOUNTER_SAVE_INTERVAL 60 // (minutes) EEPROM save interval during print. A value of 0 will save stats at end of print.
#endif

// @section security
Expand Down Expand Up @@ -3150,10 +3156,11 @@
//
//#define TOUCH_SCREEN
#if ENABLED(TOUCH_SCREEN)
#define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens
#define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus
#define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens
#define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus

//#define TOUCH_IDLE_SLEEP 300 // (s) Turn off the TFT backlight if set (5mn)
//#define DISABLE_ENCODER // Disable the click encoder, if any
//#define TOUCH_IDLE_SLEEP_MINS 5 // (minutes) Display Sleep after a period of inactivity. Set with M255 S.

#define TOUCH_SCREEN_CALIBRATION
Expand Down
9 changes: 5 additions & 4 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* Basic settings can be found in Configuration.h
*/
#define CONFIGURATION_ADV_H_VERSION 02010100
#define CONFIGURATION_ADV_H_VERSION 02010200

// @section develop

Expand All @@ -48,7 +48,7 @@
* 3 = schema.json - The entire configuration schema. (13 = pattern groups)
* 4 = schema.yml - The entire configuration schema.
*/
//#define CONFIG_EXPORT // :[1:'JSON', 2:'config.ini', 3:'schema.json', 4:'schema.yml']
//#define CONFIG_EXPORT 2 // :[1:'JSON', 2:'config.ini', 3:'schema.json', 4:'schema.yml']

//===========================================================================
//============================= Thermal Settings ============================
Expand Down Expand Up @@ -1321,7 +1321,7 @@
//
// LCD Backlight Timeout
//
//#define LCD_BACKLIGHT_TIMEOUT 30 // (s) Timeout before turning off the backlight
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight

#if HAS_BED_PROBE && EITHER(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
Expand Down Expand Up @@ -1578,6 +1578,7 @@

//#define LONG_FILENAME_HOST_SUPPORT // Get the long filename of a file/folder with 'M33 <dosname>' and list long filenames with 'M20 L'
//#define LONG_FILENAME_WRITE_SUPPORT // Create / delete files with long filenames via M28, M30, and Binary Transfer Protocol
//#define M20_TIMESTAMP_SUPPORT // Include timestamps by adding the 'T' flag to M20 commands

//#define SCROLL_LONG_FILENAMES // Scroll long filenames in the SD card menu

Expand Down Expand Up @@ -1739,7 +1740,7 @@
* Adds the menu item Configuration > LCD Timeout (m) to set a wait period
* from 0 (disabled) to 99 minutes.
*/
//#define DISPLAY_SLEEP_MINUTES 2 // (minutes) Timeout before turning off the screen
//#define DISPLAY_SLEEP_MINUTES 2 // (minutes) Timeout before turning off the screen. Set with M255 S.
/**
* ST7920-based LCDs can emulate a 16 x 4 character display using
Expand Down
2 changes: 1 addition & 1 deletion Marlin/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
//#define STRING_DISTRIBUTION_DATE "2022-08-12"
//#define STRING_DISTRIBUTION_DATE "2022-08-30"

/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
Expand Down
Loading

0 comments on commit 02397b2

Please sign in to comment.