juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-10 02:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: promote DevAmsType to global enum, rename DUMMY to EXT_SPOOL

Browse Source 
Matches BambuStudio's DevAmsType naming convention.
This commit is contained in:
Noisyfox
2026-07-07 11:49:55 +08:00
parent c983f60d00
commit 272e88a337
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/DeviceCore/DevDefs.h
View File

@@ -40,6 +40,15 @@ enum AmsStatusMain
AMS_STATUS_MAIN_UNKNOWN = 0xFF, AMS_STATUS_MAIN_UNKNOWN = 0xFF,
}; };
enum DevAmsType : int
{
EXT_SPOOL = 0, // EXT
AMS = 1, // AMS1
AMS_LITE = 2, // AMS-Lite
N3F = 3, // N3F, AMS 2PRO
N3S = 4, // N3S, AMS HT
};
// Slots and Tray // Slots and Tray
#define VIRTUAL_TRAY_MAIN_ID 255 #define VIRTUAL_TRAY_MAIN_ID 255
#define VIRTUAL_TRAY_DEPUTY_ID 254 #define VIRTUAL_TRAY_DEPUTY_ID 254

2
src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp
View File

@@ -111,7 +111,7 @@ DevAms::DevAms(const std::string& ams_id, int nozzle_id, int type)
m_ams_id = ams_id; m_ams_id = ams_id;
m_ext_id = nozzle_id; m_ext_id = nozzle_id;
m_ams_type = (AmsType)type; m_ams_type = (AmsType)type;
assert(DUMMY < type && m_ams_type <= N3S); assert(EXT_SPOOL < type && m_ams_type <= N3S);
} }
DevAms::~DevAms() DevAms::~DevAms()

14
src/slic3r/GUI/DeviceCore/DevFilaSystem.h
View File

@@ -130,14 +130,12 @@ class DevAms
{ {
friend class DevFilaSystemParser; friend class DevFilaSystemParser;
public: public:
enum AmsType : int using AmsType = DevAmsType;
{ static constexpr AmsType EXT_SPOOL = DevAmsType::EXT_SPOOL;
DUMMY = 0, static constexpr AmsType AMS = DevAmsType::AMS;
AMS = 1, // AMS static constexpr AmsType AMS_LITE = DevAmsType::AMS_LITE;
AMS_LITE = 2, // AMS-Lite static constexpr AmsType N3F = DevAmsType::N3F;
N3F = 3, // N3F static constexpr AmsType N3S = DevAmsType::N3S;
N3S = 4, // N3S
};
public: public:
DevAms(const std::string& ams_id, int extruder_id, AmsType type); DevAms(const std::string& ams_id, int extruder_id, AmsType type);

2
src/slic3r/GUI/DeviceCore/DevMapping.cpp
View File

@@ -186,7 +186,7 @@ namespace Slic3r
} }
} }
FilamentInfo info; FilamentInfo info;
_parse_tray_info(atoi(tray.id.c_str()), 0, DevAms::DUMMY, tray, info); _parse_tray_info(atoi(tray.id.c_str()), 0, DevAms::EXT_SPOOL, tray, info);
tray_filaments.emplace(std::make_pair(info.tray_id, info)); tray_filaments.emplace(std::make_pair(info.tray_id, info));
} }
} }