diff options
Diffstat (limited to 'src/graphics.cpp')
| -rw-r--r-- | src/graphics.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/graphics.cpp b/src/graphics.cpp index 3b53703c..288b5e9a 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -11,15 +11,15 @@ #include <libraries/gpiote/app_gpiote.h> #include <hal/nrf_wdt.h> #include <cstring> -#include <Components/Gfx/Gfx.h> +#include <components/gfx/Gfx.h> #include <drivers/St7789.h> -#include <Components/Brightness/BrightnessController.h> +#include <components/brightness/BrightnessController.h> #if NRF_LOG_ENABLED -#include "Logging/NrfLogger.h" +#include "logging/NrfLogger.h" Pinetime::Logging::NrfLogger logger; #else -#include "Logging/DummyLogger.h" +#include "logging/DummyLogger.h" Pinetime::Logging::DummyLogger logger; #endif @@ -79,6 +79,7 @@ void Process(void* instance) { NRF_LOG_INFO("Init..."); spi.Init(); spiNorFlash.Init(); + spiNorFlash.Wakeup(); brightnessController.Init(); lcd.Init(); gfx.Init(); @@ -103,10 +104,10 @@ void Process(void* instance) { static constexpr uint32_t screenWidth = 240; static constexpr uint32_t screenWidthInBytes = screenWidth*2; // LCD display 16bits color (1 pixel = 2 bytes) uint16_t displayLineBuffer[screenWidth]; - for(int line = 0; line < screenWidth; line++) { + for(uint32_t line = 0; line < screenWidth; line++) { spiNorFlash.Read(line*screenWidthInBytes, reinterpret_cast<uint8_t *>(displayLineBuffer), screenWidth); spiNorFlash.Read((line*screenWidthInBytes)+screenWidth, reinterpret_cast<uint8_t *>(displayLineBuffer) + screenWidth, screenWidth); - for(int col = 0; col < screenWidth; col++) { + for(uint32_t col = 0; col < screenWidth; col++) { gfx.pixel_draw(col, line, displayLineBuffer[col]); } } |