rms/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 00:26:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix H2D LAN print job routing (#13662)

Browse Source
This commit is contained in:
Francesco Palmarini
2026-05-15 19:09:31 +02:00
committed by GitHub
parent 4154785025
commit d614917d1d
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -493,6 +493,13 @@ bool MachineObject::is_series_p() const { return is_series_p(DevPrinterConfigUti
bool MachineObject::is_series_x() const { return is_series_x(DevPrinterConfigUtil::get_printer_series_str(printer_type)); }
bool MachineObject::is_series_o() const { return is_series_o(DevPrinterConfigUtil::get_printer_series_str(printer_type)); }
bool MachineObject::can_use_emmc_print() const
{
AppConfig* config = GUI::wxGetApp().app_config;
std::string disable_emmc_print = config ? config->get("disable_emmc_print") : "true";
return is_support_print_with_emmc && (disable_emmc_print == "0" || disable_emmc_print == "false");
}
std::string MachineObject::get_printer_series_str() const{ return DevPrinterConfigUtil::get_printer_series_str(printer_type);};
void MachineObject::reload_printer_settings()

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

@@ -218,6 +218,7 @@ public:
bool is_series_p() const;
bool is_series_x() const;
bool is_series_o() const;
bool can_use_emmc_print() const;
void reload_printer_settings();
std::string get_printer_thumbnail_img_str() const;

7
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -2526,7 +2526,10 @@ void SelectMachineDialog::on_send_print()
|| m_print_job->sdcard_state == DevStorage::SdcardState::HAS_SDCARD_ABNORMAL)
: m_print_job->sdcard_state == DevStorage::SdcardState::HAS_SDCARD_NORMAL;
m_print_job->could_emmc_print = obj_->is_support_print_with_emmc;
m_print_job->could_emmc_print = obj_->can_use_emmc_print();
if (obj_->is_support_print_with_emmc && !m_print_job->could_emmc_print) {
BOOST_LOG_TRIVIAL(info) << "print_job: emmc print disabled by config";
}
bool timelapse_option = m_checkbox_list["timelapse"]->IsShown()?true:false;
@@ -3327,7 +3330,7 @@ void SelectMachineDialog::update_show_status(MachineObject* obj_)
/*check sdcard when if lan mode printer*/
if (obj_->is_lan_mode_printer()) {
if (obj_->GetStorage()->get_sdcard_state() == DevStorage::SdcardState::NO_SDCARD
&& !obj_->is_support_print_with_emmc) {
&& !obj_->can_use_emmc_print()) {
show_status(PrintDialogStatus::PrintStatusLanModeNoSdcard);
return;
} else if (obj_->GetStorage()->get_sdcard_state() == DevStorage::SdcardState::HAS_SDCARD_READONLY) {

4
src/slic3r/Utils/CalibUtils.cpp
View File

@@ -1839,7 +1839,7 @@ void CalibUtils::send_to_print(const CalibInfo &calib_info, wxString &error_mess
? (print_job->sdcard_state == DevStorage::SdcardState::HAS_SDCARD_NORMAL
|| print_job->sdcard_state == DevStorage::SdcardState::HAS_SDCARD_ABNORMAL)
: print_job->sdcard_state == DevStorage::SdcardState::HAS_SDCARD_NORMAL;
print_job->could_emmc_print = obj_->is_support_print_with_emmc;
print_job->could_emmc_print = obj_->can_use_emmc_print();
print_job->set_print_config(MachineBedTypeString[bed_type], true, false, false, false, true, false, 0, 0, 0);
print_job->set_print_job_finished_event(wxGetApp().plater()->get_send_calibration_finished_event(), print_job->m_project_name);
@@ -1962,7 +1962,7 @@ void CalibUtils::send_to_print(const std::vector<CalibInfo> &calib_infos, wxStri
? (print_job->sdcard_state == DevStorage::SdcardState::HAS_SDCARD_NORMAL
|| print_job->sdcard_state == DevStorage::SdcardState::HAS_SDCARD_ABNORMAL)
: print_job->sdcard_state == DevStorage::SdcardState::HAS_SDCARD_NORMAL;
print_job->could_emmc_print = obj_->is_support_print_with_emmc;
print_job->could_emmc_print = obj_->can_use_emmc_print();
print_job->set_print_config(MachineBedTypeString[bed_type], true, true, false, false, true, false, 0, 1, 0);
print_job->set_print_job_finished_event(wxGetApp().plater()->get_send_calibration_finished_event(), print_job->m_project_name);