Added more user-callible eye functions.

Added additional eye functions (close, wide), to replace boop and blink functions on the Wiichuck button functions for better eye puppetry. Other minor style and debugging changes.

Author: darkgrue

M4_Eyes/M4_Eyes.ino

@@ -59,6 +59,7 @@ int      iPupilFactor            = 42;
 uint32_t boopSum                 = 0,
          boopSumFiltered         = 0;
 bool     booped                  = false;
+bool     eyelidsClosed           = false;
 bool     eyelidsWide             = false;
 int      fixate                  = 7;
 uint8_t  lightSensorFailCount    = 0;
@@ -136,24 +137,36 @@ uint32_t availableRAM(void) {
 
 // USER CALLABLE FUNCTIONS
 
+// Start a blink.
+void eyesBlink() {
+  Serial.println("eyesBlink()");
+  timeToNextBlink = 0;
+}
+
 // Force the booped flag to be set true.
 void eyesBoop() {
   Serial.println("eyesBoop()");
   boopSum = 99999;
 }
 
+// Close eyelids.
+void eyesClose() {
+  Serial.println("eyesClose()");
+  eyelidsClosed = true;
+}
+
+// Return the eyes to normal random movement.
+void eyesNormal() {
+//  Serial.println("eyesNormal()");
+  moveEyesRandomly = true;
+}
+
 // Open eyelids wide.
 void eyesWide() {
   Serial.println("eyesWide()");
   eyelidsWide = true;
 }
 
-// Start a blink.
-void eyesBlink() {
-  Serial.println("eyesBlink()");
-  timeToNextBlink = 0;
-}
-
 // Force the eyes to a position on the screen.
 void eyesToCorner(float x, float y, bool immediate) {
   moveEyesRandomly = false;
@@ -163,12 +176,6 @@ void eyesToCorner(float x, float y, bool immediate) {
     eyeMoveDuration = 0;
 }
 
-// Return the eyes to normal random movement.
-void eyesNormal() {
-//  Serial.println("eyesNormal()");
-  moveEyesRandomly = true;
-}
-
 
 // SETUP FUNCTION - CALLED ONCE AT PROGRAM START ---------------------------
 
@@ -594,24 +601,31 @@ void loop() {
             iy = (int)map2screen(mapRadius - eye[eyeNum].eyeY) + (DISPLAY_SIZE/2); // on screen
         iy += irisRadius * trackFactor;
         if(eyeNum & 1) ix = DISPLAY_SIZE - 1 - ix; // Flip for right eye
-        if(iy > upperOpen[ix]) {
+        if(eyelidsWide) {
           uq = 1.0;
-        } else if(iy < upperClosed[ix]) {
-          uq = 0.0;
-        } else {
-          uq = (float)(iy - upperClosed[ix]) / (float)(upperOpen[ix] - upperClosed[ix]);
-        }
-        if(booped || eyelidsWide) {
+          lq = 1.0;
+        } else if(booped) {
           uq = 0.9;
           lq = 0.7;
         } else {
+          if(iy > upperOpen[ix]) {
+            uq = 1.0;
+          } else if(iy < upperClosed[ix]) {
+            uq = 0.0;
+          } else {
+            uq = (float)(iy - upperClosed[ix]) / (float)(upperOpen[ix] - upperClosed[ix]);
+          }
           lq = 1.0 - uq;
         }
       } else {
         // If no tracking, eye is FULLY OPEN when not blinking
         uq = 1.0;
         lq = 1.0;
       }
+      if(eyelidsClosed) {
+        uq = 0.0;
+        lq = 0.0;
+      }      
       // Dampen eyelid movements slightly
       // SAVE upper & lower lid factors per eye,
       // they need to stay consistent across frame
@@ -661,8 +675,9 @@ void loop() {
         boopSum = 0;
       }
 
-      // Once per frame (of eye #1), reset eyelidsWide...
-      if((eyeNum == 1) && (eyelidsWide)) {
+      // Once per frame (of eye #1), reset eyelid states...
+      if(eyeNum == 1) {
+        eyelidsClosed = false;
         eyelidsWide = false;
       }
 

M4_Eyes/globals.h

@@ -243,8 +243,9 @@ extern void            user_setup(StaticJsonDocument<2048> &doc);
 extern void            user_loop(void);
 
 // User callable functions in M4_Eyes.ino
+extern void eyesBlink();
 extern void eyesBoop();
+extern void eyesClose();
+extern void eyesNormal();
 extern void eyesWide();
-extern void eyesBlink();
 extern void eyesToCorner(float x, float y, bool immediate);
-extern void eyesNormal();

M4_Eyes/user.cpp

@@ -1,4 +1,4 @@
-#if 1 // Change to 0 to disable this code (must enable ONE user*.cpp only!)
+#if 0 // Change to 0 to disable this code (must enable ONE user*.cpp only!)
 
 // This file provides a crude way to "drop in" user code to the eyes,
 // allowing concurrent operations without having to maintain a bunch of

M4_Eyes/user_wiichuck.cpp

@@ -1,4 +1,4 @@
-#if 0 // Change to 0 to disable this code (must enable ONE user*.cpp only!)
+#if 1 // Change to 0 to disable this code (must enable ONE user*.cpp only!)
 
 // This user loop is designed to be used with a WiiChuck for command inputs and 
 // connects to a NeoPixel strip for additional output. It was used with a unicorn 
@@ -183,12 +183,12 @@ void user_loop(void) {
   int cornerX = (joyX - low) / divFactor;
   int cornerY = (joyY - low) / divFactor;
   int chaseColor = 0;
-  // Serial.println("cornerXY=" + String(cornerX) + "," + String(cornerY));
+//  Serial.println("cornerXY=" + String(cornerX) + "," + String(cornerY));
   if(cornerX == 1 && cornerY == 1) { // return to normal when the joystick is in the middle
     eyesNormal();
     neoPixelState = LUMINESCENT;
   } else {
-    // Serial.println("eyesToCorner(" + String(x) + "," + String(-y) + ")");
+//    Serial.println("eyesToCorner(" + String(x) + "," + String(-y) + ")");
     eyesToCorner(x, -y, true);
     if(cornerX < 1) {
       chaseColor = green;
@@ -220,7 +220,7 @@ void user_loop(void) {
       neoPixelState = SPARKLE;
     } else if(buttonZ) {
       Serial.println("buttonZ");
-      eyesBlink();
+      eyesClose();
     }
   }