diff --git a/receiverlib/SSCWindow.cpp b/receiverlib/SSCWindow.cpp index 2a6bb73..d4bde8f 100644 --- a/receiverlib/SSCWindow.cpp +++ b/receiverlib/SSCWindow.cpp @@ -26,234 +26,221 @@ extern "C" RVN_FrameReady_fn frameReady; // ---------------- Global Var Used To Print FPS Inside Window // ----------------------------------------------------------------------------- -// onA and offA are magic flags to check whether to draw a specific pixel -// ON white -#define onB 0xFF -#define onR 0xFF -#define onG 0xFF -#define onA 0x01 - -// OFF black -#define offB 0x00 -#define offR 0x00 -#define offG 0x00 -#define offA 0x00 - #define DIGIT_F 10 #define DIGIT_P 11 #define DIGIT_S 12 #define DIGIT_DASH 13 -static dcvBYTE digitArray[14][288] = { +static dcvBYTE digitArray[14][72] = { // digit 0 { - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1 }, // digit 1 { - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1 }, // digit 2 { - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1 }, // digit 3 { - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1 }, // digit 4 { - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1 }, // digit 5 { - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1 }, // digit 6 { - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0 }, // digit 7 { - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1 }, // digit 8 { - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1 }, // digit 9 { - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1 }, // digit F { - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 }, // digit P { - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 0, + 1, 1, 1, 1, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 }, // digit S { - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA + 1, 1, 1, 1, 1, 0, + 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 1, + 0, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, + 0, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 }, // digit - { - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, onB, onR, onG, onA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, - offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA, offB, offR, offG, offA + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 } }; @@ -646,12 +633,13 @@ void SSCWindow::progressFrames(SSCPainter *myPainter, DecompressThread *theDecom } } -void SSCWindow::drawDigit(void * srcptr, void * digit, RVN_Box pic, int xFPS, int yFPS, int position) +void SSCWindow::drawDigit(void * srcptr, dcvBYTE * digit, RVN_Box pic, int xFPS, int yFPS, int position) { const int maxDigits = 7; const int digitHeight = 12; const int digitWidth = 6; const int padding = 3; + const dcvBYTE color[4] = { 0xFF, 0xFF, 0xFF, 0x01 }; // do not try to print the digit if the rect is smaller if (((pic.y2 - pic.y1) < (digitHeight + padding * 2)) || @@ -667,13 +655,12 @@ void SSCWindow::drawDigit(void * srcptr, void * digit, RVN_Box pic, int xFPS, in { for (int j = 0; j < digitWidth; j++) { - void *alphaChannel = (void*) (((char*)digit) + 3) ; - if (onA == *(char*)alphaChannel) + if (digit[(i * digitWidth) + j] == 1) { - memcpy(srcptr, digit, 4); + memcpy(srcptr, color, 4); } + srcptr = (void*) (((int*)srcptr) + 1); - digit = (void*) (((int*)digit) + 1); } srcptr = (void*) (((int*)srcptr) + pic.x2 - digitWidth); diff --git a/receiverlib/SSCWindow.h b/receiverlib/SSCWindow.h index 3bf40fe..4e027e3 100644 --- a/receiverlib/SSCWindow.h +++ b/receiverlib/SSCWindow.h @@ -80,7 +80,7 @@ class SSCWindow void RenderFrame(SSCPainter *myPainter, void* topLeft, int stride, RVN_Region * rgn); void RenderTSRVNFrame(SSCPainter *myPainter, void* topLeft, const unsigned int maxWidth, const unsigned int maxHeight); - void drawDigit(void *srcptr, void *digit, RVN_Box pic, int xFPS, int yFPS, int position); + void drawDigit(void *srcptr, dcvBYTE *digit, RVN_Box pic, int xFPS, int yFPS, int position); void drawFPS(RVN_Box pic, void *srcptr_in); void setLastFrameIndex(unsigned int frameIndex); inline void CopyImgRectIntoRgn( RVN_Region *rgn, dcvIRect *reallyChanged, RVN_Box pic, void *topLeft, int stride, int span, void *srcptr_in);