diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-10-31 22:25:44 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-10-31 22:25:44 +0300 |
| commit | 97ead36a9b3e8a5ee3019c7a3c1ac6a4289408cc (patch) | |
| tree | 5b6cd088b180c003c9974937b1173459a218f066 /src/Display | |
| parent | 9b90cdf445b9893eb93c02317ef87965ec60657f (diff) | |
Tidied up for static analysis
Diffstat (limited to 'src/Display')
| -rw-r--r-- | src/Display/Lcd/Lcd.cpp | 2 | ||||
| -rw-r--r-- | src/Display/Lcd/Lcd.h | 2 | ||||
| -rw-r--r-- | src/Display/MenuItem.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Display/Lcd/Lcd.cpp b/src/Display/Lcd/Lcd.cpp index 303a3bf5..2946d742 100644 --- a/src/Display/Lcd/Lcd.cpp +++ b/src/Display/Lcd/Lcd.cpp @@ -503,7 +503,7 @@ void Lcd::Circle(PixelNumber x0, PixelNumber y0, PixelNumber radius, PixelMode m } // Draw a bitmap. x0 and numCols must be divisible by 8. -void Lcd::Bitmap(PixelNumber x0, PixelNumber y0, PixelNumber width, PixelNumber height, const uint8_t data[]) noexcept +void Lcd::BitmapImage(PixelNumber x0, PixelNumber y0, PixelNumber width, PixelNumber height, const uint8_t data[]) noexcept { for (PixelNumber r = 0; r < height && r + y0 < numRows; ++r) { diff --git a/src/Display/Lcd/Lcd.h b/src/Display/Lcd/Lcd.h index f256c5a9..9fdd0fee 100644 --- a/src/Display/Lcd/Lcd.h +++ b/src/Display/Lcd/Lcd.h @@ -132,7 +132,7 @@ public: // width = width of bitmap in pixels. Currently, must be a multiple of 8. // rows = height of bitmap in pixels // data = bitmap image, must be ((width/8) * rows) bytes long - void Bitmap(PixelNumber top, PixelNumber left, PixelNumber height, PixelNumber width, const uint8_t data[]) noexcept; + void BitmapImage(PixelNumber top, PixelNumber left, PixelNumber height, PixelNumber width, const uint8_t data[]) noexcept; // Draw a bitmap row // x0 = x-coordinate of the top left, measured from left hand edge of the display diff --git a/src/Display/MenuItem.cpp b/src/Display/MenuItem.cpp index 2dbfbee6..d11db3b7 100644 --- a/src/Display/MenuItem.cpp +++ b/src/Display/MenuItem.cpp @@ -622,7 +622,7 @@ bool ValueMenuItem::Adjust_AlterHelper(int clicks) noexcept { currentValue.f = 95.0 - 1.0; } - currentValue.f = min<int>(currentValue.f + (float)clicks, reprap.GetHeat().GetHighestTemperatureLimit(reprap.GetTool(itemNumber)->Heater(0))); + currentValue.f = min<int>(currentValue.f + (float)clicks, reprap.GetHeat().GetHighestTemperatureLimit(reprap.GetTool(itemNumber)->GetHeater(0))); } } else |