bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 abs => ABS

Browse Source
This commit is contained in:
Scott Lahteine
2021-07-29 23:40:27 -05:00
committed by Scott Lahteine
parent eb8649ba42
commit 3e559d5c1c
11 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
View File

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

4
Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
View File

@ -519,7 +519,7 @@ void filament_dialog_handle() {
if (uiCfg.filament_load_heat_flg) {
const celsius_t diff = thermalManager.wholeDegHotend(uiCfg.extruderIndex) - gCfgItems.filament_limit_temp;
if (abs(diff) < 2 || diff > 0) {
if (ABS(diff) < 2 || diff > 0) {
uiCfg.filament_load_heat_flg = false;
lv_clear_dialog();
lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_LOAD_COMPLETED);
@ -535,7 +535,7 @@ void filament_dialog_handle() {
if (uiCfg.filament_unload_heat_flg) {
const celsius_t diff = thermalManager.wholeDegHotend(uiCfg.extruderIndex) - gCfgItems.filament_limit_temp;
if (abs(diff) < 2 || diff > 0) {
if (ABS(diff) < 2 || diff > 0) {
uiCfg.filament_unload_heat_flg = false;
lv_clear_dialog();
lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED);

2
Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
View File

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

4
Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
View File

@ -50,7 +50,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
switch (obj->mks_obj_id) {
case ID_FILAMNT_IN:
uiCfg.filament_load_heat_flg = true;
if (abs(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
if (ABS(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
|| gCfgItems.filament_limit_temp <= thermalManager.wholeDegHotend(uiCfg.extruderIndex)) {
lv_clear_filament_change();
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) {
case ID_FILAMNT_OUT:
uiCfg.filament_unload_heat_flg = true;
if (thermalManager.degTargetHotend(uiCfg.extruderIndex)
&& (abs(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
&& (ABS(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
|| thermalManager.wholeDegHotend(uiCfg.extruderIndex) >= gCfgItems.filament_limit_temp)
) {
lv_clear_filament_change();

2
Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
View File

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