diff --git a/fix/const.go b/fix/const.go index e9cf5d0..8ae3cc6 100644 --- a/fix/const.go +++ b/fix/const.go @@ -13,9 +13,9 @@ const ( ToolheadSingle = "singleExtruderToolheadForSM2" ToolheadDual = "dualExtruderToolheadForSM2" - ModelA150 = "A150" - ModelA250 = "A250" - ModelA350 = "A350" + ModelA150 = "Snapmaker 2.0 A150" + ModelA250 = "Snapmaker 2.0 A250" + ModelA350 = "Snapmaker 2.0 A350" ModelA400 = "A400" ModelJ1 = "Snapmaker J1" ) diff --git a/fix/header.go b/fix/header.go index 92fbe0e..3bc7c04 100644 --- a/fix/header.go +++ b/fix/header.go @@ -22,8 +22,9 @@ func headerV0() [][]byte { h = append(h, H(";machine: %s", Params.Model)) h = append(h, H(";file_total_lines: %d", Params.TotalLines+34)) h = append(h, H(";estimated_time(s): %.0f", float64(Params.EstimatedTimeSec)*1.07)) - h = append(h, H(";nozzle_temperature(°C): %.0f", Params.EffectiveNozzleTemperature())) - h = append(h, H(";nozzle_0_temperature(°C): %.0f", Params.NozzleTemperatures[0])) + // h = append(h, H(";nozzle_temperature(°C): %.0f", Params.EffectiveNozzleTemperature())) + h = append(h, H(";nozzle_temperature(°C): %.0f", Params.NozzleTemperatures[0])) + // h = append(h, H(";nozzle_0_temperature(°C): %.0f", Params.NozzleTemperatures[0])) h = append(h, H(";nozzle_0_diameter(mm): %.1f", Params.NozzleDiameters[0])) h = append(h, H(";nozzle_0_material: %s", Params.FilamentTypes[0])) h = append(h, H(";Extruder 0 Retraction Distance: %.2f", Params.Retractions[0])) diff --git a/fix/params.go b/fix/params.go index 74cedca..a4e2c4a 100644 --- a/fix/params.go +++ b/fix/params.go @@ -255,6 +255,10 @@ func ParseParams(f io.Reader) error { Params.Version = 0 } + if strings.Contains(Params.PrinterNotes, "_DUAL") { + Params.ToolHead = ToolheadDual + } + { // printer model && slicer version var models = map[string]string{