🔀 Merge branch 'ladislas/feature/fs-vid-git-lfs' into develop

leka · Jun 15, 2022 · 9205d9f · 9205d9f
2 parents 33eed18 + 552f1d2
commit 9205d9f
Show file tree

Hide file tree

Showing 30 changed files with 97 additions and 10 deletions.
diff --git a/fs/home/vid/actions/robot-animation-action-blowing_bubbles-no_eyebrows.avi b/fs/home/vid/actions/robot-animation-action-blowing_bubbles-no_eyebrows.avi
diff --git a/fs/home/vid/actions/robot-animation-action-diving_under_water-no_eyebrows.avi b/fs/home/vid/actions/robot-animation-action-diving_under_water-no_eyebrows.avi
diff --git a/fs/home/vid/actions/robot-animation-action-fly_landing_on_nose-no_eyebrows.avi b/fs/home/vid/actions/robot-animation-action-fly_landing_on_nose-no_eyebrows.avi
diff --git a/fs/home/vid/actions/robot-animation-action-singing-colored_notes-no_eyebrows.avi b/fs/home/vid/actions/robot-animation-action-singing-colored_notes-no_eyebrows.avi
diff --git a/fs/home/vid/actions/robot-animation-action-sneezing-no_eyebrows.avi b/fs/home/vid/actions/robot-animation-action-sneezing-no_eyebrows.avi
diff --git a/fs/home/vid/actions/robot-animation-action-yawning-no_eyebrows.avi b/fs/home/vid/actions/robot-animation-action-yawning-no_eyebrows.avi
diff --git a/fs/home/vid/emotions/robot-emotion-afraid_blue_forehead_sweatdrop-no_eyebrows.avi b/fs/home/vid/emotions/robot-emotion-afraid_blue_forehead_sweatdrop-no_eyebrows.avi
diff --git a/fs/home/vid/emotions/robot-emotion-afraid_trembling_eyes-no_eyebrows.avi b/fs/home/vid/emotions/robot-emotion-afraid_trembling_eyes-no_eyebrows.avi
diff --git a/fs/home/vid/emotions/robot-emotion-afraid_trembling_eyes_sweatdrop-no_eyebrows.avi b/fs/home/vid/emotions/robot-emotion-afraid_trembling_eyes_sweatdrop-no_eyebrows.avi
diff --git a/...id/emotions/robot-emotion-amazed_sparkly_eyes_looking_top_trembling_mouth-no_eyebrows.avi b/...id/emotions/robot-emotion-amazed_sparkly_eyes_looking_top_trembling_mouth-no_eyebrows.avi
diff --git a/fs/home/vid/emotions/robot-emotion-amazed_sparkly_eyes_trembling_mouth-no_eyebrows.avi b/fs/home/vid/emotions/robot-emotion-amazed_sparkly_eyes_trembling_mouth-no_eyebrows.avi
diff --git a/fs/home/vid/emotions/robot-emotion-angry-no_eyebrows.avi b/fs/home/vid/emotions/robot-emotion-angry-no_eyebrows.avi
diff --git a/fs/home/vid/emotions/robot-emotion-angry_breathing_nose-no_eyebrows.avi b/fs/home/vid/emotions/robot-emotion-angry_breathing_nose-no_eyebrows.avi
diff --git a/fs/home/vid/emotions/robot-emotion-disgusted_green_cheeks_pull_out_the_tang-no_eyebrows.avi b/fs/home/vid/emotions/robot-emotion-disgusted_green_cheeks_pull_out_the_tang-no_eyebrows.avi
diff --git a/fs/home/vid/emotions/robot-emotion-happy-no_eyebrows.avi b/fs/home/vid/emotions/robot-emotion-happy-no_eyebrows.avi
diff --git a/fs/home/vid/emotions/robot-emotion-sad-no_tears-no_eyebrows.avi b/fs/home/vid/emotions/robot-emotion-sad-no_tears-no_eyebrows.avi
diff --git a/fs/home/vid/emotions/robot-emotion-sad_trembling_mouth_cry_tears-no_eyebrows.avi b/fs/home/vid/emotions/robot-emotion-sad_trembling_mouth_cry_tears-no_eyebrows.avi
diff --git a/fs/home/vid/emotions/robot-emotion-sick_green_cheeks-no_eyebrows.avi b/fs/home/vid/emotions/robot-emotion-sick_green_cheeks-no_eyebrows.avi
diff --git a/fs/home/vid/states/robot-state-looking_center_front_winking-no_eyebrows.avi b/fs/home/vid/states/robot-state-looking_center_front_winking-no_eyebrows.avi
diff --git a/fs/home/vid/states/robot-state-looking_center_left-no_eyebrows.avi b/fs/home/vid/states/robot-state-looking_center_left-no_eyebrows.avi
diff --git a/fs/home/vid/states/robot-state-looking_center_right-no_eyebrows.avi b/fs/home/vid/states/robot-state-looking_center_right-no_eyebrows.avi
diff --git a/fs/home/vid/states/robot-state-looking_top_right-no_eyebrows.avi b/fs/home/vid/states/robot-state-looking_top_right-no_eyebrows.avi
diff --git a/fs/home/vid/states/robot-state-looking_top_right_left-no_eyebrows.avi b/fs/home/vid/states/robot-state-looking_top_right_left-no_eyebrows.avi
diff --git a/fs/home/vid/system/robot-system-ble_connection-wink-no_eyebrows.avi b/fs/home/vid/system/robot-system-ble_connection-wink-no_eyebrows.avi
diff --git a/fs/home/vid/system/robot-system-idle-looking_top_right_left-no_eyebrows.avi b/fs/home/vid/system/robot-system-idle-looking_top_right_left-no_eyebrows.avi
diff --git a/fs/home/vid/system/robot-system-reinforcer-happy-no_eyebrows.avi b/fs/home/vid/system/robot-system-reinforcer-happy-no_eyebrows.avi
diff --git a/fs/home/vid/system/robot-system-sleep-wake_up-no_eyebrows.avi b/fs/home/vid/system/robot-system-sleep-wake_up-no_eyebrows.avi
diff --git a/fs/home/vid/system/robot-system-sleep-yawn_then_sleep-no_eyebrows.avi b/fs/home/vid/system/robot-system-sleep-yawn_then_sleep-no_eyebrows.avi
diff --git a/libs/BehaviorKit/source/BehaviorKit.cpp b/libs/BehaviorKit/source/BehaviorKit.cpp
@@ -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()
@@ -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();
@@ -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();
@@ -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();
 }
@@ -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");
 	}
 }
 

diff --git a/spikes/lk_fs/main.cpp b/spikes/lk_fs/main.cpp
@@ -102,8 +102,8 @@ auto main() -> int
 {
 	sd::init();
 
-	videokit.initializeScreen();
 	display::corelcd.turnOn();
+	videokit.initializeScreen();
 
 	rtos::ThisThread::sleep_for(1s);
 
@@ -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;
 		}