From e572e711a48ab89bed34c4ac88b772f995836816 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Wed, 18 Jan 2023 21:25:30 +0100 Subject: [PATCH] Code Style Changes * Add License Identifier * Move non public required includes to cpp * Add curly brackets --- include/Display_Graphic.h | 13 +++---------- src/Display_Graphic.cpp | 8 +++++++- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/Display_Graphic.h b/include/Display_Graphic.h index 9b57aab..b5f0d5d 100644 --- a/include/Display_Graphic.h +++ b/include/Display_Graphic.h @@ -1,12 +1,7 @@ -#ifndef Display_Graphic_H -#define Display_Graphic_H +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once -#include -#include -#include #include -#include -#include class DisplayGraphicClass { public: @@ -36,6 +31,4 @@ private: char _fmtText[32]; }; -extern DisplayGraphicClass Display; - -#endif +extern DisplayGraphicClass Display; \ No newline at end of file diff --git a/src/Display_Graphic.cpp b/src/Display_Graphic.cpp index 2de27ad..1c6d9ac 100644 --- a/src/Display_Graphic.cpp +++ b/src/Display_Graphic.cpp @@ -1,4 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #include "Display_Graphic.h" +#include +#include +#include +#include static uint8_t bmp_logo[] PROGMEM = { B00000000, B00000000, // ................ @@ -138,8 +143,9 @@ void DisplayGraphicClass::loop() uint8_t ex = (_mExtra % 7); if (isprod > 0) { _display->drawXBMP(5 + ex, 1, 8, 17, bmp_arrow); - if (dispLogo) + if (dispLogo) { _display->drawXBMP(_display->getWidth() - 24 + ex, 2, 16, 16, bmp_logo); + } } //<=======================