diff --git a/resources/config.json b/resources/config.json index 8f72f43dc4..7c48012fa7 100644 --- a/resources/config.json +++ b/resources/config.json @@ -3,7 +3,6 @@ { "display_name": "Bambu Lab P1P", "func": { - "FUNC_AUTO_LEVELING": true, "FUNC_CHAMBER_TEMP": false, "FUNC_FIRSTLAYER_INSPECT": false, "FUNC_AI_MONITORING": false, @@ -11,14 +10,13 @@ "FUNC_AUTO_RECOVERY_STEP_LOSS": false, "FUNC_FLOW_CALIBRATION": false, "FUNC_MONITORING": false, - "FUNC_RECORDING": false, "FUNC_TIMELAPSE": false, - "FUNC_CAMERA_VIDEO": true, "FUNC_MEDIA_FILE": false, "FUNC_REMOTE_TUNNEL": false, "FUNC_LOCAL_TUNNEL": true, "FUNC_PRINT_WITHOUT_SD": false, "FUNC_ALTER_RESOLUTION": false, + "FUNC_AUTO_SWITCH_FILAMENT": false, "FUNC_SEND_TO_SDCARD": false }, "camera_resolution":["720p"], diff --git a/src/slic3r/GUI/AMSSetting.cpp b/src/slic3r/GUI/AMSSetting.cpp index 4baaf95c33..020f115ee8 100644 --- a/src/slic3r/GUI/AMSSetting.cpp +++ b/src/slic3r/GUI/AMSSetting.cpp @@ -179,7 +179,7 @@ void AMSSetting::create() m_sizer_switch_filament_inline = new wxBoxSizer(wxVERTICAL); m_tip_switch_filament_line1 = new wxStaticText(m_panel_body, wxID_ANY, - _L("AMS switches to the same type of filament automatically when the current filament runs out."), + _L("AMS will continue to another spool with the same properties of filament automatically when current filament runs out"), wxDefaultPosition, wxDefaultSize, 0); m_tip_switch_filament_line1->SetFont(::Label::Body_13); m_tip_switch_filament_line1->SetForegroundColour(AMS_SETTING_GREY700); @@ -272,6 +272,17 @@ void AMSSetting::update_remain_mode(bool selected) void AMSSetting::update_switch_filament(bool selected) { + if (obj->is_function_supported(PrinterFunction::FUNC_AUTO_SWITCH_FILAMENT)) { + m_checkbox_switch_filament->Show(); + m_title_switch_filament->Show(); + m_tip_switch_filament_line1->Show(); + Layout(); + } else { + m_checkbox_switch_filament->Hide(); + m_title_switch_filament->Hide(); + m_tip_switch_filament_line1->Hide(); + Layout(); + } m_checkbox_switch_filament->SetValue(selected); } diff --git a/src/slic3r/GUI/CameraPopup.cpp b/src/slic3r/GUI/CameraPopup.cpp index 4de92ec7a2..2d84ed52d3 100644 --- a/src/slic3r/GUI/CameraPopup.cpp +++ b/src/slic3r/GUI/CameraPopup.cpp @@ -53,7 +53,7 @@ CameraPopup::CameraPopup(wxWindow *parent, MachineObject* obj) m_switch_timelapse->SetValue(obj->camera_timelapse); //recording - m_text_recording = new wxStaticText(m_panel, wxID_ANY, _L("Monitoring Recording")); + m_text_recording = new wxStaticText(m_panel, wxID_ANY, _L("Video when printing")); m_text_recording->Wrap(-1); m_text_recording->SetFont(Label::Head_14); m_text_recording->SetForegroundColour(TEXT_COL); diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index e91121060d..117f36323b 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -1956,6 +1956,9 @@ bool MachineObject::is_function_supported(PrinterFunction func) case FUNC_SEND_TO_SDCARD: func_name = "FUNC_SEND_TO_SDCARD"; break; + case FUNC_AUTO_SWITCH_FILAMENT: + func_name = "FUNC_AUTO_SWITCH_FILAMENT"; + break; default: return true; } diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index bd25cbb387..63858af78e 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -81,6 +81,7 @@ enum PrinterFunction { FUNC_USE_AMS, FUNC_ALTER_RESOLUTION, FUNC_SEND_TO_SDCARD, + FUNC_AUTO_SWITCH_FILAMENT, FUNC_MAX };