Skip to content

Commit f6ad411

Browse files
author
Clang Robot
committed
Committing clang-format changes
1 parent 38eee97 commit f6ad411

File tree

5 files changed

+5
-12
lines changed

5 files changed

+5
-12
lines changed

src/boards/Inkplate6/Inkplate6Driver.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void EPDDriver::writePixelInternal(int16_t x, int16_t y, uint16_t color)
4848
int x = x0 >> 3;
4949
int x_sub = x0 & 7;
5050
uint8_t temp = *(_partial + 100 * y0 + x);
51-
*(_partial +100 * y0 + x) = (~pixelMaskLUT[x_sub] & temp) | (color ? pixelMaskLUT[x_sub] : 0);
51+
*(_partial + 100 * y0 + x) = (~pixelMaskLUT[x_sub] & temp) | (color ? pixelMaskLUT[x_sub] : 0);
5252
}
5353
else
5454
{
@@ -804,8 +804,8 @@ void EPDDriver::gpioInit()
804804
externalIO.begin(IO_EXT_ADDR);
805805

806806
for (uint32_t i = 0; i < 256; ++i)
807-
pinLUT[i] = ((i & B00000011) << 4) | (((i & B00001100) >> 2) << 18) | (((i & B00010000) >> 4) << 23) |
808-
(((i & B11100000) >> 5) << 25);
807+
pinLUT[i] = ((i & B00000011) << 4) | (((i & B00001100) >> 2) << 18) | (((i & B00010000) >> 4) << 23) |
808+
(((i & B11100000) >> 5) << 25);
809809

810810
// Set all IO expander registers to 0
811811
memset(internalIO._ioExpanderRegs, 0, 22);
@@ -864,9 +864,6 @@ void EPDDriver::gpioInit()
864864
// Set all pins of seconds I/O expander to outputs, low.
865865
// For some reason, it draw more current in deep sleep when pins are set as
866866
// inputs...
867-
868-
869-
870867
}
871868

872869
/**
@@ -878,7 +875,7 @@ void EPDDriver::gpioInit()
878875
uint8_t EPDDriver::initializeFramebuffers()
879876
{
880877
// Initialize all the framebuffers
881-
DMemoryNew = (uint8_t *)ps_malloc(E_INK_WIDTH * E_INK_HEIGHT / 8);
878+
DMemoryNew = (uint8_t *)ps_malloc(E_INK_WIDTH * E_INK_HEIGHT / 8);
882879
_partial = (uint8_t *)ps_malloc(E_INK_WIDTH * E_INK_HEIGHT / 8);
883880
_pBuffer = (uint8_t *)ps_malloc(E_INK_WIDTH * E_INK_HEIGHT / 4);
884881
DMemory4Bit = (uint8_t *)ps_malloc(E_INK_WIDTH * E_INK_HEIGHT / 2);

src/boards/Inkplate6/Inkplate6Driver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
class Inkplate;
3535

3636

37-
class EPDDriver : public Image, public Esp
37+
class EPDDriver : public Image, public Esp
3838
{
3939
public:
4040
void writePixelInternal(int16_t x, int16_t y, uint16_t color);

src/graphics/Image/Image.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,4 +374,3 @@ void Image::getPointsForPosition(const Position &position, const uint16_t imageW
374374
break;
375375
}
376376
}
377-

src/graphics/Image/Image.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,7 @@ class Image
114114
uint8_t findClosestPalette(uint32_t c);
115115

116116

117-
118117
private:
119-
120118
uint8_t pixelBuffer[E_INK_WIDTH * 4 + 5];
121119
uint8_t ditherBuffer[2][E_INK_WIDTH + 20];
122120
uint8_t jpegDitherBuffer[18][18];

src/graphics/Shapes/Shapes.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class Shapes : virtual public Adafruit_GFX
3838
virtual void drawPixel(int16_t x, int16_t y, uint16_t color) = 0;
3939

4040

41-
4241
void drawElipse(int rx, int ry, int xc, int yc, int c);
4342
void fillElipse(int rx, int ry, int xc, int yc, int c);
4443
void drawPolygon(int *x, int *y, int n, int color);

0 commit comments

Comments
 (0)