Skip to content

Commit 4cac89d

Browse files
committed
fix: extruder config parsing error
1 parent 33cf342 commit 4cac89d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

common/lib/data/dto/config/config_extruder.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ class ConfigExtruder with _$ConfigExtruder {
2020
required double maxTemp,
2121
required double maxPower,
2222
required double filamentDiameter,
23-
required double maxExtrudeOnlyVelocity, // mm/s
24-
required double maxExtrudeOnlyAccel, // mm/s^2
23+
required double? maxExtrudeOnlyVelocity, // mm/s
24+
required double? maxExtrudeOnlyAccel, // mm/s^2
2525
}) = _ConfigExtruder;
2626

2727
factory ConfigExtruder.fromJson(String name, Map<String, dynamic> json) =>

lib/ui/components/dialog/filament_operation_dialog.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ class _FilamentOperationDialogController extends _$FilamentOperationDialogContro
538538
state = AsyncValue.data(model.copyWith(movingFilament: true));
539539

540540
final move = min(model.settings.nozzleExtruderDistance, model.extruderConfig.maxExtrudeOnlyDistance);
541-
final veloc = min(model.settings.loadingSpeed, model.extruderConfig.maxExtrudeOnlyVelocity);
541+
final veloc = min(model.settings.loadingSpeed, model.extruderConfig.maxExtrudeOnlyVelocity??50);
542542

543543
if (args.isLoad) {
544544
await _printerService.moveExtruder(move, veloc, true);
@@ -554,7 +554,7 @@ class _FilamentOperationDialogController extends _$FilamentOperationDialogContro
554554
if (model == null) return;
555555
state = AsyncValue.data(model.copyWith(purgingFilament: true));
556556
final move = min(model.settings.purgeLength, model.extruderConfig.maxExtrudeOnlyDistance);
557-
final veloc = min(model.settings.purgeSpeed, model.extruderConfig.maxExtrudeOnlyVelocity);
557+
final veloc = min(model.settings.purgeSpeed, model.extruderConfig.maxExtrudeOnlyVelocity??50);
558558
await _printerService.moveExtruder(move, veloc, true);
559559

560560
state = AsyncValue.data(state.requireValue.copyWith(purgingFilament: false));

0 commit comments

Comments
 (0)