summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJF002 <JF002@users.noreply.github.com>2021-04-09 18:43:39 (GMT)
committerGitHub <noreply@github.com>2021-04-09 18:43:39 (GMT)
commit17a37acaa81278cc8c782d84d994d4ca938ef006 (patch)
tree3c15890315a420417cd96b82103da80c84ed562d /src/main.cpp
parent04fc33e2d479161ec261f932b908dffbd73e227f (diff)
parent3685095da0d01f137692f80df2c267a8b90da715 (diff)
Merge pull request #258 from joaquimorg/BigRewrite
New settings menu and more...
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index bd4bbe7..ed00844 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -111,9 +111,9 @@ void ble_manager_set_ble_disconnection_callback(void (*disconnection)());
static constexpr uint8_t pinTouchIrq = 28;
std::unique_ptr<Pinetime::System::SystemTask> systemTask;
-Pinetime::Controllers::MotorController motorController;
+Pinetime::Controllers::Settings settingsController{spiNorFlash};
-Pinetime::Controllers::Settings settingsController;
+Pinetime::Controllers::MotorController motorController{settingsController};
void nrfx_gpiote_evt_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) {
if(pin == pinTouchIrq) {