Add ngen as filament type

prusa3d · Dec 21, 2023 · 492261b · 492261b
1 parent e656546
commit 492261b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/src/common/client_response.hpp b/src/common/client_response.hpp
@@ -438,7 +438,7 @@ class ClientResponses {
 #if PRINTER_IS_PRUSA_iX
             Response::PETG_NH,
 #endif
-            Response::ASA, Response::ABS, Response::PC, Response::FLEX, Response::HIPS, Response::PP, Response::PVB, Response::PA, Response::PCTG }, // UserTempSelection
+            Response::ASA, Response::ABS, Response::PC, Response::FLEX, Response::HIPS, Response::PP, Response::PVB, Response::PA, Response::PCTG, Response::NGEN }, // UserTempSelection
     };
     static_assert(std::size(ClientResponses::PreheatResponses) == CountPhases<PhasesPreheat>());
 

diff --git a/src/common/client_response_texts.cpp b/src/common/client_response_texts.cpp
@@ -49,6 +49,7 @@ const std::array<BtnResource, ftrstd::to_underlying(Response::_count)> BtnRespon
     std::make_pair( "PLA",                  &img::spool_58x58 ),        // PLA filament, do not translate
     std::make_pair( "PP",                   &img::spool_58x58 ),        // PP filament, do not translate
     std::make_pair( "PCTG",                 &img::spool_58x58 ),        // PCTG filament, do not translate
+    std::make_pair( "NGEN",                 &img::spool_58x58 ),        // NGEN filament, do not translate
     std::make_pair( "Print",                &img::print_58x58 ),        // Print
     std::make_pair( N_("PRUSA STOCK"),      nullptr ),                  // PrusaStock
     std::make_pair(

diff --git a/src/common/filament.cpp b/src/common/filament.cpp
@@ -27,6 +27,7 @@ const filament::Description filaments[size_t(filament::Type::_last) + 1] = {
     { BtnResponse::GetText(Response::PP), 240, 170, 100, Response::PP },
     { BtnResponse::GetText(Response::PA), 285, 170, 100, Response::PA },
     { BtnResponse::GetText(Response::PCTG), 260, 170, 100, Response::PCTG },
+    { BtnResponse::GetText(Response::NGEN), 240, 170, 90, Response::NGEN },
 #if HAS_LOADCELL()
     { BtnResponse::GetText(Response::FLEX), 240, 170, 50, Response::FLEX },
 #else

diff --git a/src/common/filament.hpp b/src/common/filament.hpp
@@ -29,7 +29,8 @@ enum class Type : uint8_t {
     FLEX,
     PA,
     PCTG,
-    _last = PCTG
+    NGEN,
+    _last = NGEN
 };
 
 constexpr Type default_type = Type::PLA;

diff --git a/src/common/general_response.hpp b/src/common/general_response.hpp
@@ -50,6 +50,7 @@ enum class Response : uint8_t {
     PLA,
     PP,
     PCTG,
+    NGEN,
     Print,
     PrusaStock,
     Purge_more,

diff --git a/src/gui/dialogs/window_dlg_preheat.hpp b/src/gui/dialogs/window_dlg_preheat.hpp
@@ -67,6 +67,7 @@ class MI_COOLDOWN : public WI_LABEL_t {
                           MI_Filament<filament::Type::PP>,      \
                           MI_Filament<filament::Type::PA>,      \
                           MI_Filament<filament::Type::PCTG>,    \
+                          MI_Filament<filament::Type::NGEN>,    \
                           MI_Filament<filament::Type::FLEX>
 #else
     #define ALL_FILAMENTS MI_Filament<filament::Type::PLA>,  \
@@ -79,6 +80,7 @@ class MI_COOLDOWN : public WI_LABEL_t {
                           MI_Filament<filament::Type::PP>,   \
                           MI_Filament<filament::Type::PA>,   \
                           MI_Filament<filament::Type::PCTG>, \
+                          MI_Filament<filament::Type::NGEN>, \
                           MI_Filament<filament::Type::FLEX>
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,8 @@ enum class Type : uint8_t { @@
         FLEX,
         PA,
         PCTG,
-        _last = PCTG
+        NGEN,
+        _last = NGEN
     };
     constexpr Type default_type = Type::PLA;
@@ Expand Down @@