3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-19 23:01:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

ENH:synchronize different codes

Browse source 
Change-Id: I011b39ee85eecbb9da99d1c4fe1f2875267acc32
This commit is contained in:
tao wang 2023-05-25 16:51:01 +08:00 • committed by Lane.Wei
parent f97261bca9
commit 2d8ddca1d6
12 changed files with 50 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/slic3r/Utils/CalibUtils.cpp
View file

@ -619,6 +619,7 @@ void CalibUtils::send_to_print(const std::string& dev_id, const std::string& sel
print_job->m_ftp_folder = obj_->get_ftp_folder();
print_job->m_access_code = obj_->get_access_code();
#if !BBL_RELEASE_TO_PUBLIC
print_job->m_local_use_ssl_for_ftp = wxGetApp().app_config->get("enable_ssl_for_mqtt") == "true" ? true : false;
print_job->m_local_use_ssl_for_mqtt = wxGetApp().app_config->get("enable_ssl_for_ftp") == "true" ? true : false;

8
src/slic3r/Utils/NetworkAgent.cpp
View file

@ -683,14 +683,14 @@ int NetworkAgent::send_message(std::string dev_id, std::string json_str, int qos
return ret;
}
int NetworkAgent::connect_printer(std::string dev_id, std::string dev_ip, std::string username, std::string password)
int NetworkAgent::connect_printer(std::string dev_id, std::string dev_ip, std::string username, std::string password, bool use_ssl)
{
int ret = 0;
if (network_agent && connect_printer_ptr) {
ret = connect_printer_ptr(network_agent, dev_id, dev_ip, username, password);
ret = connect_printer_ptr(network_agent, dev_id, dev_ip, username, password, use_ssl);
if (ret)
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(" error: network_agent=%1%, ret=%2%, dev_id=%3%, dev_ip=%4%, username=%5%, password=%6%")
%network_agent %ret %dev_id %dev_ip %username %password;
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << (boost::format(" error: network_agent=%1%, ret=%2%, dev_id=%3%, dev_ip=%4%, username=%5%, password=%6%")
% network_agent % ret % dev_id % dev_ip % username % password).str();
}
return ret;
}

4
src/slic3r/Utils/NetworkAgent.hpp
View file

@ -32,7 +32,7 @@ typedef int (*func_refresh_connection)(void *agent);
typedef int (*func_start_subscribe)(void *agent, std::string module);
typedef int (*func_stop_subscribe)(void *agent, std::string module);
typedef int (*func_send_message)(void *agent, std::string dev_id, std::string json_str, int qos);
typedef int (*func_connect_printer)(void *agent, std::string dev_id, std::string dev_ip, std::string username, std::string password);
typedef int (*func_connect_printer)(void *agent, std::string dev_id, std::string dev_ip, std::string username, std::string password, bool use_ssl);
typedef int (*func_disconnect_printer)(void *agent);
typedef int (*func_send_message_to_printer)(void *agent, std::string dev_id, std::string json_str, int qos);
typedef bool (*func_start_discovery)(void *agent, bool start, bool sending);
@ -125,7 +125,7 @@ public:
int start_subscribe(std::string module);
int stop_subscribe(std::string module);
int send_message(std::string dev_id, std::string json_str, int qos);
int connect_printer(std::string dev_id, std::string dev_ip, std::string username, std::string password);
int connect_printer(std::string dev_id, std::string dev_ip, std::string username, std::string password, bool use_ssl);
int disconnect_printer();
int send_message_to_printer(std::string dev_id, std::string json_str, int qos);
bool start_discovery(bool start, bool sending);