juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:compatible with AMS exist flag

Browse Source 
jira:[none]

Change-Id: I6afeafe0676eded86f83838576d67233f50ee509
(cherry picked from commit a182fa1aa4a3bdd32c4ccfa26adcd92a9f1cca37)
This commit is contained in:
tao wang
2025-04-02 14:39:20 +08:00
committed by Noisyfox
parent bc402d0792
commit 426b5900ee
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/DeviceManager.cpp
View File

@@ -798,19 +798,19 @@ void MachineObject::_parse_tray_now(std::string tray_now)
try {
int tray_now_int = atoi(tray_now.c_str());
if (tray_now_int == 255) {
if (tray_now_int == VIRTUAL_TRAY_MAIN_ID) {
m_ams_id = "0";
m_tray_id = "0";
m_extder_data.extders[MAIN_NOZZLE_ID].snow.ams_id = "";
m_extder_data.extders[MAIN_NOZZLE_ID].snow.slot_id = "";
if (m_tray_now == std::to_string(255)) {
m_extder_data.extders[MAIN_NOZZLE_ID].snow.ams_id = std::to_string(255);
if (m_tray_now == std::to_string(VIRTUAL_TRAY_DEPUTY_ID)) {
m_extder_data.extders[MAIN_NOZZLE_ID].snow.ams_id = std::to_string(VIRTUAL_TRAY_MAIN_ID);
m_extder_data.extders[MAIN_NOZZLE_ID].snow.slot_id = "0";
}
}
else if (tray_now_int == 254) {
m_extder_data.extders[MAIN_NOZZLE_ID].snow.ams_id = std::to_string(254);
else if (tray_now_int == VIRTUAL_TRAY_DEPUTY_ID) {
m_extder_data.extders[MAIN_NOZZLE_ID].snow.ams_id = std::to_string(VIRTUAL_TRAY_MAIN_ID);
m_extder_data.extders[MAIN_NOZZLE_ID].snow.slot_id = "0";
}
else {
@@ -3669,7 +3669,7 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
}
/*the param is invalid in np for Yeshu*/
if (!check_enable_np(jj) && jj.contains("hw_switch_state")) {
if (jj.contains("hw_switch_state")) {
hw_switch_state = jj["hw_switch_state"].get<int>();
m_extder_data.extders[MAIN_NOZZLE_ID].ext_has_filament = hw_switch_state;
}