diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2021-09-13 18:22:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 18:22:53 (GMT) |
| commit | 40765f117347f4a4fc6cc4d2c4e46b1923a18fbb (patch) | |
| tree | f1eac679b683e04b80fdd245dd9d4c6949a174a5 /src/components/motor | |
| parent | 3ee4876214b70c107cabbb54f865e646e99f0d73 (diff) | |
| parent | b0bdd2be1c30d349a1efef96b93a5771f5edbd06 (diff) | |
Merge branch 'develop' into disable_notif_only
Diffstat (limited to 'src/components/motor')
| -rw-r--r-- | src/components/motor/MotorController.cpp | 11 | ||||
| -rw-r--r-- | src/components/motor/MotorController.h | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/components/motor/MotorController.cpp b/src/components/motor/MotorController.cpp index c79ecdd..f596c71 100644 --- a/src/components/motor/MotorController.cpp +++ b/src/components/motor/MotorController.cpp @@ -2,6 +2,7 @@ #include <hal/nrf_gpio.h> #include "systemtask/SystemTask.h" #include "app_timer.h" +#include "drivers/PinMap.h" APP_TIMER_DEF(shortVibTimer); APP_TIMER_DEF(longVibTimer); @@ -9,8 +10,8 @@ APP_TIMER_DEF(longVibTimer); using namespace Pinetime::Controllers; void MotorController::Init() { - nrf_gpio_cfg_output(pinMotor); - nrf_gpio_pin_set(pinMotor); + nrf_gpio_cfg_output(PinMap::Motor); + nrf_gpio_pin_set(PinMap::Motor); app_timer_init(); app_timer_create(&shortVibTimer, APP_TIMER_MODE_SINGLE_SHOT, StopMotor); @@ -23,7 +24,7 @@ void MotorController::Ring(void* p_context) { } void MotorController::RunForDuration(uint8_t motorDuration) { - nrf_gpio_pin_clear(pinMotor); + nrf_gpio_pin_clear(PinMap::Motor); app_timer_start(shortVibTimer, APP_TIMER_TICKS(motorDuration), nullptr); } @@ -34,9 +35,9 @@ void MotorController::StartRinging() { void MotorController::StopRinging() { app_timer_stop(longVibTimer); - nrf_gpio_pin_set(pinMotor); + nrf_gpio_pin_set(PinMap::Motor); } void MotorController::StopMotor(void* p_context) { - nrf_gpio_pin_set(pinMotor); + nrf_gpio_pin_set(PinMap::Motor); } diff --git a/src/components/motor/MotorController.h b/src/components/motor/MotorController.h index 574b86c..61014a1 100644 --- a/src/components/motor/MotorController.h +++ b/src/components/motor/MotorController.h @@ -5,7 +5,6 @@ namespace Pinetime { namespace Controllers { - static constexpr uint8_t pinMotor = 16; class MotorController { public: |