Browse Source

Use provided 'constrain'

Scott Lahteine 5 years ago
parent
commit
712aaa26d5
1 changed files with 21 additions and 25 deletions
  1. 21
    25
      Marlin/src/lcd/extensible_ui/ui_api.cpp

+ 21
- 25
Marlin/src/lcd/extensible_ui/ui_api.cpp View File

102
   #include "../../feature/host_actions.h"
102
   #include "../../feature/host_actions.h"
103
 #endif
103
 #endif
104
 
104
 
105
-inline float clamp(const float value, const float minimum, const float maximum) {
106
-  return _MAX(_MIN(value, maximum), minimum);
107
-}
108
-
109
 static struct {
105
 static struct {
110
   uint8_t printer_killed  : 1;
106
   uint8_t printer_killed  : 1;
111
   uint8_t manual_motion : 1;
107
   uint8_t manual_motion : 1;
339
     setFeedrate_mm_s(MMM_TO_MMS(max_manual_feedrate[axis]));
335
     setFeedrate_mm_s(MMM_TO_MMS(max_manual_feedrate[axis]));
340
 
336
 
341
     if (!flags.manual_motion) set_destination_from_current();
337
     if (!flags.manual_motion) set_destination_from_current();
342
-    destination[axis] = clamp(position, min, max);
338
+    destination[axis] = constrain(position, min, max);
343
     flags.manual_motion = true;
339
     flags.manual_motion = true;
344
   }
340
   }
345
 
341
 
474
     void  setAxisCurrent_mA(const float mA, const axis_t axis) {
470
     void  setAxisCurrent_mA(const float mA, const axis_t axis) {
475
       switch (axis) {
471
       switch (axis) {
476
         #if AXIS_IS_TMC(X)
472
         #if AXIS_IS_TMC(X)
477
-          case X: stepperX.rms_current(clamp(mA, 500, 1500)); break;
473
+          case X: stepperX.rms_current(constrain(mA, 500, 1500)); break;
478
         #endif
474
         #endif
479
         #if AXIS_IS_TMC(Y)
475
         #if AXIS_IS_TMC(Y)
480
-          case Y: stepperY.rms_current(clamp(mA, 500, 1500)); break;
476
+          case Y: stepperY.rms_current(constrain(mA, 500, 1500)); break;
481
         #endif
477
         #endif
482
         #if AXIS_IS_TMC(Z)
478
         #if AXIS_IS_TMC(Z)
483
-          case Z: stepperZ.rms_current(clamp(mA, 500, 1500)); break;
479
+          case Z: stepperZ.rms_current(constrain(mA, 500, 1500)); break;
484
         #endif
480
         #endif
485
         default: break;
481
         default: break;
486
       };
482
       };
489
     void  setAxisCurrent_mA(const float mA, const extruder_t extruder) {
485
     void  setAxisCurrent_mA(const float mA, const extruder_t extruder) {
490
       switch (extruder) {
486
       switch (extruder) {
491
         #if AXIS_IS_TMC(E0)
487
         #if AXIS_IS_TMC(E0)
492
-          case E0: stepperE0.rms_current(clamp(mA, 500, 1500)); break;
488
+          case E0: stepperE0.rms_current(constrain(mA, 500, 1500)); break;
493
         #endif
489
         #endif
494
         #if AXIS_IS_TMC(E1)
490
         #if AXIS_IS_TMC(E1)
495
-          case E1: stepperE1.rms_current(clamp(mA, 500, 1500)); break;
491
+          case E1: stepperE1.rms_current(constrain(mA, 500, 1500)); break;
496
         #endif
492
         #endif
497
         #if AXIS_IS_TMC(E2)
493
         #if AXIS_IS_TMC(E2)
498
-          case E2: stepperE2.rms_current(clamp(mA, 500, 1500)); break;
494
+          case E2: stepperE2.rms_current(constrain(mA, 500, 1500)); break;
499
         #endif
495
         #endif
500
         #if AXIS_IS_TMC(E3)
496
         #if AXIS_IS_TMC(E3)
501
-          case E3: stepperE3.rms_current(clamp(mA, 500, 1500)); break;
497
+          case E3: stepperE3.rms_current(constrain(mA, 500, 1500)); break;
502
         #endif
498
         #endif
503
         #if AXIS_IS_TMC(E4)
499
         #if AXIS_IS_TMC(E4)
504
-          case E4: stepperE4.rms_current(clamp(mA, 500, 1500)); break;
500
+          case E4: stepperE4.rms_current(constrain(mA, 500, 1500)); break;
505
         #endif
501
         #endif
506
         #if AXIS_IS_TMC(E5)
502
         #if AXIS_IS_TMC(E5)
507
-          case E5: stepperE5.rms_current(clamp(mA, 500, 1500)); break;
503
+          case E5: stepperE5.rms_current(constrain(mA, 500, 1500)); break;
508
         #endif
504
         #endif
509
         default: break;
505
         default: break;
510
       };
506
       };
607
 
603
 
608
     #ifdef FILAMENT_RUNOUT_DISTANCE_MM
604
     #ifdef FILAMENT_RUNOUT_DISTANCE_MM
609
       float getFilamentRunoutDistance_mm()                 { return runout.runout_distance(); }
605
       float getFilamentRunoutDistance_mm()                 { return runout.runout_distance(); }
610
-      void setFilamentRunoutDistance_mm(const float value) { runout.set_runout_distance(clamp(value, 0, 999)); }
606
+      void setFilamentRunoutDistance_mm(const float value) { runout.set_runout_distance(constrain(value, 0, 999)); }
611
     #endif
607
     #endif
612
   #endif
608
   #endif
613
 
609
 
618
 
614
 
619
     void setLinearAdvance_mm_mm_s(const float value, const extruder_t extruder) {
615
     void setLinearAdvance_mm_mm_s(const float value, const extruder_t extruder) {
620
       if (extruder < EXTRUDERS)
616
       if (extruder < EXTRUDERS)
621
-        planner.extruder_advance_K[extruder - E0] = clamp(value, 0, 999);
617
+        planner.extruder_advance_K[extruder - E0] = constrain(value, 0, 999);
622
     }
618
     }
623
   #endif
619
   #endif
624
 
620
 
629
     }
625
     }
630
 
626
 
631
     void setJunctionDeviation_mm(const float value) {
627
     void setJunctionDeviation_mm(const float value) {
632
-      planner.junction_deviation_mm = clamp(value, 0.01, 0.3);
628
+      planner.junction_deviation_mm = constrain(value, 0.01, 0.3);
633
       #if ENABLED(LIN_ADVANCE)
629
       #if ENABLED(LIN_ADVANCE)
634
         planner.recalculate_max_e_jerk();
630
         planner.recalculate_max_e_jerk();
635
       #endif
631
       #endif
784
   #if ENABLED(BACKLASH_GCODE)
780
   #if ENABLED(BACKLASH_GCODE)
785
     float getAxisBacklash_mm(const axis_t axis)       { return backlash.distance_mm[axis]; }
781
     float getAxisBacklash_mm(const axis_t axis)       { return backlash.distance_mm[axis]; }
786
     void setAxisBacklash_mm(const float value, const axis_t axis)
782
     void setAxisBacklash_mm(const float value, const axis_t axis)
787
-                                                      { backlash.distance_mm[axis] = clamp(value,0,5); }
783
+                                                      { backlash.distance_mm[axis] = constrain(value,0,5); }
788
 
784
 
789
     float getBacklashCorrection_percent()             { return ui8_to_percent(backlash.correction); }
785
     float getBacklashCorrection_percent()             { return ui8_to_percent(backlash.correction); }
790
-    void setBacklashCorrection_percent(const float value) { backlash.correction = map(clamp(value, 0, 100), 0, 100, 0, 255); }
786
+    void setBacklashCorrection_percent(const float value) { backlash.correction = map(constrain(value, 0, 100), 0, 100, 0, 255); }
791
 
787
 
792
     #ifdef BACKLASH_SMOOTHING_MM
788
     #ifdef BACKLASH_SMOOTHING_MM
793
       float getBacklashSmoothing_mm()                 { return backlash.smoothing_mm; }
789
       float getBacklashSmoothing_mm()                 { return backlash.smoothing_mm; }
794
-      void setBacklashSmoothing_mm(const float value) { backlash.smoothing_mm = clamp(value, 0, 999); }
790
+      void setBacklashSmoothing_mm(const float value) { backlash.smoothing_mm = constrain(value, 0, 999); }
795
     #endif
791
     #endif
796
   #endif
792
   #endif
797
 
793
 
869
     enableHeater(heater);
865
     enableHeater(heater);
870
     #if HAS_HEATED_BED
866
     #if HAS_HEATED_BED
871
       if (heater == BED)
867
       if (heater == BED)
872
-        thermalManager.setTargetBed(clamp(value, 0, BED_MAXTEMP - 10));
868
+        thermalManager.setTargetBed(constrain(value, 0, BED_MAXTEMP - 10));
873
       else
869
       else
874
     #endif
870
     #endif
875
       {
871
       {
876
         #if HOTENDS
872
         #if HOTENDS
877
           static constexpr int16_t heater_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP);
873
           static constexpr int16_t heater_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP);
878
           const int16_t e = heater - H0;
874
           const int16_t e = heater - H0;
879
-          thermalManager.setTargetHotend(clamp(value, 0, heater_maxtemp[e] - 15), e);
875
+          thermalManager.setTargetHotend(constrain(value, 0, heater_maxtemp[e] - 15), e);
880
         #endif
876
         #endif
881
       }
877
       }
882
   }
878
   }
886
       constexpr int16_t heater_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP);
882
       constexpr int16_t heater_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP);
887
       const int16_t e = extruder - E0;
883
       const int16_t e = extruder - E0;
888
       enableHeater(extruder);
884
       enableHeater(extruder);
889
-      thermalManager.setTargetHotend(clamp(value, 0, heater_maxtemp[e] - 15), e);
885
+      thermalManager.setTargetHotend(constrain(value, 0, heater_maxtemp[e] - 15), e);
890
     #endif
886
     #endif
891
   }
887
   }
892
 
888
 
893
   void setTargetFan_percent(const float value, const fan_t fan) {
889
   void setTargetFan_percent(const float value, const fan_t fan) {
894
     #if FAN_COUNT > 0
890
     #if FAN_COUNT > 0
895
       if (fan < FAN_COUNT)
891
       if (fan < FAN_COUNT)
896
-        thermalManager.set_fan_speed(fan - FAN0, map(clamp(value, 0, 100), 0, 100, 0, 255));
892
+        thermalManager.set_fan_speed(fan - FAN0, map(constrain(value, 0, 100), 0, 100, 0, 255));
897
     #else
893
     #else
898
       UNUSED(value);
894
       UNUSED(value);
899
       UNUSED(fan);
895
       UNUSED(fan);
901
   }
897
   }
902
 
898
 
903
   void setFeedrate_percent(const float value) {
899
   void setFeedrate_percent(const float value) {
904
-    feedrate_percentage = clamp(value, 10, 500);
900
+    feedrate_percentage = constrain(value, 10, 500);
905
   }
901
   }
906
 
902
 
907
   void setUserConfirmed() {
903
   void setUserConfirmed() {

Loading…
Cancel
Save