viewit/OrcaSlicer-KX
5
1
Fork 1
Code Issues Pull Requests Actions 6 Packages Projects Releases 4 Wiki Activity

ENH:supports new fields for flag3

Browse Source 
jira:[none]

Change-Id: I013c7b843f3f7d5156a8d209572da2bc078e9191
(cherry picked from commit 106d9865c3e569b95519ae9bd9193d10bd991d1a)
This commit is contained in:
tao wang
2025-04-08 16:02:35 +08:00
committed by Noisyfox
parent 48621974eb
commit 758736affc
4 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/slic3r/GUI/StatusPanel.cpp
View File

@@ -3310,7 +3310,7 @@ void StatusPanel::update_ams(MachineObject *obj)
} else {
m_ams_control->SetAmsStep(ext.snow.ams_id, ext.snow.slot_id, AMSPassRoadType::AMS_ROAD_TYPE_UNLOAD, AMSPassRoadSTEP::AMS_ROAD_STEP_NONE);
}
m_ams_control->SetExtruder(ext.ext_has_filament, ext.snow.ams_id, ext.snow.slot_id);
m_ams_control->SetExtruder(ext.ext_has_filament, MAIN_NOZZLE_ID, ext.snow.ams_id, ext.snow.slot_id);
}
/*left*/
@@ -3325,7 +3325,7 @@ void StatusPanel::update_ams(MachineObject *obj)
} else {
m_ams_control->SetAmsStep(ext.snow.ams_id, ext.snow.slot_id, AMSPassRoadType::AMS_ROAD_TYPE_UNLOAD, AMSPassRoadSTEP::AMS_ROAD_STEP_NONE);
}
m_ams_control->SetExtruder(ext.ext_has_filament, ext.snow.ams_id, ext.snow.slot_id);
m_ams_control->SetExtruder(ext.ext_has_filament, DEPUTY_NOZZLE_ID, ext.snow.ams_id, ext.snow.slot_id);
}
//}
@@ -4271,6 +4271,8 @@ void StatusPanel::on_ams_load_vams(wxCommandEvent& event) {
void StatusPanel::on_ams_switch(SimpleEvent &event)
{
if(obj){
/*right*/
if (obj->m_extder_data.extders.size() > 0) {
auto ext = obj->m_extder_data.extders[MAIN_NOZZLE_ID];
if (ext.ext_has_filament) {
@@ -4282,7 +4284,7 @@ void StatusPanel::on_ams_switch(SimpleEvent &event)
} else {
m_ams_control->SetAmsStep(ext.snow.ams_id, ext.snow.slot_id, AMSPassRoadType::AMS_ROAD_TYPE_UNLOAD, AMSPassRoadSTEP::AMS_ROAD_STEP_NONE);
}
m_ams_control->SetExtruder(ext.ext_has_filament, ext.snow.ams_id, ext.snow.slot_id);
m_ams_control->SetExtruder(ext.ext_has_filament, MAIN_NOZZLE_ID, ext.snow.ams_id, ext.snow.slot_id);
}
/*left*/
@@ -4297,7 +4299,7 @@ void StatusPanel::on_ams_switch(SimpleEvent &event)
} else {
m_ams_control->SetAmsStep(ext.snow.ams_id, ext.snow.slot_id, AMSPassRoadType::AMS_ROAD_TYPE_UNLOAD, AMSPassRoadSTEP::AMS_ROAD_STEP_NONE);
}
m_ams_control->SetExtruder(ext.ext_has_filament, ext.snow.ams_id, ext.snow.slot_id);
m_ams_control->SetExtruder(ext.ext_has_filament, DEPUTY_NOZZLE_ID, ext.snow.ams_id, ext.snow.slot_id);
}
}
}
@@ -4565,20 +4567,13 @@ void StatusPanel::on_ams_refresh_rfid(wxCommandEvent &event)
auto has_filament_at_extruder = false;
auto use_new_command = false;
if (obj->m_extder_data.total_extder_count <= 1 && !obj->is_enable_np) {
has_filament_at_extruder = obj->is_filament_at_extruder();
/*for xp support n3s/n3f*/
if (!ams_it->second->info.empty()) {
use_new_command = true;
}
} else {
if (obj->is_enable_np || obj->is_enable_ams_np) {
use_new_command = true;
if (ams_it->second->nozzle < obj->m_extder_data.extders.size()) {
has_filament_at_extruder = obj->m_extder_data.extders[ams_it->second->nozzle].ext_has_filament;
}
} else {
has_filament_at_extruder = obj->is_filament_at_extruder();
}
if (has_filament_at_extruder) {