mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-04 22:31:02 +00:00
Make all vendor profiles pass the updated profile checks
This commit is contained in:
@@ -627,7 +627,8 @@ static const t_config_enum_values s_keys_map_NozzleVolumeType = {
|
||||
{ "High Flow", nvtHighFlow },
|
||||
{ "TPU High Flow", nvtTPUHighFlow },
|
||||
{ "Hybrid", nvtHybrid },
|
||||
{ "E3D High Flow", nvtE3DHighFlow }
|
||||
{ "E3D High Flow", nvtE3DHighFlow },
|
||||
{ "Extra High Flow", nvtExtraHighFlow }
|
||||
};
|
||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(NozzleVolumeType)
|
||||
|
||||
@@ -5956,11 +5957,13 @@ void PrintConfigDef::init_fff_params()
|
||||
def->enum_values.push_back(L("Hybrid"));
|
||||
def->enum_values.push_back(L("TPU High Flow"));
|
||||
def->enum_values.push_back(L("E3D High Flow"));
|
||||
def->enum_values.push_back(L("Extra High Flow"));
|
||||
def->enum_labels.push_back(L("Standard"));
|
||||
def->enum_labels.push_back(L("High Flow"));
|
||||
def->enum_labels.push_back(L("Hybrid"));
|
||||
def->enum_labels.push_back(L("TPU High Flow"));
|
||||
def->enum_labels.push_back(L("E3D High Flow"));
|
||||
def->enum_labels.push_back(L("Extra High Flow"));
|
||||
def->mode = comSimple;
|
||||
def->set_default_value(new ConfigOptionEnumsGeneric{ NozzleVolumeType::nvtStandard });
|
||||
|
||||
@@ -5974,11 +5977,13 @@ void PrintConfigDef::init_fff_params()
|
||||
def->enum_values.push_back(L("Hybrid"));
|
||||
def->enum_values.push_back(L("TPU High Flow"));
|
||||
def->enum_values.push_back(L("E3D High Flow"));
|
||||
def->enum_values.push_back(L("Extra High Flow"));
|
||||
def->enum_labels.push_back(L("Standard"));
|
||||
def->enum_labels.push_back(L("High Flow"));
|
||||
def->enum_labels.push_back(L("Hybrid"));
|
||||
def->enum_labels.push_back(L("TPU High Flow"));
|
||||
def->enum_labels.push_back(L("E3D High Flow"));
|
||||
def->enum_labels.push_back(L("Extra High Flow"));
|
||||
def->mode = comDevelop;
|
||||
def->set_default_value(new ConfigOptionEnumsGeneric{ NozzleVolumeType::nvtStandard });
|
||||
|
||||
@@ -6027,10 +6032,12 @@ void PrintConfigDef::init_fff_params()
|
||||
def->enum_values.push_back("High Flow");
|
||||
def->enum_values.push_back("TPU High Flow");
|
||||
def->enum_values.push_back("E3D High Flow");
|
||||
def->enum_values.push_back("Extra High Flow");
|
||||
def->enum_labels.push_back("Standard");
|
||||
def->enum_labels.push_back("High Flow");
|
||||
def->enum_labels.push_back("TPU High Flow");
|
||||
def->enum_labels.push_back("E3D High Flow");
|
||||
def->enum_labels.push_back("Extra High Flow");
|
||||
def->mode = comDevelop;
|
||||
def->set_default_value(new ConfigOptionEnumsGeneric{ NozzleVolumeType::nvtStandard });
|
||||
|
||||
|
||||
@@ -523,8 +523,9 @@ enum NozzleVolumeType {
|
||||
nvtTPUHighFlow, // physical variant, used on H2D/H2DP 0.4 nozzles only
|
||||
// 4 is reserved: E3D High Flow is 5 in BambuStudio's slice_info and device numbering.
|
||||
nvtE3DHighFlow = 5, // physical variant, E3D high-flow hotend on 0.4/0.6 nozzles
|
||||
nvtExtraHighFlow = 6, // Orca: physical variant with no BambuStudio or device counterpart; only profiles name it
|
||||
// Integer values are serialized as raw ints in 3mf plate metadata and device MQTT, so they MUST stay stable.
|
||||
nvtMaxNozzleVolumeType = nvtE3DHighFlow
|
||||
nvtMaxNozzleVolumeType = nvtExtraHighFlow
|
||||
};
|
||||
|
||||
enum FilamentMapMode {
|
||||
|
||||
@@ -8234,6 +8234,8 @@ static wxString short_nozzle_volume_name(const std::string &volume_name)
|
||||
return "TPU HF";
|
||||
if (volume_name == "E3D High Flow")
|
||||
return "E3D HF";
|
||||
if (volume_name == "Extra High Flow")
|
||||
return "XHF";
|
||||
return from_u8(volume_name);
|
||||
}
|
||||
|
||||
|
||||
@@ -108,6 +108,8 @@ wxString get_nozzle_volume_type_name(NozzleVolumeType type)
|
||||
return _L("TPU High Flow");
|
||||
} else if (NozzleVolumeType::nvtE3DHighFlow == type) {
|
||||
return _L("E3D High Flow");
|
||||
} else if (NozzleVolumeType::nvtExtraHighFlow == type) {
|
||||
return _L("Extra High Flow");
|
||||
}
|
||||
return wxString();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user