NEW:Support setting filaments in printing
jira:[set filament] Change-Id: Ib37896f9101d93ca63c7edb0b1e6328045a5ddb3
This commit is contained in:
parent
66616cc568
commit
fa2dbd7ada
|
@ -413,7 +413,13 @@ void AMSMaterialsSetting::update()
|
||||||
|
|
||||||
void AMSMaterialsSetting::enable_confirm_button(bool en)
|
void AMSMaterialsSetting::enable_confirm_button(bool en)
|
||||||
{
|
{
|
||||||
|
if (!en) {
|
||||||
|
m_button_confirm->Show(obj->is_support_filament_setting_inprinting);
|
||||||
|
}
|
||||||
|
else {
|
||||||
m_button_confirm->Show(en);
|
m_button_confirm->Show(en);
|
||||||
|
}
|
||||||
|
|
||||||
if (!m_is_third) {
|
if (!m_is_third) {
|
||||||
m_tip_readonly->Hide();
|
m_tip_readonly->Hide();
|
||||||
}
|
}
|
||||||
|
@ -705,7 +711,7 @@ void AMSMaterialsSetting::on_picker_color(wxCommandEvent& event)
|
||||||
|
|
||||||
void AMSMaterialsSetting::on_clr_picker(wxMouseEvent &event)
|
void AMSMaterialsSetting::on_clr_picker(wxMouseEvent &event)
|
||||||
{
|
{
|
||||||
if(!m_is_third || obj->is_in_printing() || obj->can_resume())
|
if(!m_is_third || !obj->is_support_filament_setting_inprinting)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
||||||
|
@ -922,7 +928,7 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi
|
||||||
}
|
}
|
||||||
|
|
||||||
m_button_reset->Show();
|
m_button_reset->Show();
|
||||||
m_button_confirm->Show();
|
//m_button_confirm->Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
m_comboBox_filament->Set(filament_items);
|
m_comboBox_filament->Set(filament_items);
|
||||||
|
|
|
@ -3206,6 +3206,12 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
|
||||||
mc_print_line_number = atoi(jj["mc_print_line_number"].get<std::string>().c_str());
|
mc_print_line_number = atoi(jj["mc_print_line_number"].get<std::string>().c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!key_field_only) {
|
||||||
|
if (jj.contains("flag3")) {
|
||||||
|
int flag3 = jj["flag3"].get<int>();
|
||||||
|
is_support_filament_setting_inprinting = get_flag_bits(flag3, 3);
|
||||||
|
}
|
||||||
|
}
|
||||||
if (!key_field_only) {
|
if (!key_field_only) {
|
||||||
if (jj.contains("net")) {
|
if (jj.contains("net")) {
|
||||||
if (jj["net"].contains("conf")) {
|
if (jj["net"].contains("conf")) {
|
||||||
|
@ -4361,6 +4367,14 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (jj["command"].get<std::string>() == "ams_filament_setting" && !key_field_only) {
|
} else if (jj["command"].get<std::string>() == "ams_filament_setting" && !key_field_only) {
|
||||||
|
if (jj.contains("result") && jj.contains("reason")) {
|
||||||
|
if (jj["result"].get<std::string>() == "fail") {
|
||||||
|
auto err_code = jj["err_code"].get<int>();
|
||||||
|
print_error = err_code;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// BBS trigger ams UI update
|
// BBS trigger ams UI update
|
||||||
ams_version = -1;
|
ams_version = -1;
|
||||||
|
|
||||||
|
|
|
@ -762,6 +762,7 @@ public:
|
||||||
bool is_support_p1s_plus{false};
|
bool is_support_p1s_plus{false};
|
||||||
bool is_support_nozzle_blob_detection{false};
|
bool is_support_nozzle_blob_detection{false};
|
||||||
bool is_support_air_print_detection{false};
|
bool is_support_air_print_detection{false};
|
||||||
|
bool is_support_filament_setting_inprinting{false};
|
||||||
|
|
||||||
int nozzle_max_temperature = -1;
|
int nozzle_max_temperature = -1;
|
||||||
int bed_temperature_limit = -1;
|
int bed_temperature_limit = -1;
|
||||||
|
|
Loading…
Reference in New Issue