-
-
Notifications
You must be signed in to change notification settings - Fork 18
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.
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
Fixes #64 [BUG] Crash and reboot after second time gcode preview. #84
Fixes #64 [BUG] Crash and reboot after second time gcode preview. #84
Conversation
modified: Marlin/Configuration.h modified: Marlin/src/lcd/e3v2/proui/custom_gcodes.cpp modified: Marlin/src/lcd/e3v2/proui/dwin.cpp renamed: Marlin/src/lcd/e3v2/proui/gcode_preview_nopro.cpp -> Marlin/src/lcd/e3v2/proui/gcode_preview.cpp modified: Marlin/src/lcd/e3v2/proui/gcode_preview.h deleted: Marlin/src/lcd/e3v2/proui/gcode_preview_nopro.h modified: configurations/Andrew427/Configuration.h modified: configurations/BTT-SKR_Mini_E3_V2/ConfigurationMM.h modified: configurations/BTT-SKR_Mini_E3_V2/ConfigurationUBL.h modified: configurations/BTT-SKR_Mini_E3_V3/ConfigurationMM.h modified: configurations/BTT-SKR_Mini_E3_V3/ConfigurationUBL.h modified: configurations/Creality Ender/BLT/Configuration.h modified: configurations/Creality Ender/Default-NP/Configuration.h modified: configurations/Creality Ender/MM/Configuration.h modified: configurations/Creality Ender/UBL/Configuration.h modified: configurations/Voxelab Aquila 427/BLT/Configuration.h modified: configurations/Voxelab Aquila 427/Default-NP/Configuration.h modified: configurations/Voxelab Aquila 427/MM/Configuration.h modified: configurations/Voxelab Aquila 427/UBL/Configuration.h modified: configurations/Voxelab Aquila/BLT/Configuration.h modified: configurations/Voxelab Aquila/BLT/ConfigurationPro.h modified: configurations/Voxelab Aquila/Default-NP/Configuration.h modified: configurations/Voxelab Aquila/MM/Configuration.h modified: configurations/Voxelab Aquila/UBL/Configuration.h modified: configurations/Voxelab Aquila/UBL/ConfigurationPro.h modified: configurations/Voxelab Aquila/X3/Configuration.h
modified: Marlin/Configuration.h modified: Marlin/src/lcd/e3v2/proui/custom_gcodes.cpp modified: Marlin/src/lcd/e3v2/proui/dwin.cpp renamed: Marlin/src/lcd/e3v2/proui/gcode_preview_nopro.cpp -> Marlin/src/lcd/e3v2/proui/gcode_preview.cpp modified: Marlin/src/lcd/e3v2/proui/gcode_preview.h deleted: Marlin/src/lcd/e3v2/proui/gcode_preview_nopro.h modified: configurations/Andrew427/Configuration.h modified: configurations/BTT-SKR_Mini_E3_V2/ConfigurationMM.h modified: configurations/BTT-SKR_Mini_E3_V2/ConfigurationUBL.h modified: configurations/BTT-SKR_Mini_E3_V3/ConfigurationMM.h modified: configurations/BTT-SKR_Mini_E3_V3/ConfigurationUBL.h modified: configurations/Creality Ender/BLT/Configuration.h modified: configurations/Creality Ender/Default-NP/Configuration.h modified: configurations/Creality Ender/MM/Configuration.h modified: configurations/Creality Ender/UBL/Configuration.h modified: configurations/Voxelab Aquila 427/BLT/Configuration.h modified: configurations/Voxelab Aquila 427/Default-NP/Configuration.h modified: configurations/Voxelab Aquila 427/MM/Configuration.h modified: configurations/Voxelab Aquila 427/UBL/Configuration.h modified: configurations/Voxelab Aquila/BLT/Configuration.h modified: configurations/Voxelab Aquila/BLT/ConfigurationPro.h modified: configurations/Voxelab Aquila/Default-NP/Configuration.h modified: configurations/Voxelab Aquila/MM/Configuration.h modified: configurations/Voxelab Aquila/UBL/Configuration.h modified: configurations/Voxelab Aquila/UBL/ConfigurationPro.h modified: configurations/Voxelab Aquila/X3/Configuration.h
…CProUI into thumbnail-preview
…8/MRiscoCProUI into thumbnail-preview" This reverts commit eea7a70, reversing changes made to 7989e21.
so thats it then? basically instead of using the private proui library gcode_preview we now use the "NOPRO" one (used in Marlin source code) and that is the fix? one thing I can suggest to change, is or change if so, perhaps then we could change all instances of |
Yup². It's a mix use of both private libs (still needed) and nopro (for those major portion we can't change in the private libs).
There's no conflict, as you can see I've actually replaced the |
Revert back `fileprop` struct, moved to .h header file, rename functions Update **dwin.cpp** #include, rename and omit in `Goto_ConfirmToPrint()` Delete `file_header.h`, changed references to `gcode_preview.h` Update Config files so `HAS_GCODE_PREVIEW` can be used in NoPro ver.
I changed things so Gcode Preview can work without not sure what a couple functions did, in the original file_header.h, but I basically transferred that over to gcode_preview.h, and commented those out, however I do not know if they are needed with the Laser function. if you can let me know how everything works, or any changes. but so far it is working great. thank you for the fix!! |
Fixes [BUG] Crash and reboot after second time gcode preview.
modified: Marlin/Configuration.h
modified: Marlin/src/lcd/e3v2/proui/custom_gcodes.cpp
modified: Marlin/src/lcd/e3v2/proui/dwin.cpp
renamed: Marlin/src/lcd/e3v2/proui/gcode_preview_nopro.cpp -> Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
modified: Marlin/src/lcd/e3v2/proui/gcode_preview.h
deleted: Marlin/src/lcd/e3v2/proui/gcode_preview_nopro.h
modified: configurations/Andrew427/Configuration.h
modified: configurations/BTT-SKR_Mini_E3_V2/ConfigurationMM.h
modified: configurations/BTT-SKR_Mini_E3_V2/ConfigurationUBL.h
modified: configurations/BTT-SKR_Mini_E3_V3/ConfigurationMM.h
modified: configurations/BTT-SKR_Mini_E3_V3/ConfigurationUBL.h
modified: configurations/Creality Ender/BLT/Configuration.h
modified: configurations/Creality Ender/Default-NP/Configuration.h
modified: configurations/Creality Ender/MM/Configuration.h
modified: configurations/Creality Ender/UBL/Configuration.h
modified: configurations/Voxelab Aquila 427/BLT/Configuration.h
modified: configurations/Voxelab Aquila 427/Default-NP/Configuration.h
modified: configurations/Voxelab Aquila 427/MM/Configuration.h
modified: configurations/Voxelab Aquila 427/UBL/Configuration.h
modified: configurations/Voxelab Aquila/BLT/Configuration.h
modified: configurations/Voxelab Aquila/BLT/ConfigurationPro.h
modified: configurations/Voxelab Aquila/Default-NP/Configuration.h
modified: configurations/Voxelab Aquila/MM/Configuration.h
modified: configurations/Voxelab Aquila/UBL/Configuration.h
modified: configurations/Voxelab Aquila/UBL/ConfigurationPro.h
modified: configurations/Voxelab Aquila/X3/Configuration.h