|
@@ -242,18 +242,28 @@ namespace ExtUI {
|
242
|
242
|
}
|
243
|
243
|
|
244
|
244
|
float getTargetFan_percent(const fan_t fan) {
|
245
|
|
- return thermalManager.fanPercent(thermalManager.fan_speed[fan - FAN0]);
|
|
245
|
+ #if FAN_COUNT > 0
|
|
246
|
+ return thermalManager.fanPercent(thermalManager.fan_speed[fan - FAN0]);
|
|
247
|
+ #else
|
|
248
|
+ UNUSED(fan);
|
|
249
|
+ return 0;
|
|
250
|
+ #endif
|
246
|
251
|
}
|
247
|
252
|
|
248
|
253
|
float getActualFan_percent(const fan_t fan) {
|
249
|
|
- return thermalManager.fanPercent(thermalManager.scaledFanSpeed(fan - FAN0));
|
|
254
|
+ #if FAN_COUNT > 0
|
|
255
|
+ return thermalManager.fanPercent(thermalManager.scaledFanSpeed(fan - FAN0));
|
|
256
|
+ #else
|
|
257
|
+ UNUSED(fan);
|
|
258
|
+ return 0;
|
|
259
|
+ #endif
|
250
|
260
|
}
|
251
|
261
|
|
252
|
262
|
float getAxisPosition_mm(const axis_t axis) {
|
253
|
263
|
return flags.manual_motion ? destination[axis] : current_position[axis];
|
254
|
264
|
}
|
255
|
265
|
|
256
|
|
- float getAxisPosition_mm(const extruder_t extruder) {
|
|
266
|
+ float getAxisPosition_mm(const extruder_t) {
|
257
|
267
|
return flags.manual_motion ? destination[E_AXIS] : current_position[E_AXIS];
|
258
|
268
|
}
|
259
|
269
|
|
|
@@ -353,6 +363,9 @@ namespace ExtUI {
|
353
|
363
|
if (e != active_extruder) tool_change(e, no_move);
|
354
|
364
|
#endif
|
355
|
365
|
active_extruder = e;
|
|
366
|
+ #else
|
|
367
|
+ UNUSED(extruder);
|
|
368
|
+ UNUSED(no_move);
|
356
|
369
|
#endif
|
357
|
370
|
}
|
358
|
371
|
|
|
@@ -506,6 +519,7 @@ namespace ExtUI {
|
506
|
519
|
}
|
507
|
520
|
|
508
|
521
|
float getAxisSteps_per_mm(const extruder_t extruder) {
|
|
522
|
+ UNUSED_E(extruder);
|
509
|
523
|
return planner.settings.axis_steps_per_mm[E_AXIS_N(extruder - E0)];
|
510
|
524
|
}
|
511
|
525
|
|
|
@@ -514,6 +528,7 @@ namespace ExtUI {
|
514
|
528
|
}
|
515
|
529
|
|
516
|
530
|
void setAxisSteps_per_mm(const float value, const extruder_t extruder) {
|
|
531
|
+ UNUSED_E(extruder);
|
517
|
532
|
planner.settings.axis_steps_per_mm[E_AXIS_N(axis - E0)] = value;
|
518
|
533
|
}
|
519
|
534
|
|
|
@@ -522,6 +537,7 @@ namespace ExtUI {
|
522
|
537
|
}
|
523
|
538
|
|
524
|
539
|
float getAxisMaxFeedrate_mm_s(const extruder_t extruder) {
|
|
540
|
+ UNUSED_E(extruder);
|
525
|
541
|
return planner.settings.max_feedrate_mm_s[E_AXIS_N(axis - E0)];
|
526
|
542
|
}
|
527
|
543
|
|
|
@@ -530,6 +546,7 @@ namespace ExtUI {
|
530
|
546
|
}
|
531
|
547
|
|
532
|
548
|
void setAxisMaxFeedrate_mm_s(const float value, const extruder_t extruder) {
|
|
549
|
+ UNUSED_E(extruder);
|
533
|
550
|
planner.settings.max_feedrate_mm_s[E_AXIS_N(axis - E0)] = value;
|
534
|
551
|
}
|
535
|
552
|
|
|
@@ -538,6 +555,7 @@ namespace ExtUI {
|
538
|
555
|
}
|
539
|
556
|
|
540
|
557
|
float getAxisMaxAcceleration_mm_s2(const extruder_t extruder) {
|
|
558
|
+ UNUSED_E(extruder);
|
541
|
559
|
return planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(extruder - E0)];
|
542
|
560
|
}
|
543
|
561
|
|
|
@@ -546,6 +564,7 @@ namespace ExtUI {
|
546
|
564
|
}
|
547
|
565
|
|
548
|
566
|
void setAxisMaxAcceleration_mm_s2(const float value, const extruder_t extruder) {
|
|
567
|
+ UNUSED_E(extruder);
|
549
|
568
|
planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(extruder - E0)] = value;
|
550
|
569
|
}
|
551
|
570
|
|
|
@@ -589,7 +608,7 @@ namespace ExtUI {
|
589
|
608
|
return planner.max_jerk[axis];
|
590
|
609
|
}
|
591
|
610
|
|
592
|
|
- float getAxisMaxJerk_mm_s(const extruder_t extruder) {
|
|
611
|
+ float getAxisMaxJerk_mm_s(const extruder_t) {
|
593
|
612
|
return planner.max_jerk[E_AXIS];
|
594
|
613
|
}
|
595
|
614
|
|
|
@@ -597,7 +616,7 @@ namespace ExtUI {
|
597
|
616
|
planner.max_jerk[axis] = value;
|
598
|
617
|
}
|
599
|
618
|
|
600
|
|
- void setAxisMaxJerk_mm_s(const float value, const extruder_t extruder) {
|
|
619
|
+ void setAxisMaxJerk_mm_s(const float value, const extruder_t) {
|
601
|
620
|
planner.max_jerk[E_AXIS] = value;
|
602
|
621
|
}
|
603
|
622
|
#endif
|
|
@@ -780,12 +799,16 @@ namespace ExtUI {
|
780
|
799
|
queue.inject_P(gcode);
|
781
|
800
|
}
|
782
|
801
|
|
783
|
|
- bool commandsInQueue() { return (planner.movesplanned() || queue.length); }
|
|
802
|
+ bool commandsInQueue() { return (planner.movesplanned() || queue.has_commands_queued()); }
|
784
|
803
|
|
785
|
804
|
bool isAxisPositionKnown(const axis_t axis) {
|
786
|
805
|
return TEST(axis_known_position, axis);
|
787
|
806
|
}
|
788
|
807
|
|
|
808
|
+ bool isAxisPositionKnown(const extruder_t) {
|
|
809
|
+ return TEST(axis_known_position, E_AXIS);
|
|
810
|
+ }
|
|
811
|
+
|
789
|
812
|
bool isPositionKnown() { return all_axes_known(); }
|
790
|
813
|
bool isMachineHomed() { return all_axes_homed(); }
|
791
|
814
|
|
|
@@ -814,8 +837,13 @@ namespace ExtUI {
|
814
|
837
|
}
|
815
|
838
|
|
816
|
839
|
void setTargetFan_percent(const float value, const fan_t fan) {
|
817
|
|
- if (fan < FAN_COUNT)
|
818
|
|
- thermalManager.set_fan_speed(fan - FAN0, map(clamp(value, 0, 100), 0, 100, 0, 255));
|
|
840
|
+ #if FAN_COUNT > 0
|
|
841
|
+ if (fan < FAN_COUNT)
|
|
842
|
+ thermalManager.set_fan_speed(fan - FAN0, map(clamp(value, 0, 100), 0, 100, 0, 255));
|
|
843
|
+ #else
|
|
844
|
+ UNUSED(value);
|
|
845
|
+ UNUSED(fan);
|
|
846
|
+ #endif
|
819
|
847
|
}
|
820
|
848
|
|
821
|
849
|
void setFeedrate_percent(const float value) {
|