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

ladislas/feature/fs vid git lfs #884

Merged
merged 3 commits into from
Jun 15, 2022
Merged

ladislas/feature/fs vid git lfs #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c93d99
:bento: (vid): Add vid/{system,states,actions,emotions}
ladislas Jun 15, 2022
a82b7f7
:truck: (BehaviorKit): Update video paths
ladislas Jun 15, 2022
552f1d2
:bug: (spike): Fix delay issues when playing video
ladislas Jun 15, 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: 3 additions & 0 deletions fs/home/vid/actions/robot-animation-action-blowing_bubbles-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/actions/robot-animation-action-diving_under_water-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/actions/robot-animation-action-fly_landing_on_nose-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/actions/robot-animation-action-singing-colored_notes-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/actions/robot-animation-action-sneezing-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/actions/robot-animation-action-yawning-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/emotions/robot-emotion-afraid_blue_forehead_sweatdrop-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/emotions/robot-emotion-afraid_trembling_eyes-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/emotions/robot-emotion-afraid_trembling_eyes_sweatdrop-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions ...id/emotions/robot-emotion-amazed_sparkly_eyes_looking_top_trembling_mouth-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/emotions/robot-emotion-amazed_sparkly_eyes_trembling_mouth-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/emotions/robot-emotion-angry-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/emotions/robot-emotion-angry_breathing_nose-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/emotions/robot-emotion-disgusted_green_cheeks_pull_out_the_tang-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/emotions/robot-emotion-happy-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/emotions/robot-emotion-sad-no_tears-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/emotions/robot-emotion-sad_trembling_mouth_cry_tears-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/emotions/robot-emotion-sick_green_cheeks-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/states/robot-state-looking_center_front_winking-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/states/robot-state-looking_center_left-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/states/robot-state-looking_center_right-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/states/robot-state-looking_top_right-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/states/robot-state-looking_top_right_left-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/system/robot-system-ble_connection-wink-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/system/robot-system-idle-looking_top_right_left-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/system/robot-system-reinforcer-happy-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/system/robot-system-sleep-wake_up-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions fs/home/vid/system/robot-system-sleep-yawn_then_sleep-no_eyebrows.avi
View file
Open in desktop
Git LFS file not shown
17 changes: 8 additions & 9 deletions libs/BehaviorKit/source/BehaviorKit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,13 @@ void BehaviorKit::launching()
void BehaviorKit::sleeping()
{
_ledkit.start(&LedKit::animation::sleeping);
_videokit.playVideoOnce("/fs/videos/2022_01_17-animation-face-state-yawning-sleeping_without_eyebrows.avi");
_videokit.playVideoOnce("/fs/home/vid/system/robot-system-sleep-yawn_then_sleep-no_eyebrows.avi");
}

void BehaviorKit::waiting()
{
_ledkit.stop();
_videokit.playVideoOnRepeat(
"/fs/videos/2022_02_14-animation-face-state-waiting-looking-top-right-to-left-without-eyebrows.avi");
_videokit.playVideoOnRepeat("/fs/home/vid/system/robot-system-idle-looking_top_right_left-no_eyebrows.avi");
}

void BehaviorKit::lowBattery()
Expand Down Expand Up @@ -79,7 +78,7 @@ void BehaviorKit::blinkGreen()
{
spinLeft(1);
_ledkit.start(&LedKit::animation::blink_green);
_videokit.playVideoOnce("/fs/videos/2022_02_14-animation-face-state-happy-without-eyebrows.avi");
_videokit.playVideoOnce("/fs/home/vid/system/robot-system-reinforcer-happy-no_eyebrows.avi");
rtos::ThisThread::sleep_for(reinforcer_duration);
_ledkit.stop();
_motor_left.stop();
Expand All @@ -90,7 +89,7 @@ void BehaviorKit::spinBlink()
{
spinRight(1);
_ledkit.start(&LedKit::animation::spin_blink);
_videokit.playVideoOnce("/fs/videos/2022_02_14-animation-face-state-happy-without-eyebrows.avi");
_videokit.playVideoOnce("/fs/home/vid/system/robot-system-reinforcer-happy-no_eyebrows.avi");
rtos::ThisThread::sleep_for(reinforcer_duration);
_ledkit.stop();
_motor_left.stop();
Expand All @@ -100,23 +99,23 @@ void BehaviorKit::spinBlink()
void BehaviorKit::fire()
{
_ledkit.start(&LedKit::animation::fire);
_videokit.playVideoOnce("/fs/videos/2022_02_14-animation-face-state-happy-without-eyebrows.avi");
_videokit.playVideoOnce("/fs/home/vid/system/robot-system-reinforcer-happy-no_eyebrows.avi");
rtos::ThisThread::sleep_for(reinforcer_duration);
_ledkit.stop();
}

void BehaviorKit::sprinkles()
{
_ledkit.start(&LedKit::animation::sprinkles);
_videokit.playVideoOnce("/fs/videos/2022_02_14-animation-face-state-happy-without-eyebrows.avi");
_videokit.playVideoOnce("/fs/home/vid/system/robot-system-reinforcer-happy-no_eyebrows.avi");
rtos::ThisThread::sleep_for(reinforcer_duration);
_ledkit.stop();
}

void BehaviorKit::rainbow()
{
_ledkit.start(&LedKit::animation::rainbow);
_videokit.playVideoOnce("/fs/videos/2022_02_14-animation-face-state-happy-without-eyebrows.avi");
_videokit.playVideoOnce("/fs/home/vid/system/robot-system-reinforcer-happy-no_eyebrows.avi");
rtos::ThisThread::sleep_for(reinforcer_duration);
_ledkit.stop();
}
Expand All @@ -125,7 +124,7 @@ void BehaviorKit::bleConnection(bool with_video)
{
_ledkit.start(&LedKit::animation::ble_connection);
if (with_video) {
_videokit.playVideoOnce("/fs/videos/2022_02_14-animation-face-action-wink-without-eyebrows.avi");
_videokit.playVideoOnce("/fs/home/vid/system/robot-system-ble_connection-wink-no_eyebrows.avi");
}
}

Expand Down
6 changes: 5 additions & 1 deletion spikes/lk_fs/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ auto main() -> int
{
sd::init();

videokit.initializeScreen();
display::corelcd.turnOn();
videokit.initializeScreen();

rtos::ThisThread::sleep_for(1s);

Expand Down Expand Up @@ -138,8 +138,12 @@ auto main() -> int
}

if (path.string().ends_with(".avi")) {
videokit.displayImage("/fs/home/img/system/robot-misc-robot-misc-screen_empty_white.jpg");
rtos::ThisThread::sleep_for(5ms);
videokit.playVideoOnce(path);
rtos::ThisThread::sleep_for(3s);
videokit.stopVideo();
rtos::ThisThread::sleep_for(5ms);
com.write("ACK_VIDEO:" + path.string());
continue;
}
Expand Down