Skip to content

Commit 25f35c7

Browse files
JF002JF002
committed
Generate pinetime-recovery : a light version of InfiniTime design to be used as a recovery firmware : it only provides basic UI and BLE connectivity for OTA.
This new FW is build on the same codebasse than the actual InfiniTime. Only the display task is different (this allows to remove lvgl from the recovery fw, which is very heavy). CMake builds and docker have been modified accordingly. Note than the fw is converted into an image and then into a DFU in the cmake build (previously, it was only done in the
1 parent 80838d1 commit 25f35c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3580
-81
lines changed

‎docker/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ RUN apt-get update -qq \
1717
# aarch64 packages
1818
libffi-dev \
1919
libssl-dev \
20-
python3-dev \
20+
python3-dev \
21+
python \
2122
&& rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
2223

2324
RUN pip3 install adafruit-nrfutil

‎docker/post_build.sh.in

+4-7
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,12 @@ export PROJECT_VERSION="@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT
99
mkdir -p "$OUTPUT_DIR"
1010

1111
cp "$SOURCES_DIR"/bootloader/bootloader-5.0.4.bin $OUTPUT_DIR/bootloader.bin
12+
cp "$BUILD_DIR/src/pinetime-mcuboot-app-image-$PROJECT_VERSION.bin" "$OUTPUT_DIR/pinetime-mcuboot-app-image-$PROJECT_VERSION.bin"
13+
cp "$BUILD_DIR/src/pinetime-mcuboot-app-dfu-$PROJECT_VERSION.zip" "$OUTPUT_DIR/pinetime-mcuboot-app-dfu-$PROJECT_VERSION.zip"
1214

13-
"$TOOLS_DIR"/mcuboot/scripts/imgtool.py create --version 1.0.0 \
14-
--align 4 --header-size 32 --slot-size 475136 --pad-header \
15-
"$BUILD_DIR/src/pinetime-mcuboot-app-$PROJECT_VERSION.bin" \
16-
"$OUTPUT_DIR/image-$PROJECT_VERSION.bin"
15+
cp "$BUILD_DIR/src/pinetime-mcuboot-recovery-loader-image-$PROJECT_VERSION.bin" "$OUTPUT_DIR/pinetime-mcuboot-recovery-loader-image-$PROJECT_VERSION.bin"
16+
cp "$BUILD_DIR/src/pinetime-mcuboot-recovery-loader-dfu-$PROJECT_VERSION.zip" "$OUTPUT_DIR/pinetime-mcuboot-recovery-loader-dfu-$PROJECT_VERSION.zip"
1717

18-
adafruit-nrfutil dfu genpkg --dev-type 0x0052 \
19-
--application "$OUTPUT_DIR/image-$PROJECT_VERSION.bin" \
20-
"$OUTPUT_DIR/dfu-$PROJECT_VERSION.zip"
2118

2219
mkdir -p "$OUTPUT_DIR/src"
2320
cd "$BUILD_DIR"

‎src/CMakeLists.txt

+184-19
Large diffs are not rendered by default.

‎src/components/rle/RleDecoder.cpp

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#include "RleDecoder.h"
2+
3+
using namespace Pinetime::Tools;
4+
5+
RleDecoder::RleDecoder(const uint8_t *buffer, size_t size) : buffer{buffer}, size{size} {
6+
7+
}
8+
9+
RleDecoder::RleDecoder(const uint8_t *buffer, size_t size, uint16_t foregroundColor, uint16_t backgroundColor) : RleDecoder{buffer, size} {
10+
this->foregroundColor = foregroundColor;
11+
this->backgroundColor = backgroundColor;
12+
}
13+
14+
15+
void RleDecoder::DecodeNext(uint8_t *output, size_t maxBytes) {
16+
for (;encodedBufferIndex<size; encodedBufferIndex++) {
17+
uint8_t rl = buffer[encodedBufferIndex] - processedCount;
18+
while (rl) {
19+
output[bp] = color >> 8;
20+
output[bp + 1] = color & 0xff;
21+
bp += 2;
22+
rl -= 1;
23+
processedCount++;
24+
25+
if (bp >= maxBytes) {
26+
bp = 0;
27+
y += 1;
28+
return;
29+
}
30+
}
31+
processedCount = 0;
32+
33+
if (color == backgroundColor)
34+
color = foregroundColor;
35+
else
36+
color = backgroundColor;
37+
}
38+
}
39+

‎src/components/rle/RleDecoder.h

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#pragma once
2+
3+
#include <cstdint>
4+
#include <cstddef>
5+
6+
namespace Pinetime {
7+
namespace Tools {
8+
/* 1-bit RLE decoder. Provide the encoded buffer to the constructor and then call DecodeNext() by
9+
* specifying the output (decoded) buffer and the maximum number of bytes this buffer can handle.
10+
*
11+
* Code from https://github.com/daniel-thompson/wasp-bootloader by Daniel Thompson released under the MIT license.
12+
*/
13+
class RleDecoder {
14+
public:
15+
RleDecoder(const uint8_t* buffer, size_t size);
16+
RleDecoder(const uint8_t* buffer, size_t size, uint16_t foregroundColor, uint16_t backgroundColor);
17+
18+
void DecodeNext(uint8_t* output, size_t maxBytes);
19+
20+
private:
21+
const uint8_t* buffer;
22+
size_t size;
23+
24+
int encodedBufferIndex = 0;
25+
int y = 0;
26+
uint16_t bp = 0;
27+
uint16_t foregroundColor = 0xffff;
28+
uint16_t backgroundColor = 0;
29+
uint16_t color = backgroundColor;
30+
int processedCount = 0;
31+
};
32+
}
33+
}

‎src/displayapp/DisplayApp.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "systemtask/SystemTask.h"
2727

2828
using namespace Pinetime::Applications;
29+
using namespace Pinetime::Applications::Display;
2930

3031
DisplayApp::DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Drivers::Cst816S &touchPanel,
3132
Controllers::Battery &batteryController, Controllers::Ble &bleController,
@@ -227,7 +228,7 @@ void DisplayApp::IdleState() {
227228

228229
}
229230

230-
void DisplayApp::PushMessage(DisplayApp::Messages msg) {
231+
void DisplayApp::PushMessage(Messages msg) {
231232
BaseType_t xHigherPriorityTaskWoken;
232233
xHigherPriorityTaskWoken = pdFALSE;
233234
xQueueSendFromISR(msgQueue, &msg, &xHigherPriorityTaskWoken);

‎src/displayapp/DisplayApp.h

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "components/brightness/BrightnessController.h"
1111
#include "components/firmwarevalidator/FirmwareValidator.h"
1212
#include "displayapp/screens/Modal.h"
13+
#include "Messages.h"
1314

1415
namespace Pinetime {
1516

@@ -33,9 +34,6 @@ namespace Pinetime {
3334
class DisplayApp {
3435
public:
3536
enum class States {Idle, Running};
36-
enum class Messages : uint8_t {GoToSleep, GoToRunning, UpdateDateTime, UpdateBleConnection, UpdateBatteryLevel, TouchEvent, ButtonPushed,
37-
NewNotification, BleFirmwareUpdateStarted };
38-
3937
enum class FullRefreshDirections { None, Up, Down };
4038
enum class TouchModes { Gestures, Polling };
4139

@@ -46,7 +44,7 @@ namespace Pinetime {
4644
Pinetime::Controllers::NotificationManager& notificationManager,
4745
Pinetime::Controllers::HeartRateController& heartRateController);
4846
void Start();
49-
void PushMessage(Messages msg);
47+
void PushMessage(Display::Messages msg);
5048

5149
void StartApp(Apps app);
5250

‎src/displayapp/DisplayAppRecovery.cpp

+110
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
#include "DisplayAppRecovery.h"
2+
#include "DisplayAppRecovery.h"
3+
#include <FreeRTOS.h>
4+
#include <task.h>
5+
#include <libraries/log/nrf_log.h>
6+
#include <components/rle/RleDecoder.h>
7+
#include "displayapp/icons/infinitime/infinitime-nb.c"
8+
9+
using namespace Pinetime::Applications;
10+
11+
DisplayApp::DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Drivers::Cst816S &touchPanel,
12+
Controllers::Battery &batteryController, Controllers::Ble &bleController,
13+
Controllers::DateTime &dateTimeController, Drivers::WatchdogView &watchdog,
14+
System::SystemTask &systemTask,
15+
Pinetime::Controllers::NotificationManager& notificationManager,
16+
Pinetime::Controllers::HeartRateController& heartRateController):
17+
lcd{lcd}, bleController{bleController} {
18+
msgQueue = xQueueCreate(queueSize, itemSize);
19+
20+
}
21+
22+
void DisplayApp::Start() {
23+
if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 512, this, 0, &taskHandle))
24+
APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
25+
}
26+
27+
void DisplayApp::Process(void *instance) {
28+
auto *app = static_cast<DisplayApp *>(instance);
29+
NRF_LOG_INFO("displayapp task started!");
30+
31+
// Send a dummy notification to unlock the lvgl display driver for the first iteration
32+
xTaskNotifyGive(xTaskGetCurrentTaskHandle());
33+
34+
app->InitHw();
35+
while (1) {
36+
app->Refresh();
37+
}
38+
}
39+
40+
void DisplayApp::InitHw() {
41+
DisplayLogo(colorWhite);
42+
}
43+
44+
void DisplayApp::Refresh() {
45+
Display::Messages msg;
46+
if (xQueueReceive(msgQueue, &msg, 200)) {
47+
switch (msg) {
48+
case Display::Messages::UpdateBleConnection:
49+
if (bleController.IsConnected())
50+
DisplayLogo(colorBlue);
51+
else
52+
DisplayLogo(colorWhite);
53+
break;
54+
case Display::Messages::BleFirmwareUpdateStarted:
55+
DisplayLogo(colorGreen);
56+
break;
57+
default:
58+
break;
59+
}
60+
}
61+
62+
if (bleController.IsFirmwareUpdating()) {
63+
uint8_t percent = (static_cast<float>(bleController.FirmwareUpdateCurrentBytes()) /
64+
static_cast<float>(bleController.FirmwareUpdateTotalBytes())) * 100.0f;
65+
switch (bleController.State()) {
66+
case Controllers::Ble::FirmwareUpdateStates::Running:
67+
DisplayOtaProgress(percent, colorWhite);
68+
break;
69+
case Controllers::Ble::FirmwareUpdateStates::Validated:
70+
DisplayOtaProgress(100, colorGreenSwapped);
71+
break;
72+
case Controllers::Ble::FirmwareUpdateStates::Error:
73+
DisplayOtaProgress(100, colorRedSwapped);
74+
break;
75+
default:
76+
break;
77+
}
78+
}
79+
}
80+
81+
void DisplayApp::DisplayLogo(uint16_t color) {
82+
Pinetime::Tools::RleDecoder rleDecoder(infinitime_nb, sizeof(infinitime_nb), color, colorBlack);
83+
for(int i = 0; i < displayWidth; i++) {
84+
rleDecoder.DecodeNext(displayBuffer, displayWidth * bytesPerPixel);
85+
ulTaskNotifyTake(pdTRUE, 500);
86+
lcd.BeginDrawBuffer(0, i, displayWidth, 1);
87+
lcd.NextDrawBuffer(reinterpret_cast<const uint8_t *>(displayBuffer), displayWidth * bytesPerPixel);
88+
}
89+
}
90+
91+
void DisplayApp::DisplayOtaProgress(uint8_t percent, uint16_t color) {
92+
const uint8_t barHeight = 20;
93+
std::fill(displayBuffer, displayBuffer+(displayWidth * bytesPerPixel), color);
94+
for(int i = 0; i < barHeight; i++) {
95+
ulTaskNotifyTake(pdTRUE, 500);
96+
uint16_t barWidth = std::min(static_cast<float>(percent) * 2.4f, static_cast<float>(displayWidth));
97+
lcd.BeginDrawBuffer(0, displayWidth - barHeight + i, barWidth, 1);
98+
lcd.NextDrawBuffer(reinterpret_cast<const uint8_t *>(displayBuffer), barWidth * bytesPerPixel);
99+
}
100+
}
101+
102+
void DisplayApp::PushMessage(Display::Messages msg) {
103+
BaseType_t xHigherPriorityTaskWoken;
104+
xHigherPriorityTaskWoken = pdFALSE;
105+
xQueueSendFromISR(msgQueue, &msg, &xHigherPriorityTaskWoken);
106+
if (xHigherPriorityTaskWoken) {
107+
/* Actual macro used here is port specific. */
108+
// TODO : should I do something here?
109+
}
110+
}

‎src/displayapp/DisplayAppRecovery.h

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
#pragma once
2+
#include <FreeRTOS.h>
3+
#include <task.h>
4+
#include <drivers/St7789.h>
5+
#include <drivers/SpiMaster.h>
6+
#include <bits/unique_ptr.h>
7+
#include <queue.h>
8+
#include "components/gfx/Gfx.h"
9+
#include "components/battery/BatteryController.h"
10+
#include "components/brightness/BrightnessController.h"
11+
#include "components/ble/BleController.h"
12+
#include "components/datetime/DateTimeController.h"
13+
#include "components/ble/NotificationManager.h"
14+
#include "components/firmwarevalidator/FirmwareValidator.h"
15+
#include "drivers/Cst816s.h"
16+
#include <date/date.h>
17+
#include "displayapp/screens/Clock.h"
18+
#include "displayapp/screens/Modal.h"
19+
#include <drivers/Watchdog.h>
20+
#include "TouchEvents.h"
21+
#include "Apps.h"
22+
#include "Messages.h"
23+
#include "DummyLittleVgl.h"
24+
25+
namespace Pinetime {
26+
namespace System {
27+
class SystemTask;
28+
};
29+
namespace Applications {
30+
class DisplayApp {
31+
public:
32+
DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Drivers::Cst816S &,
33+
Controllers::Battery &batteryController, Controllers::Ble &bleController,
34+
Controllers::DateTime &dateTimeController, Drivers::WatchdogView &watchdog,
35+
System::SystemTask &systemTask,
36+
Pinetime::Controllers::NotificationManager& notificationManager,
37+
Pinetime::Controllers::HeartRateController& heartRateController);
38+
void Start();
39+
void PushMessage(Pinetime::Applications::Display::Messages msg);
40+
41+
private:
42+
TaskHandle_t taskHandle;
43+
static void Process(void* instance);
44+
void DisplayLogo(uint16_t color);
45+
void DisplayOtaProgress(uint8_t percent, uint16_t color);
46+
void InitHw();
47+
void Refresh();
48+
Pinetime::Drivers::St7789& lcd;
49+
Controllers::Ble &bleController;
50+
51+
static constexpr uint8_t queueSize = 10;
52+
static constexpr uint8_t itemSize = 1;
53+
QueueHandle_t msgQueue;
54+
static constexpr uint8_t displayWidth = 240;
55+
static constexpr uint8_t displayHeight = 240;
56+
static constexpr uint8_t bytesPerPixel = 2;
57+
58+
static constexpr uint16_t colorWhite = 0xFFFF;
59+
static constexpr uint16_t colorGreen = 0x07E0;
60+
static constexpr uint16_t colorGreenSwapped = 0xE007;
61+
static constexpr uint16_t colorBlue = 0x0000ff;
62+
static constexpr uint16_t colorRed = 0xff00;
63+
static constexpr uint16_t colorRedSwapped = 0x00ff;
64+
static constexpr uint16_t colorBlack = 0x0000;
65+
uint8_t displayBuffer[displayWidth * bytesPerPixel];
66+
67+
68+
};
69+
}
70+
}
71+
72+

‎src/displayapp/DummyLittleVgl.h

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#pragma once
2+
3+
#include <libs/lvgl/src/lv_core/lv_style.h>
4+
#include <libs/lvgl/src/lv_themes/lv_theme.h>
5+
#include <libs/lvgl/src/lv_hal/lv_hal.h>
6+
#include <drivers/St7789.h>
7+
#include <drivers/Cst816s.h>
8+
9+
namespace Pinetime {
10+
namespace Components {
11+
class LittleVgl {
12+
public:
13+
enum class FullRefreshDirections { None, Up, Down };
14+
LittleVgl(Pinetime::Drivers::St7789& lcd, Pinetime::Drivers::Cst816S& touchPanel) {}
15+
16+
LittleVgl(const LittleVgl&) = delete;
17+
LittleVgl& operator=(const LittleVgl&) = delete;
18+
LittleVgl(LittleVgl&&) = delete;
19+
LittleVgl& operator=(LittleVgl&&) = delete;
20+
21+
void FlushDisplay(const lv_area_t * area, lv_color_t * color_p) {}
22+
bool GetTouchPadInfo(lv_indev_data_t *ptr) {return false;}
23+
void SetFullRefresh(FullRefreshDirections direction) {}
24+
void SetNewTapEvent(uint16_t x, uint16_t y) {}
25+
26+
27+
};
28+
}
29+
}
30+

‎src/displayapp/Messages.h

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#pragma once
2+
namespace Pinetime {
3+
namespace Applications {
4+
namespace Display {
5+
enum class Messages : uint8_t {
6+
GoToSleep, GoToRunning, UpdateDateTime, UpdateBleConnection, UpdateBatteryLevel, TouchEvent, ButtonPushed,
7+
NewNotification, BleFirmwareUpdateStarted
8+
};
9+
}
10+
}
11+
}

0 commit comments

Comments
 (0)