Skip to content
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

Jump to bottom

Implement support for CTBv4 and encrypted CTB files #10531

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open

Implement support for CTBv4 and encrypted CTB files #10531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
e038d49
Adds extra features like light off delay to MSLA printer settings
NickSica Apr 25, 2023
b27928a
Adds CTB format
NickSica Apr 25, 2023
c5fd4a5
Merge branch 'master' of https://github.com/NickSica/PrusaSlicer
NickSica Apr 25, 2023
34a3d88
Fixes CTB format
NickSica Apr 27, 2023
387a4b2
Adds more configurations for the new SLA options in PrintConfig
NickSica Apr 27, 2023
4d5920c
Adds page number calculation
NickSica Apr 28, 2023
4d26323
Adds model height calculation
NickSica May 1, 2023
672a0f4
Adds more GUI elements for configuration options and fixes missing op…
NickSica May 1, 2023
913d7cb
Fixes type errors with configuration
NickSica May 1, 2023
54346a9
Fixes PWM calculation to be 0-255
NickSica May 1, 2023
cb3afca
Adds configuration for Elegoo SLA printers to Elegoo.ini
NickSica May 2, 2023
aaeb136
Fixes configuration issues for Elegoo printers
NickSica May 3, 2023
e3cff5c
Fixes typo
NickSica May 3, 2023
1be9ab9
Adds configuration options to Preset.cpp
NickSica May 3, 2023
c53142f
Changes default file format for Elegoo SLA printers to ctb
NickSica May 3, 2023
072eb02
Fixes some structuring issues and generic function for getting config…
NickSica May 3, 2023
df9b1b6
Adds ctb to sla file filters
NickSica May 3, 2023
59c3c01
Adds ctb to the ArchiveWriter
NickSica May 3, 2023
78d454a
Fixes thumbnail sizes in Elegoo config to match the usual size
NickSica May 4, 2023
d4a8d2a
Adds RLE encoding to thumbnails
NickSica May 4, 2023
0772905
Changes grouping for SLA settings
NickSica May 4, 2023
c1baccf
Adds new settings to the steps check
NickSica May 4, 2023
b035268
Fixes a lot of bugs in file writing
NickSica May 5, 2023
b7b0c8d
Fixes missing configuration
NickSica May 5, 2023
c1d9757
Puts TSMC options on the same line
NickSica May 5, 2023
e35726b
Fixes more bugs in data write
NickSica May 8, 2023
bb41b16
Fixes a bug in layer generation
NickSica May 9, 2023
f005fd9
Fixes the options tab not being set up right and crashing
NickSica May 9, 2023
f6654a4
Fixes indentation
NickSica May 10, 2023
aa1cb38
Cleans up the header file a bit
NickSica May 10, 2023
a2a6e0a
Fixes the Elegoo SLA printer configurations
NickSica May 10, 2023
6d238df
Fixes the thumbnail
NickSica May 11, 2023
4ed0c1b
Merge remote-tracking branch 'upstream/master'
NickSica May 22, 2023
73df99c
Change CTB to use SLAArchiveFormatRegistry
NickSica May 23, 2023
09e0523
Add retract_height to configuration
NickSica May 25, 2023
0fab737
Change configuration to grey out TSMC options when disabled and keep …
NickSica May 25, 2023
c4f80e1
Fix formatting to follow clang-format
NickSica May 25, 2023
66c23cc
Fix the name of a configuration option in the toggle logic
NickSica May 25, 2023
3233d0a
Merge branch 'master' into master
NickSica Jun 29, 2023
81ab05f
Merge branch 'prusa3d:master' into master
NickSica Aug 23, 2023
a5a01a0
Change float_t to float
NickSica Aug 30, 2023
3d378ee
Change float_t to float
NickSica Aug 30, 2023
ef2db5a
Change from ctb to CTB to emulate other file format setups
NickSica Sep 1, 2023
d0876c9
Add encrypted CTB. Have not tested too much, here be dragons.
NickSica Sep 1, 2023
bc19321
Add openssl and crypto to CMake file
NickSica Sep 1, 2023
2897931
Fix multiple errors, getting closer
NickSica Sep 2, 2023
3cd0911
Fix more bugs, still not quite right
NickSica Sep 3, 2023
41ba848
Fix encrypted CTB files.
NickSica Sep 5, 2023
b24c67e
Move hash to the end and add XOR cipher. Files still don't open in ch…
NickSica Sep 6, 2023
0f44205
Merge branch 'prusa3d:master' into master
NickSica Sep 6, 2023
e26e907
Change PAGE_SIZE to CTB_PAGE_SIZE so it is unique
NickSica Sep 6, 2023
6ced3c4
Fix openssl include and change PAGE_SIZE to CTB_PAGE_SIZE
NickSica Sep 6, 2023
c231aa3
Fix CMakeLists to include openssl correctly
NickSica Sep 7, 2023
d127887
Change to gnu.org so the GMP website isn't as congested
NickSica Sep 8, 2023
28cb0e4
Add VCPKG for easy openssl installation
NickSica Sep 8, 2023
52c9050
Fix TSMC option bug
NickSica Sep 9, 2023
52e181b
Fix some config options and move TSMC into not being set if not enabled
NickSica Sep 9, 2023
db30668
Fix GUI bugs and apply clang-format to some files that were formatted…
NickSica Sep 12, 2023
ce8323f
Fix several bugs and the CTBv4 output. Chitubox now loads the encrypt…
NickSica Sep 12, 2023
032b986
Move some includes to .cpp file to try and fix some RAM usage on wind…
NickSica Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions build_win.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
REM /|/ Copyright (c) 2022 Jebtrix @Jebtrix
REM /|/ Copyright (c) 2021 Justin Schuh @jschuh
REM /|/
REM /|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
REM /|/
REM /|/ Copyright (c) 2022 Jebtrix @Jebtrix
REM /|/ Copyright (c) 2021 Justin Schuh @jschuh
REM /|/
REM /|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
REM /|/
@setlocal disableDelayedExpansion enableExtensions
@IF "%PS_ECHO_ON%" NEQ "" (echo on) ELSE (echo off)
@GOTO :MAIN
Expand Down Expand Up @@ -210,6 +210,9 @@ IF "%PS_STEPS_DIRTY%" EQU "" (
CALL :MAKE_OR_CLEAN_DIRECTORY deps\build "%PS_DEPS_PATH_FILE_NAME%" .vs
CALL :MAKE_OR_CLEAN_DIRECTORY "%PS_DESTDIR%"
)
set VCPKG_TARGET_TRIPLET=%PS_ARCH%
set CMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake
vcpkg install
cd deps\build || GOTO :END
cmake.exe .. -DDESTDIR="%PS_DESTDIR%"
IF %ERRORLEVEL% NEQ 0 IF "%PS_STEPS_DIRTY%" NEQ "" (
Expand Down
2 changes: 1 addition & 1 deletion deps/GMP/GMP.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ else ()
endif ()

ExternalProject_Add(dep_GMP
URL https://gmplib.org/download/gmp/gmp-6.2.1.tar.bz2
URL https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.bz2
URL_HASH SHA256=eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/GMP
BUILD_IN_SOURCE ON
Expand Down