Add metta button + logic + scroll. No birds yet.

README.md

@@ -2,5 +2,10 @@
 
 #### _[Work in Progress]_
 
+Talis-Metta is a collaborative talisman with the virtue of [metta](https://en.wikipedia.org/wiki/Mettā) — intention, prayer and wishes for unconditional love — for myself, my loved ones and everyone else.
+From inner peace — through good will towards the other — to world peace.
+
+----
+
 To convert images from [graphics/](graphics) to `.h` files under [talismetta/](talismetta),
 use [Rinky-Dink Electronics converter](http://www.rinkydinkelectronics.com/t_imageconverter565.php)

talismetta/talismetta.ino

@@ -9,19 +9,25 @@
 #include "together.h"
 #include "talis.h"
 #include "metta.h"
+#include "loving.h"
+#include "kindness.h"
 
-#define DEBUG false
+#define DEBUG true
 
 #define BUTTON1PIN ((gpio_num_t)35)
 #define BUTTON2PIN ((gpio_num_t)0)
 
-#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 INTRO_FREEZE_MILLIS 4000
+#define INTRO_SCROLL_MILLIS 2000
 
-#define OUTRO_DURATION_MILLIS 2000
-#define POST_OUTRO_MILLIS 1000
-unsigned long outro_start = 0;
+#define PING_START_MILLIS 8000 // should be > INTRO_FREEZE_MILLIS + INTRO_SCROLL_MILLIS
+
+#define METTA_FREEZE_MILLIS 1000
+#define METTA_SCROLL_MILLIS 2000
+
+#define OUTRO_SCROLL_MILLIS 2000
+#define OUTRO_FREEZE_MILLIS 1000
+unsigned long outro_start;
 
 
 #define SEND_INTERVAL 3000
@@ -30,6 +36,13 @@ unsigned long next_send = 0;
 
 String my_mac;
 bool is_salam;
+bool metta_from_you;
+unsigned long metta_from_me_start = 0;
+
+
+#define MANTRA_I "May I be filled with loving kindness"
+#define MANTRA_WE "May we be filled with loving kindness"
+
 
 uint8_t peer_mac_addr[6];
 esp_now_peer_info_t peerInfo;
@@ -76,8 +89,8 @@ unsigned long last_flip = 0;
 
 TFT_eSPI tft = TFT_eSPI();
 TFT_eSprite background = TFT_eSprite(&tft);
-TFT_eSprite talisSprite = TFT_eSprite(&tft);
-TFT_eSprite mettaSprite = TFT_eSprite(&tft);
+TFT_eSprite leftSprite = TFT_eSprite(&tft);
+TFT_eSprite rightSprite = TFT_eSprite(&tft);
 
 
 // lifted from MacAddress.c
@@ -99,11 +112,32 @@ bool str2mac(char *buf, uint8_t *mac) {
 
 void OnDataSent(const uint8_t *mac_addr, esp_now_send_status_t status) {
   nearby = (status == ESP_NOW_SEND_SUCCESS);
+  if (!nearby) {
+    metta_from_you = false;
+  }
   if (DEBUG) {
     Serial.println(nearby ? "Nearby" : "Not nearby");
   }
 }
 
+void OnDataRecv(const uint8_t *mac_addr, const uint8_t *data, int data_len) {
+  metta_from_you = (data_len == strlen(MANTRA_WE)) && !strncmp((const char *)data, MANTRA_WE, data_len);
+  if (DEBUG) {
+    // char macStr[18];
+    // snprintf(macStr, sizeof(macStr), "%02x:%02x:%02x:%02x:%02x:%02x",
+    //          mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]);
+    // Serial.print("Packet Recv from: "); Serial.println(macStr);
+    //String msg = "";
+    //for (int i = 0 ; i < data_len; i++) {
+    //  msg.concat(char(data[i]));
+    //}
+    //Serial.print("Packet Recv message: "); Serial.println(msg);
+    Serial.print("Packet Recv message length: "); Serial.println(data_len);
+    Serial.print("Metta from other: "); Serial.println(metta_from_you);
+  }
+}
+
+
 void setup() {
   pinMode(BUTTON1PIN, INPUT_PULLUP);
   pinMode(BUTTON2PIN, INPUT_PULLUP);
@@ -129,6 +163,8 @@ void setup() {
     str2mac(SHALOM, peer_mac_addr);
   }
   outro_start = 0;
+  metta_from_me_start = 0;
+  metta_from_you = false;
 
   WiFi.mode(WIFI_STA);
   esp_now_init();
@@ -137,6 +173,7 @@ void setup() {
   peerInfo.encrypt = false;
   esp_now_add_peer(&peerInfo);
   esp_now_register_send_cb(OnDataSent);
+  esp_now_register_recv_cb(OnDataRecv);
 
   tft.init();
   tft.setRotation(3); // was 1
@@ -146,13 +183,34 @@ void setup() {
   background.createSprite(240, 135);
   background.setSwapBytes(true);
 
-  talisSprite.createSprite(120, 135);
-  talisSprite.setSwapBytes(true);
-  talisSprite.pushImage(0, 0, 120, 135, talis);
+  leftSprite.createSprite(120, 135);
+  leftSprite.setSwapBytes(true);
+  leftSprite.pushImage(0, 0, 120, 135, talis);
 
-  mettaSprite.createSprite(120, 135);
-  mettaSprite.setSwapBytes(true);
-  mettaSprite.pushImage(0, 0, 120, 135, metta);
+  rightSprite.createSprite(120, 135);
+  rightSprite.setSwapBytes(true);
+  rightSprite.pushImage(0, 0, 120, 135, metta);
+}
+
+void do_scroll(const unsigned short *left_image, const unsigned short *right_image, unsigned long start_time, unsigned long freeze_duration, unsigned long scroll_duration, bool is_reverse) {
+  unsigned long nowmillis = millis();
+  if (nowmillis >= start_time && nowmillis < start_time + freeze_duration + scroll_duration) {
+    unsigned long freeze_start = is_reverse ? start_time + scroll_duration : start_time;
+    unsigned long scroll_start = is_reverse ? start_time : start_time + freeze_duration;
+    leftSprite.pushImage(0, 0, 120, 135, left_image);
+    rightSprite.pushImage(0, 0, 120, 135, right_image);
+    if (nowmillis >= freeze_start && nowmillis < freeze_start + freeze_duration) {
+      leftSprite.pushToSprite(&background, 0, 0);
+      rightSprite.pushToSprite(&background, 120, 0);
+    } else {
+      long scroll_pixels = 123 * (nowmillis - scroll_start) / scroll_duration;
+      if (is_reverse) {
+        scroll_pixels = 123 - scroll_pixels;
+      }
+      leftSprite.pushToSprite(&background, -scroll_pixels, 0);
+      rightSprite.pushToSprite(&background, 120 + scroll_pixels, 0);
+    }
+  }
 }
 
 void loop() {
@@ -160,13 +218,21 @@ void loop() {
   if (digitalRead(BUTTON1PIN) == LOW) {
     outro_start = nowmillis;
   }
+  if (digitalRead(BUTTON2PIN) == LOW) {
+    metta_from_me_start = nowmillis;
+  }
   if (nowmillis > next_send) {
     if (DEBUG) {
-      Serial.println("Pinging...");
-    }    esp_now_send(peerInfo.peer_addr, (const uint8_t *)"<3", 2);
+      Serial.print("Sending: ");
+      Serial.println(metta_from_me_start ? MANTRA_WE : MANTRA_I);
+    }
+    esp_now_send(
+      peerInfo.peer_addr,
+      metta_from_me_start ? (const uint8_t *)MANTRA_WE : (const uint8_t *)MANTRA_I,
+      metta_from_me_start ? strlen(MANTRA_WE) : strlen(MANTRA_I));
     next_send = nowmillis + SEND_INTERVAL;
   }
-  if ((nowmillis > PING_START_MILLIS) && nearby) {
+  if (nowmillis > PING_START_MILLIS) {
     if ((nowmillis - last_flip) > DURATION || nowmillis < last_flip) {
       current_frame = (current_frame + 1) % NUM_FRAMES;
       last_flip = nowmillis;
@@ -175,29 +241,24 @@ void loop() {
   } else {
     current_frame = 0;
   }
-  // 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));
-  }
+
+  // FRAME_ME or animation frame
+  background.pushImage(
+    0, 0, 240, 135,
+    frame2image((metta_from_me_start && metta_from_you) ? frames[current_frame] : FRAME_ME, is_salam));
+
+  // Scroll overlays
   if (outro_start) { // Outro scroll overlay
-    if (nowmillis - outro_start > OUTRO_DURATION_MILLIS + POST_OUTRO_MILLIS) { // outro over. shut down
+    if (nowmillis - outro_start > OUTRO_FREEZE_MILLIS + OUTRO_SCROLL_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 { // do outro reverse scroll and freeze
+      do_scroll(talis, metta, outro_start, OUTRO_FREEZE_MILLIS, OUTRO_SCROLL_MILLIS, true);
     }
-  } else if (nowmillis < INTRO_START_MILLIS) { // Intro scroll overlay
-    talisSprite.pushToSprite(&background, 0, 0);
-    mettaSprite.pushToSprite(&background, 120, 0);
-  } 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);
+  } else if (nowmillis < INTRO_FREEZE_MILLIS + INTRO_SCROLL_MILLIS) { // Intro scroll overlay
+    do_scroll(talis, metta, 0, INTRO_FREEZE_MILLIS, INTRO_SCROLL_MILLIS, false);
+  } else if (metta_from_me_start && nowmillis < metta_from_me_start + METTA_FREEZE_MILLIS + METTA_SCROLL_MILLIS) {
+    do_scroll(loving, kindness, metta_from_me_start, METTA_FREEZE_MILLIS, METTA_SCROLL_MILLIS, false);
   }
   background.pushSprite(0, 0);