浏览代码

🎨 abs => ABS

Scott Lahteine 3 年前
父节点
当前提交
84ca21edf7

+ 2
- 2
Marlin/src/feature/probe_temp_comp.cpp 查看文件

@@ -143,13 +143,13 @@ bool ProbeTempComp::finish_calibration(const TempSensorID tsi) {
143 143
   // Sanity check
144 144
   for (calib_idx = 0; calib_idx < measurements; ++calib_idx) {
145 145
     // Restrict the max. offset
146
-    if (abs(data[calib_idx]) > 2000) {
146
+    if (ABS(data[calib_idx]) > 2000) {
147 147
       SERIAL_ECHOLNPGM("!Invalid Z-offset detected (0-2).");
148 148
       clear_offsets(tsi);
149 149
       return false;
150 150
     }
151 151
     // Restrict the max. offset difference between two probings
152
-    if (calib_idx > 0 && abs(data[calib_idx - 1] - data[calib_idx]) > 800) {
152
+    if (calib_idx > 0 && ABS(data[calib_idx - 1] - data[calib_idx]) > 800) {
153 153
       SERIAL_ECHOLNPGM("!Invalid Z-offset between two probings detected (0-0.8).");
154 154
       clear_offsets(TSI_PROBE);
155 155
       return false;

+ 3
- 3
Marlin/src/gcode/bedlevel/G35.cpp 查看文件

@@ -130,7 +130,7 @@ void GcodeSuite::G35() {
130 130
     // Calculate adjusts
131 131
     LOOP_S_L_N(i, 1, G35_PROBE_COUNT) {
132 132
       const float diff = z_measured[0] - z_measured[i],
133
-                  adjust = abs(diff) < 0.001f ? 0 : diff / threads_factor[(screw_thread - 30) / 10];
133
+                  adjust = ABS(diff) < 0.001f ? 0 : diff / threads_factor[(screw_thread - 30) / 10];
134 134
 
135 135
       const int full_turns = trunc(adjust);
136 136
       const float decimal_part = adjust - float(full_turns);
@@ -138,8 +138,8 @@ void GcodeSuite::G35() {
138 138
 
139 139
       SERIAL_ECHOPGM("Turn ");
140 140
       SERIAL_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
141
-      SERIAL_ECHOPAIR(" ", (screw_thread & 1) == (adjust > 0) ? "CCW" : "CW", " by ", abs(full_turns), " turns");
142
-      if (minutes) SERIAL_ECHOPAIR(" and ", abs(minutes), " minutes");
141
+      SERIAL_ECHOPAIR(" ", (screw_thread & 1) == (adjust > 0) ? "CCW" : "CW", " by ", ABS(full_turns), " turns");
142
+      if (minutes) SERIAL_ECHOPAIR(" and ", ABS(minutes), " minutes");
143 143
       if (ENABLED(REPORT_TRAMMING_MM)) SERIAL_ECHOPAIR(" (", -diff, "mm)");
144 144
       SERIAL_EOL();
145 145
     }

+ 1
- 1
Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp 查看文件

@@ -121,7 +121,7 @@ ENCODER_DiffState Encoder_ReceiveAnalyze() {
121 121
     lastEncoderBits = newbutton;
122 122
   }
123 123
 
124
-  if (abs(temp_diff) >= ENCODER_PULSES_PER_STEP) {
124
+  if (ABS(temp_diff) >= ENCODER_PULSES_PER_STEP) {
125 125
     if (temp_diff > 0) temp_diffState = ENCODER_DIFF_CW;
126 126
     else temp_diffState = ENCODER_DIFF_CCW;
127 127
 

+ 10
- 10
Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp 查看文件

@@ -624,25 +624,25 @@ void DGUSScreenHandler::ManualAssistLeveling(DGUS_VP_Variable &var, void *val_pt
624 624
 
625 625
   switch (point_value) {
626 626
     case 0x0001:
627
-      enqueue_corner_move(X_MIN_POS + abs(mks_corner_offsets[0].x),
628
-                          Y_MIN_POS + abs(mks_corner_offsets[0].y), level_speed);
627
+      enqueue_corner_move(X_MIN_POS + ABS(mks_corner_offsets[0].x),
628
+                          Y_MIN_POS + ABS(mks_corner_offsets[0].y), level_speed);
629 629
       queue.enqueue_now_P(PSTR("G28Z"));
630 630
       break;
631 631
     case 0x0002:
632
-      enqueue_corner_move(X_MAX_POS - abs(mks_corner_offsets[1].x),
633
-                          Y_MIN_POS + abs(mks_corner_offsets[1].y), level_speed);
632
+      enqueue_corner_move(X_MAX_POS - ABS(mks_corner_offsets[1].x),
633
+                          Y_MIN_POS + ABS(mks_corner_offsets[1].y), level_speed);
634 634
       break;
635 635
     case 0x0003:
636
-      enqueue_corner_move(X_MAX_POS - abs(mks_corner_offsets[2].x),
637
-                          Y_MAX_POS - abs(mks_corner_offsets[2].y), level_speed);
636
+      enqueue_corner_move(X_MAX_POS - ABS(mks_corner_offsets[2].x),
637
+                          Y_MAX_POS - ABS(mks_corner_offsets[2].y), level_speed);
638 638
       break;
639 639
     case 0x0004:
640
-      enqueue_corner_move(X_MIN_POS + abs(mks_corner_offsets[3].x),
641
-                          Y_MAX_POS - abs(mks_corner_offsets[3].y), level_speed);
640
+      enqueue_corner_move(X_MIN_POS + ABS(mks_corner_offsets[3].x),
641
+                          Y_MAX_POS - ABS(mks_corner_offsets[3].y), level_speed);
642 642
       break;
643 643
     case 0x0005:
644
-      enqueue_corner_move(abs(mks_corner_offsets[4].x),
645
-                          abs(mks_corner_offsets[4].y), level_speed);
644
+      enqueue_corner_move(ABS(mks_corner_offsets[4].x),
645
+                          ABS(mks_corner_offsets[4].y), level_speed);
646 646
       break;
647 647
   }
648 648
 

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp 查看文件

@@ -121,7 +121,7 @@ float BaseMoveAxisScreen::getManualFeedrate(uint8_t axis, float increment_mm) {
121 121
   // being held down, this allows enough margin for the planner to
122 122
   // connect segments and even out the motion.
123 123
   constexpr xyze_feedrate_t max_manual_feedrate = MANUAL_FEEDRATE;
124
-  return min(max_manual_feedrate[axis] / 60.0f, abs(increment_mm * (TOUCH_REPEATS_PER_SECOND) * 0.80f));
124
+  return min(max_manual_feedrate[axis] / 60.0f, ABS(increment_mm * (TOUCH_REPEATS_PER_SECOND) * 0.80f));
125 125
 }
126 126
 
127 127
 void BaseMoveAxisScreen::setManualFeedrate(ExtUI::axis_t axis, float increment_mm) {

+ 2
- 2
Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp 查看文件

@@ -93,9 +93,9 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
93 93
       has_adjust_z = 1;
94 94
       break;
95 95
     case ID_BABY_STEP_DIST:
96
-      if (abs((int)(100 * babystep_dist)) == 1)
96
+      if (ABS((int)(100 * babystep_dist)) == 1)
97 97
         babystep_dist = 0.05;
98
-      else if (abs((int)(100 * babystep_dist)) == 5)
98
+      else if (ABS((int)(100 * babystep_dist)) == 5)
99 99
         babystep_dist = 0.1;
100 100
       else
101 101
         babystep_dist = 0.01;

+ 2
- 2
Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp 查看文件

@@ -519,7 +519,7 @@ void filament_dialog_handle() {
519 519
 
520 520
   if (uiCfg.filament_load_heat_flg) {
521 521
     const celsius_t diff = thermalManager.wholeDegHotend(uiCfg.extruderIndex) - gCfgItems.filament_limit_temp;
522
-    if (abs(diff) < 2 || diff > 0) {
522
+    if (ABS(diff) < 2 || diff > 0) {
523 523
       uiCfg.filament_load_heat_flg = false;
524 524
       lv_clear_dialog();
525 525
       lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_LOAD_COMPLETED);
@@ -535,7 +535,7 @@ void filament_dialog_handle() {
535 535
 
536 536
   if (uiCfg.filament_unload_heat_flg) {
537 537
     const celsius_t diff = thermalManager.wholeDegHotend(uiCfg.extruderIndex) - gCfgItems.filament_limit_temp;
538
-    if (abs(diff) < 2 || diff > 0) {
538
+    if (ABS(diff) < 2 || diff > 0) {
539 539
       uiCfg.filament_unload_heat_flg = false;
540 540
       lv_clear_dialog();
541 541
       lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED);

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp 查看文件

@@ -89,7 +89,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
89 89
       disp_extru_amount();
90 90
       break;
91 91
     case ID_E_STEP:
92
-      switch (abs(uiCfg.extruStep)) {
92
+      switch (ABS(uiCfg.extruStep)) {
93 93
         case  1: uiCfg.extruStep = 5; break;
94 94
         case  5: uiCfg.extruStep = 10; break;
95 95
         case 10: uiCfg.extruStep = 1; break;

+ 2
- 2
Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp 查看文件

@@ -50,7 +50,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
50 50
   switch (obj->mks_obj_id) {
51 51
     case ID_FILAMNT_IN:
52 52
       uiCfg.filament_load_heat_flg = true;
53
-      if (abs(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
53
+      if (ABS(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
54 54
           || gCfgItems.filament_limit_temp <= thermalManager.wholeDegHotend(uiCfg.extruderIndex)) {
55 55
         lv_clear_filament_change();
56 56
         lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_LOAD_COMPLETED);
@@ -67,7 +67,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
67 67
     case ID_FILAMNT_OUT:
68 68
       uiCfg.filament_unload_heat_flg = true;
69 69
       if (thermalManager.degTargetHotend(uiCfg.extruderIndex)
70
-          && (abs(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
70
+          && (ABS(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
71 71
               || thermalManager.wholeDegHotend(uiCfg.extruderIndex) >= gCfgItems.filament_limit_temp)
72 72
       ) {
73 73
         lv_clear_filament_change();

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp 查看文件

@@ -75,7 +75,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
75 75
 
76 76
   switch (obj->mks_obj_id) {
77 77
     case ID_M_STEP:
78
-      if (abs(10 * (int)uiCfg.move_dist) == 100)
78
+      if (ABS(10 * (int)uiCfg.move_dist) == 100)
79 79
         uiCfg.move_dist = 0.1;
80 80
       else
81 81
         uiCfg.move_dist *= 10.0f;

+ 1
- 1
Marlin/src/lcd/menu/menu_bed_corners.cpp 查看文件

@@ -87,7 +87,7 @@ constexpr int lco[] = LEVEL_CORNERS_LEVELING_ORDER;
87 87
 constexpr bool level_corners_3_points = COUNT(lco) == 2;
88 88
 static_assert(level_corners_3_points || COUNT(lco) == 4, "LEVEL_CORNERS_LEVELING_ORDER must have exactly 2 or 4 corners.");
89 89
 
90
-constexpr int lcodiff = abs(lco[0] - lco[1]);
90
+constexpr int lcodiff = ABS(lco[0] - lco[1]);
91 91
 static_assert(COUNT(lco) == 4 || lcodiff == 1 || lcodiff == 3, "The first two LEVEL_CORNERS_LEVELING_ORDER corners must be on the same edge.");
92 92
 
93 93
 constexpr int nr_edge_points = level_corners_3_points ? 3 : 4;

正在加载...
取消
保存