Add outro, more "me time". Add xcf [+ font]

talismetta/talismetta.ino

@@ -15,10 +15,13 @@
 #define BUTTON1PIN ((gpio_num_t)35)
 #define BUTTON2PIN ((gpio_num_t)0)
 
-#define SCROLL_START_MILLIS 4000
-#define SCROLL_END_MILLIS 6000 // should be > SCROLL_START_MILLIS
-#define PING_START_MILLIS 8000 // should be > SCROLL_END_MILLIS
+#define INTRO_START_MILLIS 4000
+#define INTRO_END_MILLIS 6000 // should be > INTRO_START_MILLIS
+#define PING_START_MILLIS 8000 // should be > INTRO_END_MILLIS
 
+#define OUTRO_DURATION_MILLIS 2000
+#define POST_OUTRO_MILLIS 1000
+unsigned long outro_start = 0;
 
 
 #define SEND_INTERVAL 3000
@@ -34,7 +37,7 @@ esp_now_peer_info_t peerInfo;
 bool nearby = false;
 
 
-#define NUM_FRAMES 21
+#define NUM_FRAMES 23
 enum frameType {
   FRAME_ME,
   FRAME_ME2US,
@@ -44,14 +47,10 @@ enum frameType {
 };
 
 frameType frames[NUM_FRAMES] = {
-  FRAME_ME, FRAME_ME2US, FRAME_US, FRAME_US2U,
-  FRAME_U, FRAME_U, FRAME_U,
-  FRAME_US2U,
-  FRAME_US, FRAME_US,
-  FRAME_US2U,
-  FRAME_U, FRAME_U, FRAME_U,
-  FRAME_US2U, FRAME_US, FRAME_ME2US,
-  FRAME_ME, FRAME_ME, FRAME_ME, FRAME_ME
+  FRAME_ME, FRAME_ME2US, FRAME_US, FRAME_US2U, FRAME_U, FRAME_U, FRAME_U,
+  FRAME_US2U,  FRAME_US, FRAME_US,  FRAME_US2U, FRAME_U, FRAME_U, FRAME_U,
+  FRAME_US2U, FRAME_US, FRAME_ME2US, FRAME_ME, FRAME_ME, FRAME_ME,
+  FRAME_ME, FRAME_ME, FRAME_ME
 };
 
 const unsigned short *frame2image(frameType frame, bool is_salam) {
@@ -129,6 +128,7 @@ void setup() {
     is_salam = true;
     str2mac(SHALOM, peer_mac_addr);
   }
+  outro_start = 0;
 
   WiFi.mode(WIFI_STA);
   esp_now_init();
@@ -141,6 +141,7 @@ void setup() {
   tft.init();
   tft.setRotation(3); // was 1
   tft.setSwapBytes(true);
+  tft.fillScreen(TFT_BLACK);
 
   background.createSprite(240, 135);
   background.setSwapBytes(true);
@@ -155,11 +156,10 @@ void setup() {
 }
 
 void loop() {
+  unsigned long nowmillis = millis();
   if (digitalRead(BUTTON1PIN) == LOW) {
-    esp_sleep_enable_ext0_wakeup(BUTTON2PIN, LOW);
-    esp_deep_sleep_start();
+    outro_start = nowmillis;
   }
-  unsigned long nowmillis = millis();
   if (nowmillis > next_send) {
     if (DEBUG) {
       Serial.println("Pinging...");
@@ -170,18 +170,35 @@ void loop() {
     if ((nowmillis - last_flip) > DURATION || nowmillis < last_flip) {
       current_frame = (current_frame + 1) % NUM_FRAMES;
       last_flip = nowmillis;
+      background.pushSprite(0, 0);
     }
   } else {
     current_frame = 0;
   }
-  background.pushImage(0, 0, 240, 135, frame2image(frames[current_frame], is_salam));
-  if (nowmillis < SCROLL_START_MILLIS) {
+  // FRAMEW_ME or morph
+  if (nowmillis >= INTRO_START_MILLIS && (!outro_start || nowmillis < outro_start + OUTRO_DURATION_MILLIS)) {
+    background.pushImage(0, 0, 240, 135, frame2image(frames[current_frame], is_salam));
+  }
+  if (outro_start) { // Outro scroll overlay
+    if (nowmillis - outro_start > OUTRO_DURATION_MILLIS + POST_OUTRO_MILLIS) { // outro over. shut down
+      esp_sleep_enable_ext0_wakeup(BUTTON1PIN, LOW);
+      esp_deep_sleep_start();
+    } else if (nowmillis - outro_start > OUTRO_DURATION_MILLIS) {
+      talisSprite.pushToSprite(&background, 0, 0);
+      mettaSprite.pushToSprite(&background, 120, 0);
+    } else { // do outro
+      long scrollPixels = 123 - (123 * (nowmillis - outro_start) / OUTRO_DURATION_MILLIS);
+      talisSprite.pushToSprite(&background, -scrollPixels, 0);
+      mettaSprite.pushToSprite(&background, 120 + scrollPixels, 0);
+    }
+  } else if (nowmillis < INTRO_START_MILLIS) { // Intro scroll overlay
     talisSprite.pushToSprite(&background, 0, 0);
     mettaSprite.pushToSprite(&background, 120, 0);
-  } else if (nowmillis < SCROLL_END_MILLIS) {
-    long scrollPixels = 123 * (nowmillis - SCROLL_START_MILLIS) / (SCROLL_END_MILLIS - SCROLL_START_MILLIS);
+  } else if (nowmillis < INTRO_END_MILLIS) {
+    long scrollPixels = 123 * (nowmillis - INTRO_START_MILLIS) / (INTRO_END_MILLIS - INTRO_START_MILLIS);
     talisSprite.pushToSprite(&background, -scrollPixels, 0);
     mettaSprite.pushToSprite(&background, 120 + scrollPixels, 0);
   }
   background.pushSprite(0, 0);
+
 }