5 files changed, 34 insertions, 28 deletions
diff --git a/src/ui/include/wheel_encoder.hpp b/src/ui/include/wheel_encoder.hpp
index 0651ce0b..d4975db9 100644
--- a/src/ui/include/wheel_encoder.hpp
+++ b/src/ui/include/wheel_encoder.hpp
@@ -15,16 +15,16 @@
 namespace ui {
 
 class TouchWheelEncoder {
-  public:
-    explicit TouchWheelEncoder(std::weak_ptr<drivers::RelativeWheel> wheel);
+ public:
+  explicit TouchWheelEncoder(std::weak_ptr<drivers::RelativeWheel> wheel);
 
-    auto Read(lv_indev_data_t *data) -> void;
-    auto registration() -> lv_indev_t* { return registration_; }
+  auto Read(lv_indev_data_t* data) -> void;
+  auto registration() -> lv_indev_t* { return registration_; }
 
-  private:
-      lv_indev_drv_t driver_;
-      lv_indev_t *registration_;
-      std::weak_ptr<drivers::RelativeWheel> wheel_;
+ private:
+  lv_indev_drv_t driver_;
+  lv_indev_t* registration_;
+  std::weak_ptr<drivers::RelativeWheel> wheel_;
 };
 
-} // namespace ui
+}  // namespace ui
diff --git a/src/ui/lvgl_task.cpp b/src/ui/lvgl_task.cpp
index 1ce7fd40..b0e2e0ed 100644
--- a/src/ui/lvgl_task.cpp
+++ b/src/ui/lvgl_task.cpp
@@ -54,7 +54,7 @@ void LvglMain(std::weak_ptr<drivers::RelativeWheel> weak_touch_wheel,
   lv_init();
 
   TouchWheelEncoder encoder(weak_touch_wheel);
-  lv_group_t *nav_group = lv_group_create();
+  lv_group_t* nav_group = lv_group_create();
   lv_group_set_default(nav_group);
   lv_indev_set_group(encoder.registration(), nav_group);
 
diff --git a/src/ui/screen_menu.cpp b/src/ui/screen_menu.cpp
index da0a7d3c..94c8fa06 100644
--- a/src/ui/screen_menu.cpp
+++ b/src/ui/screen_menu.cpp
@@ -18,14 +18,14 @@ namespace ui {
 namespace screens {
 
 Menu::Menu() {
-  lv_obj_t *menu = lv_menu_create(root_);
+  lv_obj_t* menu = lv_menu_create(root_);
   lv_obj_set_size(menu, lv_disp_get_hor_res(NULL), lv_disp_get_ver_res(NULL));
   lv_obj_center(menu);
 
-  lv_obj_t *main_page = lv_menu_page_create(menu, NULL);
+  lv_obj_t* main_page = lv_menu_page_create(menu, NULL);
 
-  lv_obj_t *container;
-  lv_obj_t *label;
+  lv_obj_t* container;
+  lv_obj_t* label;
 
   container = lv_menu_cont_create(main_page);
   label = lv_label_create(container);
diff --git a/src/ui/ui_fsm.cpp b/src/ui/ui_fsm.cpp
index f12104e6..6d53eb45 100644
--- a/src/ui/ui_fsm.cpp
+++ b/src/ui/ui_fsm.cpp
@@ -28,12 +28,14 @@ auto UiState::Init(drivers::GpioExpander* gpio_expander,
   sGpioExpander = gpio_expander;
   sTouchWheel = touchwheel;
   sDisplay = display;
+
+  StartLvgl(sTouchWheel, sDisplay);
 }
 
 namespace states {
 
 void PreBoot::react(const system_fsm::DisplayReady& ev) {
-  transit<Splash>([&]() { StartLvgl(sTouchWheel, sDisplay); });
+  transit<Splash>();
 }
 
 void Splash::entry() {
@@ -45,7 +47,7 @@ void Splash::react(const system_fsm::BootComplete& ev) {
 }
 
 void Interactive::entry() {
-  //sCurrentScreen.reset(new screens::Menu());
+  // sCurrentScreen.reset(new screens::Menu());
 }
 
 }  // namespace states
diff --git a/src/ui/wheel_encoder.cpp b/src/ui/wheel_encoder.cpp
index 0129434d..3b817f61 100644
--- a/src/ui/wheel_encoder.cpp
+++ b/src/ui/wheel_encoder.cpp
@@ -9,21 +9,24 @@
 
 namespace ui {
 
-void encoder_read(lv_indev_drv_t * drv, lv_indev_data_t*data){
-  TouchWheelEncoder *instance = reinterpret_cast<TouchWheelEncoder*>(drv->user_data);
+void encoder_read(lv_indev_drv_t* drv, lv_indev_data_t* data) {
+  TouchWheelEncoder* instance =
+      reinterpret_cast<TouchWheelEncoder*>(drv->user_data);
   instance->Read(data);
 }
 
-  TouchWheelEncoder::TouchWheelEncoder(std::weak_ptr<drivers::RelativeWheel> wheel) : wheel_(wheel) {
-    lv_indev_drv_init(&driver_);
-    driver_.type = LV_INDEV_TYPE_ENCODER;
-    driver_.read_cb = encoder_read;
-    driver_.user_data = this;
+TouchWheelEncoder::TouchWheelEncoder(
+    std::weak_ptr<drivers::RelativeWheel> wheel)
+    : wheel_(wheel) {
+  lv_indev_drv_init(&driver_);
+  driver_.type = LV_INDEV_TYPE_ENCODER;
+  driver_.read_cb = encoder_read;
+  driver_.user_data = this;
 
-    registration_ = lv_indev_drv_register(&driver_);
-  }
+  registration_ = lv_indev_drv_register(&driver_);
+}
 
-auto TouchWheelEncoder::Read(lv_indev_data_t *data) -> void {
+auto TouchWheelEncoder::Read(lv_indev_data_t* data) -> void {
   auto lock = wheel_.lock();
   if (lock == nullptr) {
     data->state = LV_INDEV_STATE_RELEASED;
@@ -32,8 +35,9 @@ auto TouchWheelEncoder::Read(lv_indev_data_t *data) -> void {
   }
 
   lock->Update();
-  data->state = lock->is_pressed() ? LV_INDEV_STATE_PRESSED : LV_INDEV_STATE_RELEASED;
+  data->state =
+      lock->is_pressed() ? LV_INDEV_STATE_PRESSED : LV_INDEV_STATE_RELEASED;
   data->enc_diff = lock->ticks();
 }
 
-} // namespace ui
+}  // namespace ui