diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index eab695e2..4364bef2 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5383,11 +5383,23 @@ while (0) static void lcd_nozzle_diameter_cycle(void) { uint16_t nDiameter; switch(oNozzleDiameter){ + case ClNozzleDiameter::_Diameter_150: + oNozzleDiameter=ClNozzleDiameter::_Diameter_200; + nDiameter=200; + break; + case ClNozzleDiameter::_Diameter_200: + oNozzleDiameter=ClNozzleDiameter::_Diameter_250; + nDiameter=250; + break; case ClNozzleDiameter::_Diameter_250: oNozzleDiameter=ClNozzleDiameter::_Diameter_400; nDiameter=400; break; case ClNozzleDiameter::_Diameter_400: + oNozzleDiameter=ClNozzleDiameter::_Diameter_500; + nDiameter=600; + break; + case ClNozzleDiameter::_Diameter_500: oNozzleDiameter=ClNozzleDiameter::_Diameter_600; nDiameter=600; break; @@ -5417,8 +5429,11 @@ do\ float fNozzleDiam;\ switch(oNozzleDiameter)\ {\ + case ClNozzleDiameter::_Diameter_150: fNozzleDiam = 0.15f; break;\ + case ClNozzleDiameter::_Diameter_200: fNozzleDiam = 0.20f; break;\ case ClNozzleDiameter::_Diameter_250: fNozzleDiam = 0.25f; break;\ case ClNozzleDiameter::_Diameter_400: fNozzleDiam = 0.4f; break;\ + case ClNozzleDiameter::_Diameter_500: fNozzleDiam = 0.5f; break;\ case ClNozzleDiameter::_Diameter_600: fNozzleDiam = 0.6f; break;\ case ClNozzleDiameter::_Diameter_800: fNozzleDiam = 0.8f; break; \ case ClNozzleDiameter::_Diameter_1000: fNozzleDiam = 1.0f; break;\ diff --git a/Firmware/util.h b/Firmware/util.h index 82fea70f..21a92d2a 100644 --- a/Firmware/util.h +++ b/Firmware/util.h @@ -48,8 +48,11 @@ enum class ClPrintChecking:uint_least8_t enum class ClNozzleDiameter:uint_least8_t { + _Diameter_150=15, + _Diameter_200=20, _Diameter_250=25, _Diameter_400=40, + _Diameter_500=50, _Diameter_600=60, _Diameter_800=80, _Diameter_1000=100,