Added birds

talismetta/README.md

@@ -6,8 +6,7 @@ In order to figure out the address, upload the code to the talismetta, then you
 
 ```
 === Talis-Metta ===
-My MAC:
-0B:0A:0D:0A:05:05
+My MAC: BB:AA:DD:AA:55:55
 ```
 
 Copy this to the `SALAM` or `SHALOM` definition at `config.h`

talismetta/talismetta.ino

@@ -11,6 +11,8 @@
 #include "metta.h"
 #include "loving.h"
 #include "kindness.h"
+#include "mybird.h"
+#include "yourbird.h"
 
 #define DEBUG true
 
@@ -29,6 +31,17 @@
 #define OUTRO_FREEZE_MILLIS 1000
 unsigned long outro_start;
 
+#define MYBIRD_WIDTH 30
+#define MYBIRD_HEIGHT 36
+#define MYBIRD_X 20
+#define MYBIRD_Y 10
+
+#define YOURBIRD_WIDTH 32
+#define YOURBIRD_HEIGHT 33
+#define YOURBIRD_X 53
+#define YOURBIRD_Y 5
+
+
 
 #define SEND_INTERVAL 3000
 unsigned long next_send = 0;
@@ -37,11 +50,11 @@ unsigned long next_send = 0;
 String my_mac;
 bool is_salam;
 bool metta_from_you;
-unsigned long metta_from_me_start = 0;
+unsigned long metta_from_me_since = 0;
 
 
 #define MANTRA_I "May I be filled with loving kindness"
-#define MANTRA_WE "May we be filled with loving kindness"
+#define MANTRA_YOU "May you be filled with loving kindness"
 
 
 uint8_t peer_mac_addr[6];
@@ -91,6 +104,8 @@ TFT_eSPI tft = TFT_eSPI();
 TFT_eSprite background = TFT_eSprite(&tft);
 TFT_eSprite leftSprite = TFT_eSprite(&tft);
 TFT_eSprite rightSprite = TFT_eSprite(&tft);
+TFT_eSprite mybirdSprite = TFT_eSprite(&tft);
+TFT_eSprite yourbirdSprite = TFT_eSprite(&tft);
 
 
 // lifted from MacAddress.c
@@ -116,24 +131,24 @@ void OnDataSent(const uint8_t *mac_addr, esp_now_send_status_t status) {
     metta_from_you = false;
   }
   if (DEBUG) {
-    Serial.println(nearby ? "Nearby" : "Not nearby");
+    Serial.println(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);
+  metta_from_you = (data_len == strlen(MANTRA_YOU)) && !strncmp((const char *)data, MANTRA_YOU, 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);
+    char msg[64];
+    int msglen = min(data_len, 63);
+    strncpy(msg, (const char *)data, msglen);
+    msg[msglen] = '\0';
+    Serial.print("<<< "); Serial.println(msg);
+    Serial.print(metta_from_me_since ? "_/" : "__");
+    Serial.println(metta_from_you ? "\\_" : "__");
   }
 }
 
@@ -147,7 +162,7 @@ void setup() {
 
   // determine peer mac address
   my_mac = WiFi.macAddress();
-  Serial.println("My MAC:");
+  Serial.print("My MAC: ");
   Serial.println(my_mac);
   if (my_mac.equals(SHALOM)) {
     if (DEBUG) {
@@ -163,7 +178,7 @@ void setup() {
     str2mac(SHALOM, peer_mac_addr);
   }
   outro_start = 0;
-  metta_from_me_start = 0;
+  metta_from_me_since = 0;
   metta_from_you = false;
 
   WiFi.mode(WIFI_STA);
@@ -185,11 +200,17 @@ void setup() {
 
   leftSprite.createSprite(120, 135);
   leftSprite.setSwapBytes(true);
-  leftSprite.pushImage(0, 0, 120, 135, talis);
 
   rightSprite.createSprite(120, 135);
   rightSprite.setSwapBytes(true);
-  rightSprite.pushImage(0, 0, 120, 135, metta);
+
+  mybirdSprite.createSprite(MYBIRD_WIDTH, MYBIRD_HEIGHT);
+  mybirdSprite.setSwapBytes(true);
+  mybirdSprite.pushImage(0, 0, MYBIRD_WIDTH, MYBIRD_HEIGHT, mybird);
+
+  yourbirdSprite.createSprite(YOURBIRD_WIDTH, YOURBIRD_HEIGHT);
+  yourbirdSprite.setSwapBytes(true);
+  yourbirdSprite.pushImage(0, 0, YOURBIRD_WIDTH, YOURBIRD_HEIGHT, yourbird);
 }
 
 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) {
@@ -219,17 +240,17 @@ void loop() {
     outro_start = nowmillis;
   }
   if (digitalRead(BUTTON2PIN) == LOW) {
-    metta_from_me_start = nowmillis;
+    metta_from_me_since = nowmillis;
   }
   if (nowmillis > next_send) {
     if (DEBUG) {
-      Serial.print("Sending: ");
-      Serial.println(metta_from_me_start ? MANTRA_WE : MANTRA_I);
+      Serial.print(">>> ");
+      Serial.println(metta_from_me_since ? MANTRA_YOU : 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));
+      metta_from_me_since ? (const uint8_t *)MANTRA_YOU : (const uint8_t *)MANTRA_I,
+      metta_from_me_since ? strlen(MANTRA_YOU) : strlen(MANTRA_I));
     next_send = nowmillis + SEND_INTERVAL;
   }
   if (nowmillis > PING_START_MILLIS) {
@@ -245,7 +266,17 @@ void loop() {
   // 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));
+    frame2image((metta_from_me_since && metta_from_you) ? frames[current_frame] : FRAME_ME, is_salam));
+
+  // mybird
+  if (metta_from_me_since) {
+    mybirdSprite.pushToSprite(&background, MYBIRD_X, MYBIRD_Y, TFT_BLACK);
+  }
+
+  if (nearby && frames[current_frame] == FRAME_U) {
+    yourbirdSprite.pushToSprite(&background, YOURBIRD_X, YOURBIRD_Y, TFT_BLACK);
+  }
+
 
   // Scroll overlays
   if (outro_start) { // Outro scroll overlay
@@ -257,8 +288,8 @@ void loop() {
     }
   } 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);
+  } else if (metta_from_me_since && nowmillis < metta_from_me_since + METTA_FREEZE_MILLIS + METTA_SCROLL_MILLIS) {
+    do_scroll(loving, kindness, metta_from_me_since, METTA_FREEZE_MILLIS, METTA_SCROLL_MILLIS, false);
   }
   background.pushSprite(0, 0);