mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-19 03:13:39 +00:00
ENH:fixed the issue of cant send SD card printing in LAN mode
jira:[STUDIO-11944] Change-Id: Iab0b2db690e5cf8e02be5c6bf1bcf94a4e0b5468 (cherry picked from commit 60dd53b26dd30de5ea07d83de19832a089655835)
This commit is contained in:
@@ -492,8 +492,11 @@ void PrintJob::process(Ctl &ctl)
|
|||||||
return true;
|
return true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (m_print_type == "from_sdcard_view") {
|
||||||
if (params.connection_type != "lan") {
|
BOOST_LOG_TRIVIAL(info) << "print_job: try to send with cloud, model is sdcard view";
|
||||||
|
ctl.update_status(curr_percent, _u8L("Sending print job through cloud service"));
|
||||||
|
result = m_agent->start_sdcard_print(params, update_fn, cancel_fn);
|
||||||
|
} else if (params.connection_type != "lan") {
|
||||||
if (params.dev_ip.empty())
|
if (params.dev_ip.empty())
|
||||||
params.comments = "no_ip";
|
params.comments = "no_ip";
|
||||||
else if (this->cloud_print_only)
|
else if (this->cloud_print_only)
|
||||||
@@ -505,12 +508,7 @@ void PrintJob::process(Ctl &ctl)
|
|||||||
|
|
||||||
|
|
||||||
//use ftp only
|
//use ftp only
|
||||||
if (m_print_type == "from_sdcard_view") {
|
if (!wxGetApp().app_config->get("lan_mode_only").empty() && wxGetApp().app_config->get("lan_mode_only") == "1") {
|
||||||
BOOST_LOG_TRIVIAL(info) << "print_job: try to send with cloud, model is sdcard view";
|
|
||||||
ctl.update_status(curr_percent, _u8L("Sending print job through cloud service"));
|
|
||||||
result = m_agent->start_sdcard_print(params, update_fn, cancel_fn);
|
|
||||||
}
|
|
||||||
else if (!wxGetApp().app_config->get("lan_mode_only").empty() && wxGetApp().app_config->get("lan_mode_only") == "1") {
|
|
||||||
|
|
||||||
if (params.password.empty() || params.dev_ip.empty()) {
|
if (params.password.empty() || params.dev_ip.empty()) {
|
||||||
error_text = wxString::Format(_L("Access code:%s IP address:%s"), params.password, params.dev_ip);
|
error_text = wxString::Format(_L("Access code:%s IP address:%s"), params.password, params.dev_ip);
|
||||||
|
|||||||
Reference in New Issue
Block a user