fix clang-format and cppcheck warnings

and3rson · Jun 7, 2024 · cee0985 · cee0985
1 parent 0d14e0f
commit cee0985
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/firmware/keira/src/apps/ble_gamepad/app.cpp b/firmware/keira/src/apps/ble_gamepad/app.cpp
@@ -38,10 +38,6 @@ void MainApp::uiLoop() {
     }
 }
 
-void MainApp::onStop() {
-    bleGamepadController.stop();
-}
-
 bool MainApp::isExitHotkeyPressed() {
     lilka::State st = lilka::controller.peekState();
     lilka::ButtonState hotkeyState = st.select;
@@ -53,14 +49,22 @@ bool MainApp::isExitHotkeyPressed() {
     uint64_t curTime = millis();
     uint64_t delta = curTime - hotkeyPressTime;
     lastSecondsToExit = EXIT_BUTTON_PRESS_SECONDS - delta / ONE_SECOND;
-    if(lastSecondsToExit < 0) {
+    if (lastSecondsToExit < 0) {
         lastSecondsToExit = 0;
     }
     return lastSecondsToExit == 0;
 }
 
+void MainApp::cleanUp() {
+    bleGamepadController.stop();
+}
+
+void MainApp::onStop() {
+    cleanUp();
+}
+
 MainApp::~MainApp() {
-    onStop();
+    cleanUp();
 }
 
 } // namespace ble_gamepad_app
diff --git a/firmware/keira/src/apps/ble_gamepad/app.h b/firmware/keira/src/apps/ble_gamepad/app.h
@@ -16,6 +16,7 @@ class MainApp : public App {
     void uiLoop();
     void onStop() override;
     bool isExitHotkeyPressed();
+    void cleanUp();
 
     Controller bleGamepadController;
     FPS uiFps;

diff --git a/firmware/keira/src/apps/ble_gamepad/controller.cpp b/firmware/keira/src/apps/ble_gamepad/controller.cpp
@@ -26,7 +26,7 @@ bool Controller::start() {
         "bleControllerTimer",
         pdMS_TO_TICKS(CONTROLLER_TIMER_DELAY_MILLIS),
         pdTRUE,
-        (void*)this,
+        static_cast<void*>(this),
         Controller::controllerTimerCallback
     );
     if (controllerTimer != NULL) {

diff --git a/firmware/keira/src/apps/ble_gamepad/fps.cpp b/firmware/keira/src/apps/ble_gamepad/fps.cpp
@@ -36,7 +36,7 @@ unsigned long FPS::getDelta() {
 unsigned long FPS::getLimitMillis() {
     unsigned long delta = getDelta();
     // Incorrect delay time. Using default limits
-    if (delta <= 0) {
+    if (delta == 0) {
         return delayLimitMillis;
     }
     // Too long delay time. Using min limits

diff --git a/firmware/keira/src/apps/ble_gamepad/timer.h b/firmware/keira/src/apps/ble_gamepad/timer.h
@@ -4,7 +4,7 @@ namespace ble_gamepad_app {
 
 class Timer {
 public:
-    Timer(int periodMillis);
+    explicit Timer(int periodMillis);
     static unsigned long getTime();
     unsigned long go();
     bool isTime(bool triggerOnFirstCall = false);