Skip to content

Merged alexqzd's GcodePreview feature #1678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dante-35 wants to merge 10 commits into
base: bugfix-JyersUI
Choose a base branch
from
Open

Merged alexqzd's GcodePreview feature #1678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d5b56a7
Corrected CHOPPER_TIMING values for Ender3-V2
dante-35 Dec 7, 2021
a7ddee0
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-JyersUI
dante-35 Dec 7, 2021
18b8f1e
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-JyersUI
dante-35 Dec 7, 2021
41faed5
Merge branch 'bugfix-JyersUI' of https://github.com/dante-35/Marlin i…
dante-35 Dec 7, 2021
82595b8
Corrected CHOPPER_TIMING values to 24V for Ender3-V2 in templates
dante-35 Dec 7, 2021
560417b
Make Some changes to my config files
dante-35 Dec 8, 2021
e454fbc
Successfully Merged alexqzd's GcodePreview ui
dante-35 Dec 8, 2021
6d91c7c
ReadMe
dante-35 Dec 8, 2021
27acbca
Configuration updates for GCODE_PREVIEW
dante-35 Dec 8, 2021
fa30a9f
Merged Fix serial buffer size for Maple and STSTM32 #22292
dante-35 Dec 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,001 changes: 3,001 additions & 0 deletions Configuration Files/Dante's Config/Configuration.h
View file
Open in desktop

Large diffs are not rendered by default.

4,219 changes: 4,219 additions & 0 deletions Configuration Files/Dante's Config/Configuration_adv.h
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions Configuration Files/E3V2 Templates/BLTouch-3x3-HighSpeed/Configuration.h
View file
Open in desktop
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 02000903
#define CONFIGURATION_H_VERSION 02000902

//===========================================================================
//============================= Getting Started =============================
Expand Down Expand Up @@ -2806,7 +2806,13 @@
// Ender-3 v2 OEM display with enhancements by Jacob Myers
//
#define DWIN_CREALITY_LCD_JYERSUI

#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
//
// Enable gcode preview images
// Requires using a post-processing script with Cura or PrusaSlicer
//
#define DWIN_CREALITY_LCD_JYERSUI_GCODE_PREVIEW
#endif
//
// MarlinUI for Creality's DWIN display (and others)
//
Expand Down
4 changes: 2 additions & 2 deletions Configuration Files/E3V2 Templates/BLTouch-3x3-HighSpeed/Configuration_adv.h
View file
Open in desktop
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 02000903
#define CONFIGURATION_ADV_H_VERSION 02000902

//===========================================================================
//============================= Thermal Settings ============================
Expand Down Expand Up @@ -2855,7 +2855,7 @@
* Define your own with:
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
*/
#define CHOPPER_TIMING CHOPPER_DEFAULT_12V // All axes (override below)
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V // All axes (override below)
//#define CHOPPER_TIMING_X CHOPPER_TIMING // For X Axes (override below)
//#define CHOPPER_TIMING_X2 CHOPPER_TIMING_X
//#define CHOPPER_TIMING_Y CHOPPER_TIMING // For Y Axes (override below)
Expand Down
10 changes: 8 additions & 2 deletions Configuration Files/E3V2 Templates/BLTouch-3x3/Configuration.h
View file
Open in desktop
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 02000903
#define CONFIGURATION_H_VERSION 02000902

//===========================================================================
//============================= Getting Started =============================
Expand Down Expand Up @@ -2806,7 +2806,13 @@
// Ender-3 v2 OEM display with enhancements by Jacob Myers
//
#define DWIN_CREALITY_LCD_JYERSUI

#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
//
// Enable gcode preview images
// Requires using a post-processing script with Cura or PrusaSlicer
//
#define DWIN_CREALITY_LCD_JYERSUI_GCODE_PREVIEW
#endif
//
// MarlinUI for Creality's DWIN display (and others)
//
Expand Down
4 changes: 2 additions & 2 deletions Configuration Files/E3V2 Templates/BLTouch-3x3/Configuration_adv.h
View file
Open in desktop
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 02000903
#define CONFIGURATION_ADV_H_VERSION 02000902

//===========================================================================
//============================= Thermal Settings ============================
Expand Down Expand Up @@ -2855,7 +2855,7 @@
* Define your own with:
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
*/
#define CHOPPER_TIMING CHOPPER_DEFAULT_12V // All axes (override below)
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V // All axes (override below)
//#define CHOPPER_TIMING_X CHOPPER_TIMING // For X Axes (override below)
//#define CHOPPER_TIMING_X2 CHOPPER_TIMING_X
//#define CHOPPER_TIMING_Y CHOPPER_TIMING // For Y Axes (override below)
Expand Down
10 changes: 8 additions & 2 deletions Configuration Files/E3V2 Templates/Default-NoProbe/Configuration.h
View file
Open in desktop
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 02000903
#define CONFIGURATION_H_VERSION 02000902

//===========================================================================
//============================= Getting Started =============================
Expand Down Expand Up @@ -2806,7 +2806,13 @@
// Ender-3 v2 OEM display with enhancements by Jacob Myers
//
#define DWIN_CREALITY_LCD_JYERSUI

#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
//
// Enable gcode preview images
// Requires using a post-processing script with Cura or PrusaSlicer
//
#define DWIN_CREALITY_LCD_JYERSUI_GCODE_PREVIEW
#endif
//
// MarlinUI for Creality's DWIN display (and others)
//
Expand Down
4 changes: 2 additions & 2 deletions Configuration Files/E3V2 Templates/Default-NoProbe/Configuration_adv.h
View file
Open in desktop
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 02000903
#define CONFIGURATION_ADV_H_VERSION 02000902

//===========================================================================
//============================= Thermal Settings ============================
Expand Down Expand Up @@ -2855,7 +2855,7 @@
* Define your own with:
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
*/
#define CHOPPER_TIMING CHOPPER_DEFAULT_12V // All axes (override below)
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V // All axes (override below)
//#define CHOPPER_TIMING_X CHOPPER_TIMING // For X Axes (override below)
//#define CHOPPER_TIMING_X2 CHOPPER_TIMING_X
//#define CHOPPER_TIMING_Y CHOPPER_TIMING // For Y Axes (override below)
Expand Down
10 changes: 8 additions & 2 deletions Configuration Files/E3V2 Templates/ManualMesh-3x3/Configuration.h
View file
Open in desktop
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 02000903
#define CONFIGURATION_H_VERSION 02000902

//===========================================================================
//============================= Getting Started =============================
Expand Down Expand Up @@ -2803,7 +2803,13 @@
// Ender-3 v2 OEM display with enhancements by Jacob Myers
//
#define DWIN_CREALITY_LCD_JYERSUI

#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
//
// Enable gcode preview images
// Requires using a post-processing script with Cura or PrusaSlicer
//
#define DWIN_CREALITY_LCD_JYERSUI_GCODE_PREVIEW
#endif
//
// MarlinUI for Creality's DWIN display (and others)
//
Expand Down
4 changes: 2 additions & 2 deletions Configuration Files/E3V2 Templates/ManualMesh-3x3/Configuration_adv.h
View file
Open in desktop
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 02000903
#define CONFIGURATION_ADV_H_VERSION 02000902

//===========================================================================
//============================= Thermal Settings ============================
Expand Down Expand Up @@ -2855,7 +2855,7 @@
* Define your own with:
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
*/
#define CHOPPER_TIMING CHOPPER_DEFAULT_12V // All axes (override below)
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V // All axes (override below)
//#define CHOPPER_TIMING_X CHOPPER_TIMING // For X Axes (override below)
//#define CHOPPER_TIMING_X2 CHOPPER_TIMING_X
//#define CHOPPER_TIMING_Y CHOPPER_TIMING // For Y Axes (override below)
Expand Down
10 changes: 8 additions & 2 deletions Configuration Files/E3V2 Templates/UBL-BLTouch-10x10/Configuration.h
View file
Open in desktop
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 02000903
#define CONFIGURATION_H_VERSION 02000902

//===========================================================================
//============================= Getting Started =============================
Expand Down Expand Up @@ -2806,7 +2806,13 @@
// Ender-3 v2 OEM display with enhancements by Jacob Myers
//
#define DWIN_CREALITY_LCD_JYERSUI

#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
//
// Enable gcode preview images
// Requires using a post-processing script with Cura or PrusaSlicer
//
#define DWIN_CREALITY_LCD_JYERSUI_GCODE_PREVIEW
#endif
//
// MarlinUI for Creality's DWIN display (and others)
//
Expand Down
4 changes: 2 additions & 2 deletions Configuration Files/E3V2 Templates/UBL-BLTouch-10x10/Configuration_adv.h
View file
Open in desktop
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 02000903
#define CONFIGURATION_ADV_H_VERSION 02000902

//===========================================================================
//============================= Thermal Settings ============================
Expand Down Expand Up @@ -2855,7 +2855,7 @@
* Define your own with:
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
*/
#define CHOPPER_TIMING CHOPPER_DEFAULT_12V // All axes (override below)
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V // All axes (override below)
//#define CHOPPER_TIMING_X CHOPPER_TIMING // For X Axes (override below)
//#define CHOPPER_TIMING_X2 CHOPPER_TIMING_X
//#define CHOPPER_TIMING_Y CHOPPER_TIMING // For Y Axes (override below)
Expand Down
10 changes: 8 additions & 2 deletions Configuration Files/E3V2 Templates/UBL-NoProbe-3x3/Configuration.h
View file
Open in desktop
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 02000903
#define CONFIGURATION_H_VERSION 02000902

//===========================================================================
//============================= Getting Started =============================
Expand Down Expand Up @@ -2806,7 +2806,13 @@
// Ender-3 v2 OEM display with enhancements by Jacob Myers
//
#define DWIN_CREALITY_LCD_JYERSUI

#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
//
// Enable gcode preview images
// Requires using a post-processing script with Cura or PrusaSlicer
//
#define DWIN_CREALITY_LCD_JYERSUI_GCODE_PREVIEW
#endif
//
// MarlinUI for Creality's DWIN display (and others)
//
Expand Down
4 changes: 2 additions & 2 deletions Configuration Files/E3V2 Templates/UBL-NoProbe-3x3/Configuration_adv.h
View file
Open in desktop
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 02000903
#define CONFIGURATION_ADV_H_VERSION 02000902

//===========================================================================
//============================= Thermal Settings ============================
Expand Down Expand Up @@ -2855,7 +2855,7 @@
* Define your own with:
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
*/
#define CHOPPER_TIMING CHOPPER_DEFAULT_12V // All axes (override below)
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V // All axes (override below)
//#define CHOPPER_TIMING_X CHOPPER_TIMING // For X Axes (override below)
//#define CHOPPER_TIMING_X2 CHOPPER_TIMING_X
//#define CHOPPER_TIMING_Y CHOPPER_TIMING // For Y Axes (override below)
Expand Down
10 changes: 8 additions & 2 deletions Configuration Files/Jyers's Config/Configuration.h
View file
Open in desktop
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 02000903
#define CONFIGURATION_H_VERSION 02000902

//===========================================================================
//============================= Getting Started =============================
Expand Down Expand Up @@ -2806,7 +2806,13 @@
// Ender-3 v2 OEM display with enhancements by Jacob Myers
//
#define DWIN_CREALITY_LCD_JYERSUI

#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
//
// Enable gcode preview images
// Requires using a post-processing script with Cura or PrusaSlicer
//
#define DWIN_CREALITY_LCD_JYERSUI_GCODE_PREVIEW
#endif
//
// MarlinUI for Creality's DWIN display (and others)
//
Expand Down
4 changes: 2 additions & 2 deletions Configuration Files/Jyers's Config/Configuration_adv.h
View file
Open in desktop
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 02000903
#define CONFIGURATION_ADV_H_VERSION 02000902

//===========================================================================
//============================= Thermal Settings ============================
Expand Down Expand Up @@ -2855,7 +2855,7 @@
* Define your own with:
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
*/
#define CHOPPER_TIMING CHOPPER_DEFAULT_12V // All axes (override below)
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V // All axes (override below)
//#define CHOPPER_TIMING_X CHOPPER_TIMING // For X Axes (override below)
//#define CHOPPER_TIMING_X2 CHOPPER_TIMING_X
//#define CHOPPER_TIMING_Y CHOPPER_TIMING // For Y Axes (override below)
Expand Down
Binary file modified Display firmware/Firmware Sets/DWIN_SET (Custom)/9.ICO
View file
Open in desktop
Binary file not shown.
Binary file modified Display firmware/Firmware Sets/DWIN_SET (Gotcha)/9.ICO
View file
Open in desktop
Binary file not shown.
Binary file modified Display firmware/Firmware Sets/DWIN_SET (Original)/9.ICO
View file
Open in desktop
Binary file not shown.
Binary file added Display firmware/Icon Packs/Custom Pack/234-ICON_Preview.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Display firmware/Icon Packs/Gotcha's Pack/234-ICON_Preview.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Display firmware/Icon Packs/Original Icons/234-ICON_Preview.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions Git-Jyers.code-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"folders": [
{
"name": "Marlin",
"path": "."
}
],
"settings": {}
}
Loading