Different heart colors for yin/yang

blinkinlove-materix.ino

@@ -30,23 +30,24 @@ Adafruit_NeoPixel strip(NEOPIXEL_COUNT, NEOPIXEL_PIN, NEO_GRB + NEO_KHZ800);
 
 #include <PGMWrap.h>
 
-int8_p heart0[8 * 4 * 3] PROGMEM = {
-  0, 0, 0,    16, 0, 0,    64, 0, 0,    0, 0, 0,    116, 0, 0,    16, 0, 0,    0, 0, 0,    0, 0, 0,
-  0, 0, 0,    64, 0, 0,    32, 0, 0,    60, 0, 0,    29, 0, 0,    145, 0, 0,    0, 0, 0,    0, 0, 0,
-  0, 0, 0,    0, 0, 0,    125, 1, 1,    48, 0, 0,    126, 0, 0,    0, 0, 0,    0, 0, 0,    0, 0, 0,
-  0, 0, 0,    0, 0, 0,    0, 0, 0,    134, 0, 0,    0, 0, 0,    0, 0, 0,    0, 0, 0,    0, 0, 0
+int8_p heart0[8 * 4] PROGMEM = {
+  0,   16,   64,     0,   116,    16,   0,   0,
+  0,   64,   32,    64,    32,   144,   0,   0,
+  0,   0,   128,    48,   128,     0,   0,   0,
+  0,   0,     0,   128,     0,     0,   0,   0
 };
 
-int8_p heart1[8 * 4 * 3] PROGMEM = {
-  0, 0, 0,    32, 0, 0,    160, 0, 0,    0, 0, 0,    185, 0, 0,    32, 0, 0,    0, 0, 0,   0, 0, 0,
-  0, 0, 0,    160, 0, 0,    64, 0, 0,    120, 0, 0,    58, 0, 0,    200, 0, 0,    0, 0, 0,    0, 0, 0,
-  0, 0, 0,    0, 0, 0,    190, 1, 1,    96, 0, 0,    190, 0, 0,    0, 0, 0,    0, 0, 0,    0, 0, 0,
-  0, 0, 0,    0, 0, 0,    0, 0, 0,    194, 0, 0,    0, 0, 0,    0, 0, 0,    0, 0, 0,    0, 0, 0
+int8_p heart1[8 * 4] PROGMEM = {
+  0,    32,   160,     0,   160,    32,   0,  0,
+  0,   192,    64,   128,    64,   192,   0,   0,
+  0,     0,   192,    96,   192,     0,   0,   0,
+  0,     0,     0,   192,     0,     0,   0,   0
 };
 
-void drawImage(int8_p *img) {
+void drawImage(int8_p *img, int rscale, int gscale, int bscale) {
   for (int i = 0; i < 8 * 4; i++) {
-    strip.setPixelColor(i, strip.Color(img[i * 3], img[i * 3 + 1], img[i * 3 + 2]));
+    int level = img[i];
+    strip.setPixelColor(i, strip.Color((level * rscale) / 100, (level * gscale) / 100, (level * bscale) / 100));
   }
   strip.show();
 }
@@ -65,10 +66,10 @@ int current_frame = 0;
 unsigned long last_flip = 0;
 
 #define SCAN_FRAME_DURATION 200
-#define SCAN_COMMON_COLOR_YANG strip.Color(16, 32, 64)
-#define SCAN_ANIM_COLOR_YANG strip.Color(16, 32, 128)
-#define SCAN_COMMON_COLOR_YIN strip.Color(64, 32, 16)
-#define SCAN_ANIM_COLOR_YIN strip.Color(128, 32, 16)
+#define SCAN_COMMON_COLOR_YANG strip.Color(16, 0, 64)
+#define SCAN_ANIM_COLOR_YANG strip.Color(16, 0, 128)
+#define SCAN_COMMON_COLOR_YIN strip.Color(64, 0, 16)
+#define SCAN_ANIM_COLOR_YIN strip.Color(128, 0, 16)
 
 #define NUM_SCAN_ANIM_FRAMES 4
 
@@ -172,17 +173,18 @@ void checkScanResult(int numResults) {
 // Show heart animation frame according to rssi)
 // If scanning: indicate that (animation if no rssi, single pixel otherwise)
 void animate(int rssi, bool scanning, unsigned long nowmillis) {
+  int rscale = is_yang ? 50 : 100, gscale = 0, bscale = is_yang ? 100 : 75;
   if (rssi) {
     int duration = constrain(
                      map(rssi, RSSI_NEAR, RSSI_FAR, DURATION_FAST, DURATION_SLOW),
                      DURATION_FAST, DURATION_SLOW);
     if ((nowmillis - last_flip) > duration || nowmillis < last_flip) {
-      drawImage(frames[current_frame]);
+      drawImage(frames[current_frame], rscale, gscale, bscale);
       current_frame = (current_frame + 1) % NUM_FRAMES;
       last_flip = nowmillis;
     }
   } else {
-    drawImage(heart0);
+    drawImage(heart0, rscale, gscale, bscale);
     current_frame = 0;
   }
   if (scanning) {
@@ -212,7 +214,7 @@ void setup()
   digitalWrite(PSEUDO_GND, LOW);
 
   strip.begin();           // INITIALIZE NeoPixel strip object (REQUIRED)
-  strip.setBrightness(16); // (max = 255)
+  strip.setBrightness(32); // (max = 255)
   strip.show();            // Turn OFF all pixels ASAP
 
   for (int offs = -23 ; offs < 25; offs++) {
@@ -246,8 +248,8 @@ void loop()
       Serial.println(is_active);
     }
     if (!is_active) {
-      for (int i = 0; i<NEOPIXEL_COUNT; i++) {
-        strip.setPixelColor(i,strip.Color(0,0,0));
+      for (int i = 0; i < NEOPIXEL_COUNT; i++) {
+        strip.setPixelColor(i, strip.Color(0, 0, 0));
       }
       strip.show();
     }