diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-12-02 21:02:51 +0100 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-12-02 21:02:51 +0100 |
| commit | 9f0612bce85c0b87d3dcfa8148cc38906716cd29 (patch) | |
| tree | 8077278c497989752e5ac4b2e6dd2deaaa613773 | |
| parent | 871a673a4656c438fc12d4c0ad61d2eacc3ca340 (diff) | |
| parent | 34511a66ee419086eafe4b5c0f932d7c5b1ab0a7 (diff) | |
Merge branch 'develop' of github.com:JF002/Pinetime into develop
| -rw-r--r-- | .devcontainer/devcontainer.json | 6 | ||||
| -rw-r--r-- | src/components/ble/MotionService.cpp | 2 | ||||
| -rw-r--r-- | src/displayapp/screens/SystemInfo.cpp | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 778fe9cb..1bb315f7 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -12,7 +12,9 @@ // Set *default* container specific settings.json values on container create. "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. @@ -33,4 +35,4 @@ // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. // "remoteUser": "vscode" "remoteUser": "infinitime" -}
\ No newline at end of file +} diff --git a/src/components/ble/MotionService.cpp b/src/components/ble/MotionService.cpp index bb5cd24b..6381915d 100644 --- a/src/components/ble/MotionService.cpp +++ b/src/components/ble/MotionService.cpp @@ -1,5 +1,5 @@ #include "components/ble/MotionService.h" -#include "components/motion//MotionController.h" +#include "components/motion/MotionController.h" #include "systemtask/SystemTask.h" using namespace Pinetime::Controllers; diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp index 350c15cf..c363e2dd 100644 --- a/src/displayapp/screens/SystemInfo.cpp +++ b/src/displayapp/screens/SystemInfo.cpp @@ -182,9 +182,7 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen3() { " #444444 used# %d (%d%%)\n" " #444444 max used# %lu\n" " #444444 frag# %d%%\n" - " #444444 free# %d" - "\n" - "#444444 Steps# %i", + " #444444 free# %d", bleAddr[5], bleAddr[4], bleAddr[3], @@ -195,8 +193,7 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen3() { mon.used_pct, mon.max_used, mon.frag_pct, - static_cast<int>(mon.free_biggest_size), - 0); + static_cast<int>(mon.free_biggest_size)); lv_obj_align(label, lv_scr_act(), LV_ALIGN_CENTER, 0, 0); return std::make_unique<Screens::Label>(2, 5, app, label); } |