mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-19 19:33:47 +00:00
ENH:support printer connection in farm mode
jira:[none] Change-Id: I05a67e5ff508d21ed9aa1659147c510bd1700b10 (cherry picked from commit 0cf5ca920851735f946b5dd733472009f4dc17de)
This commit is contained in:
@@ -7351,8 +7351,8 @@ MachineObject* DeviceManager::insert_local_device(const BBLocalMachine& machine,
|
|||||||
localMachineList.insert(std::make_pair(machine.dev_id, obj));
|
localMachineList.insert(std::make_pair(machine.dev_id, obj));
|
||||||
}
|
}
|
||||||
obj->printer_type = MachineObject::parse_printer_type(machine.printer_type);
|
obj->printer_type = MachineObject::parse_printer_type(machine.printer_type);
|
||||||
obj->dev_connection_type = connection_type;
|
obj->dev_connection_type = connection_type == "farm" ? "lan":connection_type;
|
||||||
obj->bind_state = bind_state;
|
obj->bind_state = connection_type == "farm" ? "free":bind_state;
|
||||||
obj->bind_sec_link = "secure";
|
obj->bind_sec_link = "secure";
|
||||||
obj->bind_ssdp_version = version;
|
obj->bind_ssdp_version = version;
|
||||||
obj->m_is_online = true;
|
obj->m_is_online = true;
|
||||||
@@ -7622,6 +7622,7 @@ std::map<std::string, MachineObject*> DeviceManager::get_my_machine_list()
|
|||||||
for (auto it = localMachineList.begin(); it != localMachineList.end(); it++) {
|
for (auto it = localMachineList.begin(); it != localMachineList.end(); it++) {
|
||||||
if (!it->second)
|
if (!it->second)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (it->second->has_access_right() && it->second->is_avaliable() && it->second->is_lan_mode_printer()) {
|
if (it->second->has_access_right() && it->second->is_avaliable() && it->second->is_lan_mode_printer()) {
|
||||||
// remove redundant in userMachineList
|
// remove redundant in userMachineList
|
||||||
if (result.find(it->first) == result.end()) {
|
if (result.find(it->first) == result.end()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user