diff --git a/resources/profiles/QIDITechnology.ini b/resources/profiles/QIDITechnology.ini index 3680c56..d147a4b 100644 --- a/resources/profiles/QIDITechnology.ini +++ b/resources/profiles/QIDITechnology.ini @@ -22,8 +22,6 @@ family = X bed_model = X-MAX 3_bed.stl bed_texture = X-MAX 3.svg default_materials = QIDI ABS Rapido @X-MAX 3; QIDI PLA Rapido @X-MAX 3; QIDI PLA Rapido Matte @X-MAX 3; QIDI ToughPETG @X-MAX 3; Generic ABS @X-MAX 3; Generic PETG @X-MAX 3; Generic PLA @X-MAX 3 -email = MAX3support@qd3Dprinter.com; MAX3AMS@qd3Dprinter.com -skype = MAX3support@qd3Dprinter.com [printer_model:X-Plus 3] name = X-Plus 3 @@ -33,8 +31,6 @@ family = X bed_model = X-Plus 3_bed.stl bed_texture = X-Plus 3.svg default_materials = QIDI ABS Rapido @X-Plus 3; QIDI PLA Rapido @X-Plus 3; QIDI PLA Rapido Matte @X-Plus 3; QIDI ToughPETG @X-Plus 3; Generic ABS @X-Plus 3; Generic PETG @X-Plus 3; Generic PLA @X-Plus 3 -email = Plus3support@qd3Dprinter.com; Plus3AMS@qd3Dprinter.com -skype = Plus3support@qd3Dprinter.com [printer_model:X-smart 3] name = X-smart 3 @@ -44,8 +40,6 @@ family = X bed_model = X-smart 3_bed.stl bed_texture = X-smart 3.svg default_materials = QIDI ABS Rapido @X-smart 3; QIDI PLA Rapido @X-smart 3; QIDI PLA Rapido Matte @X-smart 3; QIDI ToughPETG @X-smart 3; Generic ABS @X-smart 3; Generic PETG @X-smart 3; Generic PLA @X-smart 3 -email = Smart3support@qd3dprinter.com; Smart3AMS@qd3dprinter.com -skype = Smart3AMS@qd3dprinter.com # All presets starting with asterisk, for example *common*, are intermediate and they will # not make it into the user interface. diff --git a/src/slic3r/GUI/FirmwareDialog.cpp b/src/slic3r/GUI/FirmwareDialog.cpp index 804170f..129cd10 100644 --- a/src/slic3r/GUI/FirmwareDialog.cpp +++ b/src/slic3r/GUI/FirmwareDialog.cpp @@ -58,7 +58,7 @@ using Utils::Serial; // USB IDs used to perform device lookup enum { - USB_VID_PRUSA = 0x2c99, + USB_VID_QIDI = 0x2c99, USB_PID_MK2 = 1, USB_PID_MK3 = 2, USB_PID_MMU_BOOT = 3, @@ -409,7 +409,7 @@ void FirmwareDialog::priv::avr109_wait_for_bootloader(Avr109Pid usb_pid, unsigne auto ports = Utils::scan_serial_ports_extended(); ports.erase(std::remove_if(ports.begin(), ports.end(), [=](const SerialPortInfo &port ) { - return port.id_vendor != USB_VID_PRUSA || port.id_product != usb_pid.boot; + return port.id_vendor != USB_VID_QIDI || port.id_product != usb_pid.boot; }), ports.end()); if (ports.size() == 1) { @@ -442,7 +442,7 @@ void FirmwareDialog::priv::avr109_lookup_port(Avr109Pid usb_pid) auto ports = Utils::scan_serial_ports_extended(); ports.erase(std::remove_if(ports.begin(), ports.end(), [=](const SerialPortInfo &port ) { - return port.id_vendor != USB_VID_PRUSA || + return port.id_vendor != USB_VID_QIDI || (port.id_product != usb_pid.boot && port.id_product != usb_pid.app); }), ports.end()); diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index fdfb4f1..efaf33a 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2021,7 +2021,7 @@ void GUI_App::import_model(wxWindow *parent, wxArrayString& input_files) const { input_files.Clear(); wxFileDialog dialog(parent ? parent : GetTopWindow(), - _L("Choose one or more files (STL/3MF/STEP/OBJ/AMF/PRUSA):"), + _L("Choose one or more files (STL/3MF/STEP/OBJ/AMF/QIDI):"), from_u8(app_config->get_last_dir()), "", file_wildcards(FT_MODEL), wxFD_OPEN | wxFD_MULTIPLE | wxFD_FILE_MUST_EXIST);