Fix recovery firmware/loader.

This commit is contained in:
Jean-François Milants 2022-12-28 12:03:30 +01:00
parent 0fa32f3de0
commit ddcf491e2e
2 changed files with 19 additions and 10 deletions

View File

@ -506,6 +506,7 @@ list(APPEND RECOVERY_SOURCE_FILES
drivers/nrf52/SpiMaster.cpp
drivers/nrf52/Spi.cpp
drivers/nrf52/TwiMaster.cpp
drivers/spiFlash/SpiNorFlash.cpp
drivers/Watchdog.cpp
drivers/DebugPins.cpp
drivers/InternalFlash.cpp
@ -568,6 +569,7 @@ list(APPEND RECOVERYLOADER_SOURCE_FILES
drivers/nrf52/SpiMaster.cpp
drivers/nrf52/Spi.cpp
drivers/nrf52/TwiMaster.cpp
drivers/spiFlash/SpiNorFlash.cpp
logging/NrfLogger.cpp
components/rle/RleDecoder.cpp

View File

@ -35,19 +35,26 @@ static constexpr uint8_t bytesPerPixel = 2;
static constexpr uint16_t colorWhite = 0xFFFF;
static constexpr uint16_t colorGreen = 0xE007;
Pinetime::Drivers::SpiMaster spi {Pinetime::Drivers::SpiMaster::SpiModule::SPI0,
{Pinetime::Drivers::SpiMaster::BitOrder::Msb_Lsb,
Pinetime::Drivers::SpiMaster::Modes::Mode3,
Pinetime::Drivers::SpiMaster::Frequencies::Freq8Mhz,
Pinetime::PinMap::SpiSck,
Pinetime::PinMap::SpiMosi,
Pinetime::PinMap::SpiMiso}};
Pinetime::Drivers::Spi flashSpi {spi, Pinetime::PinMap::SpiFlashCsn};
Pinetime::Drivers::SpiNorFlash spiNorFlash {flashSpi};
Pinetime::Drivers::Nrf52::SpiMaster spiImpl {Pinetime::Drivers::Nrf52::SpiMaster::SpiModule::SPI0,
{Pinetime::Drivers::Nrf52::SpiMaster::BitOrder::Msb_Lsb,
Pinetime::Drivers::Nrf52::SpiMaster::Modes::Mode3,
Pinetime::Drivers::Nrf52::SpiMaster::Frequencies::Freq8Mhz,
Pinetime::PinMap::SpiSck,
Pinetime::PinMap::SpiMosi,
Pinetime::PinMap::SpiMiso}};
Pinetime::Drivers::Spi lcdSpi {spi, Pinetime::PinMap::SpiLcdCsn};
Pinetime::Drivers::SpiMaster spi {spiImpl};
Pinetime::Drivers::Nrf52::Spi lcdSpiIpmpl {spiImpl, Pinetime::PinMap::SpiLcdCsn};
Pinetime::Drivers::Spi lcdSpi {lcdSpiIpmpl};
Pinetime::Drivers::St7789 lcd {lcdSpi, Pinetime::PinMap::LcdDataCommand};
Pinetime::Drivers::Nrf52::Spi flashSpiImpl {spiImpl, Pinetime::PinMap::SpiFlashCsn};
Pinetime::Drivers::Spi flashSpi {flashSpiImpl};
Pinetime::Drivers::SpiFlash::SpiNorFlash spiNorFlashImpl{flashSpiImpl};
Pinetime::Drivers::SpiNorFlash spiNorFlash {spiNorFlashImpl};
Pinetime::Components::Gfx gfx {lcd};
Pinetime::Controllers::BrightnessController brightnessController;