juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-31 14:52:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:use new command based on AMS type

Browse Source 
jira:[none]

Change-Id: I9411aa5b673b4270fe468a07c38d9966bd31a29a
(cherry picked from commit 83de229aa1306e80646b69ea7ba02f6b2e58f818)
This commit is contained in:
tao wang
2025-04-01 13:02:04 +08:00
committed by Noisyfox
parent ae435eb74c
commit 8ac5ca4e3d
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4422,8 +4422,9 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
int type_id = 1; // 0:dummy 1:ams 2:ams-lite 3:n3f 4:n3s int type_id = 1; // 0:dummy 1:ams 2:ams-lite 3:n3f 4:n3s
/*ams info*/ /*ams info*/
std::string info;
if (it->contains("info")) { if (it->contains("info")) {
std::string info = (*it)["info"].get<std::string>(); info = (*it)["info"].get<std::string>();
type_id = get_flag_bits(info, 0, 4); type_id = get_flag_bits(info, 0, 4);
nozzle_id = get_flag_bits(info, 8, 4); nozzle_id = get_flag_bits(info, 8, 4);
} }
@@ -4440,6 +4441,7 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
auto ams_it = amsList.find(ams_id); auto ams_it = amsList.find(ams_id);
if (ams_it == amsList.end()) { if (ams_it == amsList.end()) {
Ams* new_ams = new Ams(ams_id, nozzle_id, type_id); Ams* new_ams = new Ams(ams_id, nozzle_id, type_id);
new_ams->info = info;
amsList.insert(std::make_pair(ams_id, new_ams)); amsList.insert(std::make_pair(ams_id, new_ams));
// new ams added event // new ams added event
curr_ams = new_ams; curr_ams = new_ams;

1
src/slic3r/GUI/DeviceManager.hpp
View File

@@ -374,6 +374,7 @@ public:
type = type_id; type = type_id;
} }
std::string id; std::string id;
std::string info;
int left_dry_time = 0; int left_dry_time = 0;
int humidity = 5; int humidity = 5;
int humidity_raw = -1; // the percentage, -1 means invalid. eg. 100 means 100% int humidity_raw = -1; // the percentage, -1 means invalid. eg. 100 means 100%

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

@@ -4567,6 +4567,12 @@ void StatusPanel::on_ams_refresh_rfid(wxCommandEvent &event)
if (obj->m_extder_data.total_extder_count <= 1 && !obj->is_enable_np) { if (obj->m_extder_data.total_extder_count <= 1 && !obj->is_enable_np) {
has_filament_at_extruder = obj->is_filament_at_extruder(); 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 { } else {
use_new_command = true; use_new_command = true;