diff --git a/src/squared.c b/src/squared.c index 0daff60..d8ba230 100644 --- a/src/squared.c +++ b/src/squared.c @@ -20,7 +20,7 @@ Window window; #define DIGIT_CHANGE_ANIM_DURATION 1700 #define STARTDELAY 2000 -#define FONT blocks +#define FONT blocks // blocks or clean. clean == numbers with no ornaments typedef struct { Layer layer; @@ -37,77 +37,150 @@ Animation anim; bool splashEnded = false; unsigned char blocks[][5][5] = {{ - {1,1,1,1,1}, - {1,0,0,0,1}, - {1,0,1,0,1}, - {1,0,0,0,1}, - {1,1,1,1,1} + {1,1,1,1,1}, + {1,0,0,0,1}, + {1,0,1,0,1}, + {1,0,0,0,1}, + {1,1,1,1,1} }, { - {1,1,0,1,1}, - {0,0,0,0,1}, - {1,1,1,0,1}, - {0,0,0,0,1}, - {1,1,1,0,1} + {1,1,0,1,1}, + {0,0,0,0,1}, + {1,1,1,0,1}, + {0,0,0,0,1}, + {1,1,1,0,1} }, { - {1,1,1,1,1}, - {0,0,0,0,1}, - {1,1,1,1,1}, - {1,0,0,0,0}, - {1,1,1,1,1} + {1,1,1,1,1}, + {0,0,0,0,1}, + {1,1,1,1,1}, + {1,0,0,0,0}, + {1,1,1,1,1} }, { - {1,1,1,1,1}, - {0,0,0,0,1}, - {0,1,1,1,1}, - {0,0,0,0,1}, - {1,1,1,1,1} + {1,1,1,1,1}, + {0,0,0,0,1}, + {0,1,1,1,1}, + {0,0,0,0,1}, + {1,1,1,1,1} }, { - {1,0,1,0,1}, - {1,0,0,0,1}, - {1,1,1,1,1}, - {0,0,0,0,1}, - {1,1,1,0,1} + {1,0,1,0,1}, + {1,0,0,0,1}, + {1,1,1,1,1}, + {0,0,0,0,1}, + {1,1,1,0,1} }, { - {1,1,1,1,1}, - {1,0,0,0,0}, - {1,1,1,1,1}, - {0,0,0,0,1}, - {1,1,1,1,1} + {1,1,1,1,1}, + {1,0,0,0,0}, + {1,1,1,1,1}, + {0,0,0,0,1}, + {1,1,1,1,1} }, { - {1,1,1,1,1}, - {1,0,0,0,0}, - {1,1,1,1,1}, - {1,0,0,0,1}, - {1,1,1,1,1} + {1,1,1,1,1}, + {1,0,0,0,0}, + {1,1,1,1,1}, + {1,0,0,0,1}, + {1,1,1,1,1} }, { - {1,1,1,1,1}, - {0,0,0,0,1}, - {1,0,1,0,1}, - {1,0,1,0,1}, - {1,0,1,0,1} + {1,1,1,1,1}, + {0,0,0,0,1}, + {1,0,1,0,1}, + {1,0,1,0,1}, + {1,0,1,0,1} }, { - {1,1,1,1,1}, - {1,0,0,0,1}, - {1,1,1,1,1}, - {1,0,0,0,1}, - {1,1,1,1,1} + {1,1,1,1,1}, + {1,0,0,0,1}, + {1,1,1,1,1}, + {1,0,0,0,1}, + {1,1,1,1,1} }, { - {1,1,1,1,1}, - {1,0,0,0,1}, - {1,1,1,1,1}, - {0,0,0,0,1}, - {1,1,1,1,1} + {1,1,1,1,1}, + {1,0,0,0,1}, + {1,1,1,1,1}, + {0,0,0,0,1}, + {1,1,1,1,1} }, { - {1,1,1,1,1}, - {0,0,0,0,0}, - {1,1,1,1,1}, - {0,0,0,0,0}, - {1,1,1,1,1} + {1,1,1,1,1}, + {0,0,0,0,0}, + {1,1,1,1,1}, + {0,0,0,0,0}, + {1,1,1,1,1} }, { - {1,0,1,0,1}, - {1,0,1,0,1}, - {1,0,1,0,1}, - {1,0,1,0,1}, - {1,0,1,0,1} + {1,0,1,0,1}, + {1,0,1,0,1}, + {1,0,1,0,1}, + {1,0,1,0,1}, + {1,0,1,0,1} +}}; +unsigned char clean[][5][5] = {{ + {1,1,1,1,1}, + {1,0,0,0,1}, + {1,0,0,0,1}, + {1,0,0,0,1}, + {1,1,1,1,1} +}, { + {0,0,0,1,1}, + {0,0,0,0,1}, + {0,0,0,0,1}, + {0,0,0,0,1}, + {0,0,0,0,1} +}, { + {1,1,1,1,1}, + {0,0,0,0,1}, + {1,1,1,1,1}, + {1,0,0,0,0}, + {1,1,1,1,1} +}, { + {1,1,1,1,1}, + {0,0,0,0,1}, + {0,1,1,1,1}, + {0,0,0,0,1}, + {1,1,1,1,1} +}, { + {1,0,0,0,1}, + {1,0,0,0,1}, + {1,1,1,1,1}, + {0,0,0,0,1}, + {0,0,0,0,1} +}, { + {1,1,1,1,1}, + {1,0,0,0,0}, + {1,1,1,1,1}, + {0,0,0,0,1}, + {1,1,1,1,1} +}, { + {1,1,1,1,1}, + {1,0,0,0,0}, + {1,1,1,1,1}, + {1,0,0,0,1}, + {1,1,1,1,1} +}, { + {1,1,1,1,1}, + {0,0,0,0,1}, + {0,0,0,0,1}, + {0,0,0,0,1}, + {0,0,0,0,1} +}, { + {1,1,1,1,1}, + {1,0,0,0,1}, + {1,1,1,1,1}, + {1,0,0,0,1}, + {1,1,1,1,1} +}, { + {1,1,1,1,1}, + {1,0,0,0,1}, + {1,1,1,1,1}, + {0,0,0,0,1}, + {1,1,1,1,1} +}, { + {1,1,1,1,1}, + {1,1,1,1,1}, + {1,1,1,1,1}, + {1,1,1,1,1}, + {1,1,1,1,1} +}, { + {1,1,1,1,1}, + {1,1,1,1,1}, + {1,1,1,1,1}, + {1,1,1,1,1}, + {1,1,1,1,1} }}; int startDigit[NUMSLOTS] = {