3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use first letter capital camel case for enum class members.

Browse source
This commit is contained in:
Marek Bel 2019-06-12 17:19:19 +02:00
parent 9ceba00426
commit 0401490cc1
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Firmware/ultralcd.cpp
View file

@ -210,10 +210,10 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite,
/** Enumerate for lcd_selftest_fan_auto function.
*/
enum class FanCheck : uint_least8_t {
success,
printFan,
extruderFan,
swappedFan,
Success,
PrintFan,
ExtruderFan,
SwappedFan,
};
/**
@ -6772,10 +6772,10 @@ bool lcd_selftest()
_progress = lcd_selftest_screen(TestScreen::ExtruderFan, _progress, 3, true, 2000);
#if (defined(FANCHECK) && defined(TACH_0))
switch (lcd_selftest_fan_auto(0)){ // check extruder Fan
case FanCheck::extruderFan:
case FanCheck::ExtruderFan:
_result = false;
break;
case FanCheck::swappedFan:
case FanCheck::SwappedFan:
_swapped_fan = true;
// no break
default:
@ -6795,10 +6795,10 @@ bool lcd_selftest()
_progress = lcd_selftest_screen(TestScreen::PrintFan, _progress, 3, true, 2000);
#if (defined(FANCHECK) && defined(TACH_1))
switch (lcd_selftest_fan_auto(1)){ // check print fan
case FanCheck::printFan:
case FanCheck::PrintFan:
_result = false;
break;
case FanCheck::swappedFan:
case FanCheck::SwappedFan:
_swapped_fan = true;
// no break
default:
@ -7721,11 +7721,11 @@ static FanCheck lcd_selftest_fan_auto(int _fan)
printf_P(PSTR("Extr fan speed: %d \n"), fan_speed[0]);
if (!fan_speed[0]) {
return FanCheck::extruderFan;
return FanCheck::ExtruderFan;
}
#ifdef FAN_SOFT_PWM
else if (fan_speed[0] > 50 ) { // printerFan is faster
return FanCheck::swappedFan;
return FanCheck::SwappedFan;
}
break;
#endif
@ -7760,7 +7760,7 @@ static FanCheck lcd_selftest_fan_auto(int _fan)
printf_P(PSTR("Print fan speed: %d \n"), fan_speed[1]);
printf_P(PSTR("Extr fan speed: %d \n"), fan_speed[0]);
if (!fan_speed[1]) {
return FanCheck::printFan;
return FanCheck::PrintFan;
}
#ifdef FAN_SOFT_PWM
@ -7779,18 +7779,18 @@ static FanCheck lcd_selftest_fan_auto(int _fan)
// noctua speed is between 17 and 24, turbine more then 30
if (fan_speed[1] < 30) {
return FanCheck::swappedFan;
return FanCheck::SwappedFan;
}
#else
// fan is spinning, but measured RPM are too low for print fan, it must
// be left extruder fan
else if (fan_speed[1] < 34) {
return FanCheck::swappedFan;
return FanCheck::SwappedFan;
}
#endif //FAN_SOFT_PWM
break;
}
return FanCheck::success;
return FanCheck::Success;
}
#endif //FANCHECK