3 files changed, 7 insertions, 15 deletions
diff --git a/src/components/ble/MotionService.cpp b/src/components/ble/MotionService.cpp
index b4786ab5..284c60dc 100644
--- a/src/components/ble/MotionService.cpp
+++ b/src/components/ble/MotionService.cpp
@@ -5,7 +5,7 @@
 using namespace Pinetime::Controllers;
 
 namespace {
-  // 0002yyxx-78fc-48fe-8e23-433b3a1942d0
+  // 0003yyxx-78fc-48fe-8e23-433b3a1942d0
   constexpr ble_uuid128_t CharUuid(uint8_t x, uint8_t y) {
     return ble_uuid128_t{
       .u = {.type = BLE_UUID_TYPE_128},
@@ -13,7 +13,7 @@ namespace {
     };
   }
 
-  // 00020000-78fc-48fe-8e23-433b3a1942d0
+  // 00030000-78fc-48fe-8e23-433b3a1942d0
   constexpr ble_uuid128_t BaseUuid() {
     return CharUuid(0x00, 0x00);
   }
diff --git a/src/displayapp/screens/BatteryInfo.h b/src/displayapp/screens/BatteryInfo.h
index 63454a26..aaa741ce 100644
--- a/src/displayapp/screens/BatteryInfo.h
+++ b/src/displayapp/screens/BatteryInfo.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include <cstdint>
-#include <FreeRTOS.h>
-#include <timers.h>
 #include "Screen.h"
 #include <lvgl/lvgl.h>
 
diff --git a/src/drivers/Cst816s.cpp b/src/drivers/Cst816s.cpp
index 4aac19f9..bf51a8ba 100644
--- a/src/drivers/Cst816s.cpp
+++ b/src/drivers/Cst816s.cpp
@@ -32,17 +32,11 @@ bool Cst816S::Init() {
   twiMaster.Read(twiAddress, 0xa7, &dummy, 1);
   vTaskDelay(5);
 
-  static constexpr uint8_t maxRetries = 3;
-  bool isDeviceOk;
-  uint8_t retries = 0;
-  do {
-    isDeviceOk = CheckDeviceIds();
-    retries++;
-  } while (!isDeviceOk && retries < maxRetries);
-
-  if (!isDeviceOk) {
-    return false;
-  }
+  // TODO This function check that the device IDs from the controller are equal to the ones
+  // we expect. However, it seems to return false positive (probably in case of communication issue).
+  // Also, it seems that some users have pinetimes that works correctly but that report different device IDs
+  // Until we know more about this, we'll just read the IDs but not take any action in case they are not 'valid'
+  CheckDeviceIds();
 
   /*
   [2] EnConLR - Continuous operation can slide around