Merge branch 'develop' into HEAD
This commit is contained in:
commit
5bdef365f2
139 changed files with 5350 additions and 1804 deletions
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue