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.

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

hugo/feature/Add FoodRecognition activity #1008

Merged
merged 2 commits into from
Sep 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 0 deletions app/os/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#include "EventLoopKit.h"
#include "FATFileSystem.h"
#include "FirmwareKit.h"
#include "FoodRecognition.h"
#include "HelloWorld.h"
#include "LedColorRecognition.h"
#include "LogKit.h"
Expand Down Expand Up @@ -342,6 +343,7 @@ namespace activities {
auto led_color_recognition =
leka::activity::LedColorRecognition(rfidkit, display::videokit, reinforcerkit, leds::belt);
auto emotion_recognition = leka::activity::EmotionRecognition(rfidkit, display::videokit, reinforcerkit);
auto food_recognition = leka::activity::FoodRecognition(rfidkit, display::videokit, reinforcerkit);

} // namespace internal

Expand All @@ -352,6 +354,7 @@ namespace activities {
{MagicCard::number_2, &internal::picto_color_recognition},
{MagicCard::number_3, &internal::led_color_recognition},
{MagicCard::number_4, &internal::emotion_recognition},
{MagicCard::number_5, &internal::food_recognition},
};

} // namespace activities
Expand Down
1 change: 1 addition & 0 deletions libs/ActivityKit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ target_sources(ActivityKit
source/activities/LedColorRecognition.cpp
source/activities/ChooseReinforcer.cpp
source/activities/EmotionRecognition.cpp
source/activities/FoodRecognition.cpp
)

target_link_libraries(ActivityKit
Expand Down
51 changes: 51 additions & 0 deletions libs/ActivityKit/include/activities/FoodRecognition.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// Leka - LekaOS
// Copyright 2022 APF France handicap
// SPDX-License-Identifier: Apache-2.0

#pragma once

// LCOV_EXCL_START

#include <optional>

#include "RFIDKit.h"
#include "ReinforcerKit.h"
#include "include/Food.h"
#include "interface/Activity.h"
#include "interface/libs/VideoKit.h"

namespace leka::activity {

class FoodRecognition : public interface::Activity
{
public:
explicit FoodRecognition(RFIDKit &rfidkit, interface::VideoKit &videokit, ReinforcerKit &reinforcerkit)
: _rfidkit(rfidkit), _videokit(videokit), _reinforcerkit(reinforcerkit) {};

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

private:
void processCard(const MagicCard &card);
void launchNextRound();

RFIDKit &_rfidkit;
interface::VideoKit &_videokit;
ReinforcerKit &_reinforcerkit;

static constexpr uint8_t kScoreToWin = 10;
static constexpr uint8_t kSizeOfFoodsTable = 9 * 2;

uint8_t _current_round = 0;
std::optional<Food> _current_food {};
std::function<void(const MagicCard &)> _backup_callback {};
std::array<Food, kSizeOfFoodsTable> _foods = {
Food::apple, Food::apple, Food::banana, Food::banana, Food::grapes, Food::grapes,
Food::mushroom, Food::mushroom, Food::salad, Food::salad, Food::carrot, Food::carrot,
Food::cherry, Food::cherry, Food::strawberry, Food::strawberry, Food::potato, Food::potato,
};
};

} // namespace leka::activity

// LCOV_EXCL_STOP
56 changes: 56 additions & 0 deletions libs/ActivityKit/source/activities/FoodRecognition.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
// Leka - LekaOS
// Copyright 2022 APF France handicap
// SPDX-License-Identifier: Apache-2.0

// LCOV_EXCL_START

#include "FoodRecognition.h"
#include <random>

namespace leka::activity {

void FoodRecognition::start()
{
_current_round = 0;
_current_food = {};

_backup_callback = _rfidkit.getCallback();
std::shuffle(_foods.begin(), _foods.end(), std::mt19937(static_cast<unsigned int>(time(nullptr))));
launchNextRound();

_rfidkit.onTagActivated([this](const MagicCard &card) { processCard(card); });
}

void FoodRecognition::stop()
{
_rfidkit.onTagActivated(_backup_callback);
}

void FoodRecognition::processCard(const MagicCard &card)
{
if (card == _current_food->card) {
_reinforcerkit.playDefault();
++_current_round;

if (_current_round == kScoreToWin) {
_backup_callback(MagicCard::dice_roll);
return;
}

launchNextRound();
} else {
_backup_callback(card);
}
}

void FoodRecognition::launchNextRound()
{
_current_food = _foods.at(_current_round);

auto full_path = "/fs/home/img/id/" + std::string(_current_food->id) + ".jpg";
_videokit.fillWhiteBackgroundAndDisplayImage(full_path);
}

} // namespace leka::activity

// LCOV_EXCL_STOP