pinetime/InfiniTime
1
0
Fork 0
Code Activity

Merge branch 'develop' of github.com:JF002/Pinetime into develop

Browse source
This commit is contained in:
Jean-François Milants 2021-05-13 13:20:19 +02:00
commit 88e3790fbf
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/buildAndProgram.md
View file

@ -3,6 +3,7 @@
To build this project, you'll need: To build this project, you'll need:
- A cross-compiler : [ARM-GCC (9-2020-q2-update)](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads/9-2020-q2-update) - A cross-compiler : [ARM-GCC (9-2020-q2-update)](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads/9-2020-q2-update)
- The NRF52 SDK 15.3.0 : [nRF-SDK v15.3.0](https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip) - The NRF52 SDK 15.3.0 : [nRF-SDK v15.3.0](https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip)
- The `cbor` and `intelhex` modules for Python 3
- A reasonably recent version of CMake (I use 3.16.5) - A reasonably recent version of CMake (I use 3.16.5)
## Build steps ## Build steps

3
src/displayapp/screens/StopWatch.cpp
View file

@ -115,8 +115,9 @@ bool StopWatch::Refresh() {
// Init state when an user first opens the app // Init state when an user first opens the app
// and when a stop/reset button is pressed // and when a stop/reset button is pressed
case States::Init: { case States::Init: {
if (btnStopLap) { if (btnStopLap != nullptr) {
lv_obj_del(btnStopLap); lv_obj_del(btnStopLap);
btnStopLap = nullptr;
} }
// The initial default value // The initial default value
lv_label_set_text(time, "00:00"); lv_label_set_text(time, "00:00");

6
src/displayapp/screens/SystemInfo.cpp
View file

@ -70,8 +70,8 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen1() {
"#FFFF00 InfiniTime#\n\n" "#FFFF00 InfiniTime#\n\n"
"#444444 Version# %ld.%ld.%ld\n\n" "#444444 Version# %ld.%ld.%ld\n\n"
"#444444 Build date#\n" "#444444 Build date#\n"
"\t%s\n" "%s\n"
"\t%s\n", "%s\n",
Version::Major(), Version::Major(),
Version::Minor(), Version::Minor(),
Version::Patch(), Version::Patch(),
@ -242,4 +242,4 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen5() {
lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
lv_obj_align(label, lv_scr_act(), LV_ALIGN_CENTER, 0, 0); lv_obj_align(label, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
return std::unique_ptr<Screen>(new Screens::Label(4, 5, app, label)); return std::unique_ptr<Screen>(new Screens::Label(4, 5, app, label));
} }