Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

hugo/feature/Add Fly animation #525

Merged
merged 2 commits into from
Mar 9, 2022
Merged

hugo/feature/Add Fly animation #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e0c3a5
:sparkles: (led animation): Add Fly animation
HPezz Mar 3, 2022
e0e3b7f
:art: (spikes): Upgrade lk_led_spike
HPezz Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion libs/LedKit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ target_include_directories(LedKit

target_sources(LedKit
PRIVATE
source/Bubbles.cpp
source/Fly.cpp
source/LedKit.cpp
source/Singing.cpp
source/Bubbles.cpp
)

target_link_libraries(LedKit
Expand Down
64 changes: 64 additions & 0 deletions libs/LedKit/include/internal/Fly.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
// Leka - LekaOS
// Copyright 2022 APF France handicap
// SPDX-License-Identifier: Apache-2.0

// + Stage 0 + Stage 1 + Stage 2 + 3 + 4 +5 + 6 + 7 +
// | | | | | | | | |
// | | | | | | | | |
// | | |\ | | || | || | --- White
// | | /| \ | | |\ | || |
// | | / | \ | | /| || / || |
// | | / | \ | | || || | || |
// | | / | \ | | || \| | |\ |
// | | / | \ | | || |/ | | |
// | | / | \ | | / | || | | |
// | | / | \ | | | | | | \ |
// | | / | \ | | | | | | | |
// | | / | \ | | / | | | \ |
// | | / | \ | | | | | | ||
// | | / | \ | | | | | | ||
// | | / | \ | | | | | | \|
// | |/ | \| |/ | | | |
// |-----------| | |-------| | | | | --- Black
// | | | | | | | | |

#pragma once

// ? LCOV_EXCL_START - Exclude from coverage report

#include "LEDAnimation.h"

namespace leka::led::animation {

class Fly : public interface::LEDAnimation
{
public:
explicit Fly(interface::LED &ears, interface::LED &belt) : _ears(ears), _belt(belt) {};

void start() final;
void run() final;
void stop() final;

private:
interface::LED &_ears;
interface::LED &_belt;
uint8_t _step = 0;
uint8_t _stage = 0;

[[nodiscard]] auto mapStep(uint8_t step, uint8_t val) const -> float;

void stage0();
void stage1();
void stage2();
void stage3();
void stage4();
void stage5();
void stage6();
void stage7();

void turnLedBlack();
};

} // namespace leka::led::animation

// ? LCOV_EXCL_STOP - Exclude from coverage report
170 changes: 170 additions & 0 deletions libs/LedKit/source/Fly.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
// Leka - LekaOS
// Copyright 2022 APF France handicap
// SPDX-License-Identifier: Apache-2.0

// ? LCOV_EXCL_START - Exclude from coverage report

#include "Fly.h"

#include "MathUtils.h"

namespace leka::led::animation {

static constexpr auto kThresholdDown = 0.3F;

void Fly::start()
{
turnLedBlack();
}

void Fly::stop()
{
turnLedBlack();
}

void Fly::run()
{
switch (_stage) {
case 0:
stage0();
break;
case 1:
stage1();
break;
case 2:
stage2();
break;
case 3:
stage3();
break;
case 4:
stage4();
break;
case 5:
stage5();
break;
case 6:
stage6();
break;
case 7:
stage7();
break;
default:
break;
}
_belt.show();
}

auto Fly::mapStep(uint8_t step, uint8_t val) const -> float
{
return utils::math::map(step, uint8_t {0}, val, 0.F, 1.F);
}

void Fly::stage0()
{
static constexpr auto kInputMaxStage0 = 50;
if (auto pos = mapStep(_step, kInputMaxStage0); pos != 1.F) {
++_step;
} else {
_step = 0;
++_stage;
}
}

void Fly::stage1()
{
static constexpr auto kInputMaxStage1to2 = 30;
if (auto pos = mapStep(_step, kInputMaxStage1to2); pos != 1.F) {
RGB color = ColorKit::colorGradient(RGB::black, RGB::white, pos);
_belt.setColor(color);
++_step;
} else {
++_stage;
}
}

void Fly::stage2()
{
static constexpr auto kInputMaxStage1to2 = 30;
if (auto pos = mapStep(_step, kInputMaxStage1to2); pos != 0.F) {
RGB color = ColorKit::colorGradient(RGB::black, RGB::white, pos);
_belt.setColor(color);
--_step;
} else {
_step = 0;
++_stage;
}
}

void Fly::stage3()
{
static constexpr auto kInputMaxStage3 = 10;
if (auto pos = mapStep(_step, kInputMaxStage3); pos != 1.F) {
++_step;
} else {
_step = 0;
++_stage;
}
}

void Fly::stage4()
{
static constexpr auto kInputMaxValue4to7 = 6;
if (auto pos = mapStep(_step, kInputMaxValue4to7); pos != 1.F) {
RGB color = ColorKit::colorGradient(RGB::black, RGB::white, pos);
_belt.setColor(color);
++_step;
} else {
++_stage;
}
}

void Fly::stage5()
{
static constexpr auto kInputMaxValue4to7 = 6;
if (auto pos = mapStep(_step, kInputMaxValue4to7); pos >= kThresholdDown) {
RGB color = ColorKit::colorGradient(RGB::black, RGB::white, pos);
_belt.setColor(color);
--_step;
} else {
++_stage;
}
}

void Fly::stage6()
{
static constexpr auto kInputMaxValue4to7 = 6;
if (auto pos = mapStep(_step, kInputMaxValue4to7); pos != 1.F) {
RGB color = ColorKit::colorGradient(RGB::black, RGB::white, pos);
_belt.setColor(color);
++_step;
} else {
++_stage;
}
}

void Fly::stage7()
{
static constexpr auto kInputMaxValue4to7 = 6;
if (auto pos = mapStep(_step, kInputMaxValue4to7); pos != 0.F) {
RGB color = ColorKit::colorGradient(RGB::black, RGB::white, pos);
_belt.setColor(color);
--_step;
} else {
RGB color = ColorKit::colorGradient(RGB::black, RGB::white, pos);
_belt.setColor(color);
++_stage;
}
}

void Fly::turnLedBlack()
{
_ears.setColor(RGB::black);
_belt.setColor(RGB::black);
_ears.show();
_belt.show();
}

} // namespace leka::led::animation

// ? LCOV_EXCL_STOP - Exclude from coverage report
7 changes: 6 additions & 1 deletion spikes/lk_led_kit/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "Bubbles.h"
#include "CoreLED.h"
#include "CoreSPI.h"
#include "Fly.h"
#include "HelloWorld.h"
#include "LedKit.h"
#include "LogKit.h"
Expand All @@ -28,8 +29,10 @@ auto animation_thread = rtos::Thread {};
auto animation_event_queue = events::EventQueue {};

auto ledkit = LedKit {animation_thread, animation_event_queue, ears, belt};

led::animation::Bubbles animation_bubbles(ears, belt);
led::animation::Singing animation_singing(ears, belt);
led::animation::Fly animation_fly {ears, belt};

HelloWorld hello;

Expand All @@ -43,7 +46,9 @@ auto main() -> int

while (true) {
ledkit.start(animation_singing);
rtos::ThisThread::sleep_for(40s);
rtos::ThisThread::sleep_for(10s);
ledkit.start(animation_fly);
rtos::ThisThread::sleep_for(10s);

ledkit.stop();
rtos::ThisThread::sleep_for(1s);
Expand Down