Merge branch 'develop' into HEAD

2021-08-01 11:47:26 +03:00
parent 9e8dd9a1e6 514481ef7f
commit 5bdef365f2
139 changed files with 5350 additions and 1804 deletions
--- a/src/components/motor/MotorController.cpp
+++ b/src/components/motor/MotorController.cpp
@@ -15,7 +15,7 @@ void MotorController::Init() {
  nrf_gpio_cfg_output(pinMotor);
  nrf_gpio_pin_set(pinMotor);
  app_timer_init();
-  
+
  app_timer_create(&shortVibTimer, APP_TIMER_MODE_SINGLE_SHOT, vibrate);
  app_timer_create(&longVibTimer, APP_TIMER_MODE_REPEATED, vibrate);
  isBusy = false;
@@ -53,4 +53,4 @@ void MotorController::vibrate(void* p_context) {
  } else {
    nrf_gpio_pin_clear(pinMotor);
  }
-}
+}