Merge branch 'develop' of JF/PineTime into master

1 files changed, 18 insertions, 4 deletions

diff --git a/src/drivers/SpiNorFlash.cpp b/src/drivers/SpiNorFlash.cpp
index 7e4da1c..351a9df 100644
--- a/src/drivers/SpiNorFlash.cpp
+++ b/src/drivers/SpiNorFlash.cpp
@@ -11,8 +11,8 @@ SpiNorFlash::SpiNorFlash(Spi& spi) : spi{spi} {
 }
 
 void SpiNorFlash::Init() {
-  auto id = ReadIdentificaion();
-  NRF_LOG_INFO("[SPI FLASH] Manufacturer : %d, Memory type : %d, memory density : %d", id.manufacturer, id.type, id.density);
+  device_id = ReadIdentificaion();
+  NRF_LOG_INFO("[SPI FLASH] Manufacturer : %d, Memory type : %d, memory density : %d", device_id.manufacturer, device_id.type, device_id.density);
 }
 
 void SpiNorFlash::Uninit() {
@@ -20,11 +20,25 @@ void SpiNorFlash::Uninit() {
 }
 
 void SpiNorFlash::Sleep() {
-
+  auto cmd = static_cast<uint8_t>(Commands::DeepPowerDown);
+  spi.Write(&cmd, sizeof(uint8_t));
+  NRF_LOG_INFO("[FLASH] Sleep")
 }
 
 void SpiNorFlash::Wakeup() {
-
+  // send Commands::ReleaseFromDeepPowerDown then 3 dummy bytes before reading Device ID
+  static constexpr uint8_t cmdSize = 4;
+  uint8_t cmd[cmdSize] = {static_cast<uint8_t>(Commands::ReleaseFromDeepPowerDown), 0x01, 0x02, 0x03};
+  uint8_t id = 0;
+  spi.Read(reinterpret_cast<uint8_t *>(&cmd), cmdSize, &id, 1);
+  auto devId =   device_id = ReadIdentificaion();
+  if(devId.type != device_id.type) {
+    NRF_LOG_INFO("[SpiNorFlash] ID on Wakeup: Failed");
+  }
+  else {
+    NRF_LOG_INFO("[SpiNorFlash] ID on Wakeup: %d", id);
+  }
+  NRF_LOG_INFO("[FLASH] Wakeup")
 }
 
 SpiNorFlash::Identification SpiNorFlash::ReadIdentificaion() {