feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added menus for ledstrip

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-09-04 22:44:21 +02:00
parent 872945d089
commit d3ed93ef5f
10 changed files with 149 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/utils.h
View File

@@ -138,7 +138,7 @@ void fixCommonParams()
motor.phaseAdvMax = settings.limits.phaseAdvMax;
}
if (settings.reverseBeep)
if (settings.buzzer.reverseBeep)
{
const auto x = motors();
const auto shouldBeep = std::all_of(std::begin(x), std::end(x), [](const bobbycar::protocol::serial::MotorState &motor){ return motor.pwm < 0; });
@@ -150,7 +150,7 @@ void fixCommonParams()
reverseBeepToggle = true;
lastReverseBeepToggle = espchrono::millis_clock::now();
for (auto &controller : controllers)
controller.command.buzzer = {.freq=settings.reverseBeepFreq0, .pattern=0};
controller.command.buzzer = {.freq=settings.buzzer.reverseBeepFreq0, .pattern=0};
}
else
for (auto &controller : controllers)
@@ -158,12 +158,12 @@ void fixCommonParams()
currentlyReverseBeeping = shouldBeep;
}
else if (shouldBeep && espchrono::millis_clock::now() - lastReverseBeepToggle >= std::chrono::milliseconds{reverseBeepToggle?settings.reverseBeepDuration0:settings.reverseBeepDuration1})
else if (shouldBeep && espchrono::millis_clock::now() - lastReverseBeepToggle >= std::chrono::milliseconds{reverseBeepToggle?settings.buzzer.reverseBeepDuration0:settings.buzzer.reverseBeepDuration1})
{
reverseBeepToggle = !reverseBeepToggle;
for (auto &controller : controllers)
controller.command.buzzer = {.freq=uint8_t(reverseBeepToggle?settings.reverseBeepFreq0:settings.reverseBeepFreq1), .pattern=0};
controller.command.buzzer = {.freq=uint8_t(reverseBeepToggle?settings.buzzer.reverseBeepFreq0:settings.buzzer.reverseBeepFreq1), .pattern=0};
lastReverseBeepToggle = espchrono::millis_clock::now();
}