update: fixed shake animation
The shake animation figures have been fixed. However, the petting emotion working with touch remains an issue. The Lottie JSON for the emotion is unable not parsable for some reason and my next step is to fix that for tomorrow's meeting.
This commit is contained in:
@@ -10,6 +10,7 @@
|
||||
#include "drivers/display_driver.h"
|
||||
#include "emotion-engine/blink/blink_emotion.h"
|
||||
#include "emotion-engine/shake/shake_emotion.h"
|
||||
#include "emotion-engine/shy/shy_emotion.h"
|
||||
#include "esp_log.h"
|
||||
|
||||
static const char *TAG = "emotion_manager";
|
||||
@@ -40,6 +41,12 @@ bool emotionManagerInit(void) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Initialize shy emotion
|
||||
if (!shyEmotionInit()) {
|
||||
ESP_LOGE(TAG, "Failed to initialize shy emotion");
|
||||
return false;
|
||||
}
|
||||
|
||||
// Future: Initialize other emotions here
|
||||
// surprisedEmotionInit();
|
||||
// sadEmotionInit();
|
||||
@@ -101,6 +108,13 @@ void emotionManagerSetEmotion(EmotionType emotion) {
|
||||
ESP_LOGI(TAG, "Emotion %d not yet implemented", emotion);
|
||||
break;
|
||||
|
||||
case EMOTION_SHY:
|
||||
// Stop any other animations and play shy
|
||||
shakeEmotionStop();
|
||||
blinkEmotionPause();
|
||||
shyEmotionPlay();
|
||||
break;
|
||||
|
||||
default:
|
||||
ESP_LOGW(TAG, "Unknown emotion type: %d", emotion);
|
||||
break;
|
||||
@@ -117,6 +131,7 @@ void emotionManagerStop(void) {
|
||||
ESP_LOGI(TAG, "Stopping emotion manager");
|
||||
|
||||
blinkEmotionStop();
|
||||
shyEmotionStop();
|
||||
// Future: Stop other emotions
|
||||
|
||||
initialized = false;
|
||||
|
||||
Reference in New Issue
Block a user