Boost screen refresh, some changes to pupil tracking

Author: PaintYourDragon

M4_Eyes/M4_Eyes.ino

@@ -162,11 +162,12 @@ void setup() {
   delay(20);
 #endif
 
-  uint8_t e;
+  uint8_t e, rtna = 0x01; // Screen refresh rate control (datasheet 9.2.18, FRCTRL2)
   // Initialize displays
   for(e=0; e<NUM_EYES; e++) {
     eye[e].display = new Adafruit_ST7789(eye[e].spi, eye[e].cs, eye[e].dc, eye[e].rst);
     eye[e].display->init(240, 240);
+    eye[e].display->sendCommand(0xC6, &rtna, 1);
     eye[e].spi->setClockSource(DISPLAY_CLKSRC);
     eye[e].display->fillScreen(0x1234);
     eye[e].display->setRotation(0);
@@ -510,24 +511,30 @@ void loop() {
         timeToNextBlink = blinkDuration * 3 + random(4000000);
       }
 
-      // Eyelids naturally "track" the pupils (move up or down automatically)
-      int ix = (int)map2screen(mapRadius - eye[eyeNum].eyeX) + 120, // Pupil position
-          iy = (int)map2screen(mapRadius - eye[eyeNum].eyeY) + 120; // on screen
-      iy += irisRadius / 2; // top edge of iris (ish) in screen pixels
       float uq, lq; // So many sloppy temp vars in here for now, sorry
-      if(eyeNum & 1) ix = 239 - ix; // Flip for right eye
-      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]);
-      }
-      if(booped) {
-        uq = 0.9;
-        lq = 0.7;
+      if(tracking) {
+        // Eyelids naturally "track" the pupils (move up or down automatically)
+        int ix = (int)map2screen(mapRadius - eye[eyeNum].eyeX) + 120, // Pupil position
+            iy = (int)map2screen(mapRadius - eye[eyeNum].eyeY) + 120; // on screen
+        iy += irisRadius * trackFactor;
+        if(eyeNum & 1) ix = 239 - ix; // Flip for right eye
+        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]);
+        }
+        if(booped) {
+          uq = 0.9;
+          lq = 0.7;
+        } else {
+          lq = 1.0 - uq;
+        }
       } else {
-        lq = 1.0 - uq;
+        // If no tracking, eye is FULLY OPEN when not blinking
+        uq = 1.0;
+        lq = 1.0;
       }
       // Dampen eyelid movements slightly
       // SAVE upper & lower lid factors per eye,

M4_Eyes/file.cpp

@@ -266,6 +266,15 @@ void loadConfig(char *filename) {
       JsonVariant iristv       = doc["irisTexture"],
                   scleratv     = doc["scleraTexture"];
 
+      v = doc["tracking"];
+      if(v.is<bool>()) tracking = v.as<bool>();
+      v = doc["squint"];
+      if(v.is<float>()) {
+        trackFactor = 1.0 - v.as<float>();
+        if(trackFactor < 0.0)      trackFactor = 0.0;
+        else if(trackFactor > 1.0) trackFactor = 1.0;
+      }
+
       // Convert clockwise int (0-1023) or float (0.0-1.0) values to CCW int used internally:
       v = doc["irisSpin"];
       if(v.is<float>()) irisSpin   = v.as<float>() * -1024.0;

M4_Eyes/globals.h

@@ -69,6 +69,8 @@ GLOBAL_VAR uint16_t  lightSensorMax      GLOBAL_INIT(1023);
 GLOBAL_VAR float     lightSensorCurve    GLOBAL_INIT(1.0);
 GLOBAL_VAR float     irisMin             GLOBAL_INIT(0.45);
 GLOBAL_VAR float     irisRange           GLOBAL_INIT(0.35);
+GLOBAL_VAR bool      tracking            GLOBAL_INIT(true);
+GLOBAL_VAR float     trackFactor         GLOBAL_INIT(0.5);
 
 // Pin definition stuff will go here