Merge pull request adafruit#1265 from adafruit/pb-moon-clock

Matrix Eyes: fix initial position bug, add Adabot eyes

Author: PaintYourDragon

Matrix_Portal_Eyes/code.py

@@ -15,6 +15,7 @@
 from eyes.werewolf.data import EYE_DATA
 #from eyes.cyclops.data import EYE_DATA
 #from eyes.kobold.data import EYE_DATA
+#from eyes.adabot.data import EYE_DATA
 
 # UTILITY FUNCTIONS AND CLASSES --------------------------------------------
 
@@ -89,8 +90,8 @@ def __init__(self, filename, transparent=None):
                      EYE_DATA['lower_lid_closed'][0]),
                  max(EYE_DATA['lower_lid_open'][1],
                      EYE_DATA['lower_lid_closed'][1]))
-EYE_PREV = EYE_CENTER
-EYE_NEXT = EYE_CENTER
+EYE_PREV = (0, 0)
+EYE_NEXT = (0, 0)
 MOVE_STATE = False                                     # Initially stationary
 MOVE_EVENT_DURATION = random.uniform(0.1, 3)           # Time to first move
 BLINK_STATE = 2                                        # Start eyes closed

Matrix_Portal_Eyes/eyes/adabot/adabot-eyes.bmp

@@ -0,0 +1,17 @@
+""" Configuration data for the Adabot eyes """
+EYE_PATH = __file__[:__file__.rfind('/') + 1]
+EYE_DATA = {
+    'eye_image'        : EYE_PATH + 'adabot-eyes.bmp',
+    'upper_lid_image'  : EYE_PATH + 'adabot-upper-lids.bmp',
+    'lower_lid_image'  : EYE_PATH + 'adabot-lower-lids.bmp',
+    'stencil_image'    : EYE_PATH + 'adabot-stencil.bmp',
+    'transparent'      : (255, 0, 0), # Transparent color in above images
+    'eye_move_min'     : (5, -1),     # eye_image (left, top) move limit
+    'eye_move_max'     : (13, 7),     # eye_image (right, bottom) move limit
+    'upper_lid_open'   : (13, -5),    # upper_lid_image pos when open
+    'upper_lid_center' : (13, -5),    # " when eye centered
+    'upper_lid_closed' : (13, 7),     # " when closed
+    'lower_lid_open'   : (13, 22),    # lower_lid_image pos when open
+    'lower_lid_center' : (13, 22),    # " when eye centered
+    'lower_lid_closed' : (13, 15),    # " when closed
+}