Skip to content

Commit 3a0d673

Browse files
JF002JF002
committed
Display the SPI flash JEDEC IDs in SystemInformation.
This is needed since a new memory chip will be used in future batches of PineTimes.
1 parent 53dc9da commit 3a0d673

9 files changed

+38
-13
lines changed

‎src/displayapp/DisplayApp.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
8181
Pinetime::Controllers::AlarmController& alarmController,
8282
Pinetime::Controllers::BrightnessController& brightnessController,
8383
Pinetime::Controllers::TouchHandler& touchHandler,
84-
Pinetime::Controllers::FS& filesystem)
84+
Pinetime::Controllers::FS& filesystem,
85+
Pinetime::Drivers::SpiNorFlash& spiNorFlash)
8586
: lcd {lcd},
8687
touchPanel {touchPanel},
8788
batteryController {batteryController},
@@ -97,6 +98,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
9798
brightnessController {brightnessController},
9899
touchHandler {touchHandler},
99100
filesystem {filesystem},
101+
spiNorFlash {spiNorFlash},
100102
lvgl {lcd, filesystem},
101103
timer(this, TimerCallback),
102104
controllers {batteryController,
@@ -601,7 +603,8 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
601603
bleController,
602604
watchdog,
603605
motionController,
604-
touchPanel);
606+
touchPanel,
607+
spiNorFlash);
605608
break;
606609
case Apps::FlashLight:
607610
currentScreen = std::make_unique<Screens::FlashLight>(*systemTask, brightnessController);

‎src/displayapp/DisplayApp.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ namespace Pinetime {
6666
Pinetime::Controllers::AlarmController& alarmController,
6767
Pinetime::Controllers::BrightnessController& brightnessController,
6868
Pinetime::Controllers::TouchHandler& touchHandler,
69-
Pinetime::Controllers::FS& filesystem);
69+
Pinetime::Controllers::FS& filesystem,
70+
Pinetime::Drivers::SpiNorFlash& spiNorFlash);
7071
void Start(System::BootErrors error);
7172
void PushMessage(Display::Messages msg);
7273

@@ -96,6 +97,7 @@ namespace Pinetime {
9697
Pinetime::Controllers::BrightnessController& brightnessController;
9798
Pinetime::Controllers::TouchHandler& touchHandler;
9899
Pinetime::Controllers::FS& filesystem;
100+
Pinetime::Drivers::SpiNorFlash& spiNorFlash;
99101

100102
Pinetime::Controllers::FirmwareValidator validator;
101103
Pinetime::Components::LittleVgl lvgl;

‎src/displayapp/DisplayAppRecovery.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
2424
Pinetime::Controllers::AlarmController& /*alarmController*/,
2525
Pinetime::Controllers::BrightnessController& /*brightnessController*/,
2626
Pinetime::Controllers::TouchHandler& /*touchHandler*/,
27-
Pinetime::Controllers::FS& /*filesystem*/)
27+
Pinetime::Controllers::FS& /*filesystem*/,
28+
Pinetime::Drivers::SpiNorFlash& /*spiNorFlash*/)
2829
: lcd {lcd}, bleController {bleController} {
2930
}
3031

‎src/displayapp/DisplayAppRecovery.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ namespace Pinetime {
1818
class St7789;
1919
class Cst816S;
2020
class Watchdog;
21+
class SpiNorFlash;
2122
}
2223

2324
namespace Controllers {
@@ -59,7 +60,8 @@ namespace Pinetime {
5960
Pinetime::Controllers::AlarmController& alarmController,
6061
Pinetime::Controllers::BrightnessController& brightnessController,
6162
Pinetime::Controllers::TouchHandler& touchHandler,
62-
Pinetime::Controllers::FS& filesystem);
63+
Pinetime::Controllers::FS& filesystem,
64+
Pinetime::Drivers::SpiNorFlash& spiNorFlash);
6365
void Start();
6466

6567
void Start(Pinetime::System::BootErrors) {

‎src/displayapp/screens/SystemInfo.cpp

+9-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ SystemInfo::SystemInfo(Pinetime::Applications::DisplayApp* app,
3838
const Pinetime::Controllers::Ble& bleController,
3939
const Pinetime::Drivers::Watchdog& watchdog,
4040
Pinetime::Controllers::MotionController& motionController,
41-
const Pinetime::Drivers::Cst816S& touchPanel)
41+
const Pinetime::Drivers::Cst816S& touchPanel,
42+
const Pinetime::Drivers::SpiNorFlash& spiNorFlash)
4243
: app {app},
4344
dateTimeController {dateTimeController},
4445
batteryController {batteryController},
@@ -47,6 +48,7 @@ SystemInfo::SystemInfo(Pinetime::Applications::DisplayApp* app,
4748
watchdog {watchdog},
4849
motionController {motionController},
4950
touchPanel {touchPanel},
51+
spiNorFlash {spiNorFlash},
5052
screens {app,
5153
0,
5254
{[this]() -> std::unique_ptr<Screen> {
@@ -186,10 +188,12 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen3() {
186188
lv_obj_t* label = lv_label_create(lv_scr_act(), nullptr);
187189
lv_label_set_recolor(label, true);
188190
const auto& bleAddr = bleController.Address();
191+
auto spiFlashId = spiNorFlash.GetIdentification();
189192
lv_label_set_text_fmt(label,
190193
"#808080 BLE MAC#\n"
191-
" %02x:%02x:%02x:%02x:%02x:%02x"
194+
" %02x:%02x:%02x:%02x:%02x:%02x\n"
192195
"\n"
196+
"#808080 SPI Flash# %02x-%02x-%02x\n"
193197
"\n"
194198
"#808080 Memory heap#\n"
195199
" #808080 Free# %d\n"
@@ -202,6 +206,9 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen3() {
202206
bleAddr[2],
203207
bleAddr[1],
204208
bleAddr[0],
209+
spiFlashId.manufacturer,
210+
spiFlashId.type,
211+
spiFlashId.density,
205212
xPortGetFreeHeapSize(),
206213
xPortGetMinimumEverFreeHeapSize(),
207214
mallocFailedCount,

‎src/displayapp/screens/SystemInfo.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ namespace Pinetime {
2929
const Pinetime::Controllers::Ble& bleController,
3030
const Pinetime::Drivers::Watchdog& watchdog,
3131
Pinetime::Controllers::MotionController& motionController,
32-
const Pinetime::Drivers::Cst816S& touchPanel);
32+
const Pinetime::Drivers::Cst816S& touchPanel,
33+
const Pinetime::Drivers::SpiNorFlash& spiNorFlash);
3334
~SystemInfo() override;
3435
bool OnTouchEvent(TouchEvents event) override;
3536

@@ -42,6 +43,7 @@ namespace Pinetime {
4243
const Pinetime::Drivers::Watchdog& watchdog;
4344
Pinetime::Controllers::MotionController& motionController;
4445
const Pinetime::Drivers::Cst816S& touchPanel;
46+
const Pinetime::Drivers::SpiNorFlash& spiNorFlash;
4547

4648
ScreenList<5> screens;
4749

‎src/drivers/SpiNorFlash.cpp

+7-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SpiNorFlash::SpiNorFlash(Spi& spi) : spi {spi} {
1010
}
1111

1212
void SpiNorFlash::Init() {
13-
device_id = ReadIdentificaion();
13+
device_id = ReadIdentification();
1414
NRF_LOG_INFO("[SpiNorFlash] Manufacturer : %d, Memory type : %d, memory density : %d",
1515
device_id.manufacturer,
1616
device_id.type,
@@ -32,7 +32,7 @@ void SpiNorFlash::Wakeup() {
3232
uint8_t cmd[cmdSize] = {static_cast<uint8_t>(Commands::ReleaseFromDeepPowerDown), 0x01, 0x02, 0x03};
3333
uint8_t id = 0;
3434
spi.Read(reinterpret_cast<uint8_t*>(&cmd), cmdSize, &id, 1);
35-
auto devId = device_id = ReadIdentificaion();
35+
auto devId = device_id = ReadIdentification();
3636
if (devId.type != device_id.type) {
3737
NRF_LOG_INFO("[SpiNorFlash] ID on Wakeup: Failed");
3838
} else {
@@ -41,7 +41,7 @@ void SpiNorFlash::Wakeup() {
4141
NRF_LOG_INFO("[SpiNorFlash] Wakeup")
4242
}
4343

44-
SpiNorFlash::Identification SpiNorFlash::ReadIdentificaion() {
44+
SpiNorFlash::Identification SpiNorFlash::ReadIdentification() {
4545
auto cmd = static_cast<uint8_t>(Commands::ReadIdentification);
4646
Identification identification;
4747
spi.Read(&cmd, 1, reinterpret_cast<uint8_t*>(&identification), sizeof(Identification));
@@ -145,3 +145,7 @@ void SpiNorFlash::Write(uint32_t address, const uint8_t* buffer, size_t size) {
145145
len -= toWrite;
146146
}
147147
}
148+
149+
SpiNorFlash::Identification SpiNorFlash::GetIdentification() const {
150+
return device_id;
151+
}

‎src/drivers/SpiNorFlash.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ namespace Pinetime {
2020
uint8_t density = 0;
2121
};
2222

23-
Identification ReadIdentificaion();
2423
uint8_t ReadStatusRegister();
2524
bool WriteInProgress();
2625
bool WriteEnabled();
@@ -33,13 +32,17 @@ namespace Pinetime {
3332
bool ProgramFailed();
3433
bool EraseFailed();
3534

35+
Identification GetIdentification() const;
36+
3637
void Init();
3738
void Uninit();
3839

3940
void Sleep();
4041
void Wakeup();
4142

4243
private:
44+
Identification ReadIdentification();
45+
4346
enum class Commands : uint8_t {
4447
PageProgram = 0x02,
4548
Read = 0x03,

‎src/main.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ Pinetime::Applications::DisplayApp displayApp(lcd,
123123
alarmController,
124124
brightnessController,
125125
touchHandler,
126-
fs);
126+
fs,
127+
spiNorFlash);
127128

128129
Pinetime::System::SystemTask systemTask(spi,
129130
spiNorFlash,

0 commit comments

Comments
 (0)