will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jean-François Milants 2021-12-02 21:02:51 +01:00
commit 9f0612bce8
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.devcontainer/devcontainer.json
View File

@ -12,7 +12,9 @@
// Set *default* container specific settings.json values on container create. // Set *default* container specific settings.json values on container create.
"settings": { "settings": {
"terminal.integrated.shell.linux": "/bin/bash" "terminal.integrated.shell.linux": "/bin/bash",
"editor.formatOnSave": true,
"clang-format.executable": "clang-format-12"
}, },
// Add the IDs of extensions you want installed when the container is created. // Add the IDs of extensions you want installed when the container is created.
@ -33,4 +35,4 @@
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
// "remoteUser": "vscode" // "remoteUser": "vscode"
"remoteUser": "infinitime" "remoteUser": "infinitime"
} }

2
src/components/ble/MotionService.cpp
View File

@ -1,5 +1,5 @@
#include "components/ble/MotionService.h" #include "components/ble/MotionService.h"
#include "components/motion//MotionController.h" #include "components/motion/MotionController.h"
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;

7
src/displayapp/screens/SystemInfo.cpp
View File

@ -182,9 +182,7 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen3() {
" #444444 used# %d (%d%%)\n" " #444444 used# %d (%d%%)\n"
" #444444 max used# %lu\n" " #444444 max used# %lu\n"
" #444444 frag# %d%%\n" " #444444 frag# %d%%\n"
" #444444 free# %d" " #444444 free# %d",
"\n"
"#444444 Steps# %i",
bleAddr[5], bleAddr[5],
bleAddr[4], bleAddr[4],
bleAddr[3], bleAddr[3],
@ -195,8 +193,7 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen3() {
mon.used_pct, mon.used_pct,
mon.max_used, mon.max_used,
mon.frag_pct, mon.frag_pct,
static_cast<int>(mon.free_biggest_size), static_cast<int>(mon.free_biggest_size));
0);
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::make_unique<Screens::Label>(2, 5, app, label); return std::make_unique<Screens::Label>(2, 5, app, label);
} }