diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 40a807eccd..06cff54149 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -1632,6 +1632,78 @@ int MachineObject::command_ams_drying_stop() return this->publish_json(j); } +int MachineObject::command_set_chamber_light(LIGHT_EFFECT effect, int on_time, int off_time, int loops, int interval) +{ + json j; + j["system"]["command"] = "ledctrl"; + j["system"]["led_node"] = "chamber_light"; + j["system"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++); + j["system"]["led_mode"] = light_effect_str(effect); + j["system"]["led_on_time"] = on_time; + j["system"]["led_off_time"] = off_time; + j["system"]["loop_times"] = loops; + j["system"]["interval_time"] = interval; + return this->publish_json(j); +} + + +int MachineObject::command_set_chamber_light2(LIGHT_EFFECT effect, int on_time /*= 500*/, int off_time /*= 500*/, int loops /*= 1*/, int interval /*= 1000*/) +{ + json j; + j["system"]["command"] = "ledctrl"; + j["system"]["led_node"] = "chamber_light2"; + j["system"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++); + j["system"]["led_mode"] = light_effect_str(effect); + j["system"]["led_on_time"] = on_time; + j["system"]["led_off_time"] = off_time; + j["system"]["loop_times"] = loops; + j["system"]["interval_time"] = interval; + return this->publish_json(j); +} + +int MachineObject::command_set_printer_nozzle(std::string nozzle_type, float diameter) +{ + nozzle_setting_hold_count = HOLD_COUNT_MAX * 2; + + json j; + j["system"]["command"] = "set_accessories"; + j["system"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++); + j["system"]["accessory_type"] = "nozzle"; + j["system"]["nozzle_type"] = nozzle_type; + j["system"]["nozzle_diameter"] = diameter; + return this->publish_json(j); +} + +int MachineObject::command_set_printer_nozzle2(int id, std::string nozzle_type, float diameter) +{ + nozzle_setting_hold_count = HOLD_COUNT_MAX * 2; + + json j; + j["print"]["command"] = "set_nozzle"; + j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++); + j["print"]["id"] = id; + j["print"]["type"] = nozzle_type; + j["print"]["diameter"] = diameter; + j["print"]["wear"] = 0; + return this->publish_json(j); +} + + +int MachineObject::command_set_work_light(LIGHT_EFFECT effect, int on_time, int off_time, int loops, int interval) +{ + json j; + j["system"]["command"] = "ledctrl"; + j["system"]["led_node"] = "work_light"; + j["system"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++); + j["system"]["led_mode"] = light_effect_str(effect); + j["system"]["led_on_time"] = on_time; + j["system"]["led_off_time"] = off_time; + j["system"]["loop_times"] = loops; + j["system"]["interval_time"] = interval; + + return this->publish_json(j); +} + int MachineObject::command_start_extrusion_cali(int tray_index, int nozzle_temp, int bed_temp, float max_volumetric_speed, std::string setting_id) { BOOST_LOG_TRIVIAL(trace) << "extrusion_cali: tray_id = " << tray_index << ", nozzle_temp = " << nozzle_temp << ", bed_temp = " << bed_temp diff --git a/src/slic3r/Utils/CalibUtils.cpp b/src/slic3r/Utils/CalibUtils.cpp index 392a5661c5..dac8b55973 100644 --- a/src/slic3r/Utils/CalibUtils.cpp +++ b/src/slic3r/Utils/CalibUtils.cpp @@ -1932,7 +1932,7 @@ void CalibUtils::send_to_print(const std::vector &calib_infos, wxStri print_job->set_calibration_task(true); print_job->has_sdcard = obj_->get_sdcard_state() == MachineObject::SdcardState::HAS_SDCARD_NORMAL; - print_job->set_print_config(MachineBedTypeString[bed_type], true, true, false, false, true, 0, 1, 0); + 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); { // after send: record the print job