From db762d992c51712eec02b99e0cc683f25eaf3581 Mon Sep 17 00:00:00 2001 From: KD4Z Date: Wed, 11 Apr 2018 21:34:25 -0400 Subject: [PATCH] Add graphic banners for P25 and NXDN modes --- OLED.cpp | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/OLED.cpp b/OLED.cpp index eeef003..84e2b14 100644 --- a/OLED.cpp +++ b/OLED.cpp @@ -106,6 +106,47 @@ const unsigned char logo_fusion_bmp [] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + //Logo P25 128x16px + const unsigned char logo_P25_bmp [] = + { +0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, +0xf8, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xfc, 0x00, 0x00, 0x3f, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x7f, +0xf8, 0x00, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x7f, +0xf8, 0x00, 0xe0, 0x00, 0x00, 0xff, 0x00, 0x07, 0xc0, 0x00, 0xff, 0xe0, 0x00, 0x00, 0x00, 0xff, +0xf0, 0x01, 0xff, 0xfc, 0x00, 0x7e, 0x00, 0x3f, 0xf8, 0x00, 0xff, 0xe0, 0x0f, 0xff, 0xff, 0xff, +0xf0, 0x01, 0xff, 0xfe, 0x00, 0x7c, 0x00, 0x7f, 0xfc, 0x00, 0x7f, 0xe0, 0x0f, 0xff, 0xff, 0xff, +0xf0, 0x01, 0xff, 0xfe, 0x00, 0x7e, 0x00, 0x7f, 0xf8, 0x00, 0xff, 0xe0, 0x00, 0x00, 0x01, 0xff, +0xf0, 0x01, 0xff, 0xc0, 0x00, 0xff, 0xff, 0xff, 0xe0, 0x01, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x1f, +0xf0, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0x00, 0x07, 0xff, 0xff, 0x9f, 0xff, 0x80, 0x07, +0xf0, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xf8, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x03, +0xf0, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x03, +0xf0, 0x01, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x1f, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xc0, 0x03, +0xf0, 0x01, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x7f, 0xff, 0xfe, 0x00, 0x0f, 0xfe, 0x00, 0x0f, +0xf0, 0x01, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x80, 0x00, 0x00, 0x00, 0x3f, +0xf0, 0x01, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf8, 0x00, 0x00, 0x03, 0xff, +0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff + }; + + //Logo NXDN 128x16px +const unsigned char logo_NXDN_bmp [] = + { +0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, +0xe0, 0x3f, 0xfe, 0x03, 0xc0, 0x3f, 0xfc, 0x07, 0xe0, 0x00, 0x0f, 0xff, 0xe0, 0x1f, 0xfe, 0x03, +0xe0, 0x0f, 0xfe, 0x03, 0xf0, 0x1f, 0xf0, 0x0f, 0xc0, 0x00, 0x00, 0x7f, 0xe0, 0x0f, 0xfe, 0x03, +0xe0, 0x07, 0xfe, 0x03, 0xf8, 0x07, 0xe0, 0x1f, 0xc0, 0x00, 0x00, 0x1f, 0xe0, 0x07, 0xfe, 0x03, +0xe0, 0x03, 0xfe, 0x03, 0xfe, 0x03, 0xc0, 0x7f, 0xc0, 0x7f, 0xf8, 0x07, 0xe0, 0x01, 0xfe, 0x03, +0xe0, 0x00, 0xfe, 0x03, 0xff, 0x01, 0x00, 0xff, 0xc0, 0x7f, 0xfc, 0x07, 0xe0, 0x00, 0xfe, 0x03, +0xe0, 0x20, 0x7e, 0x03, 0xff, 0x80, 0x03, 0xff, 0xc0, 0x7f, 0xfe, 0x03, 0xe0, 0x20, 0x7e, 0x03, +0xe0, 0x30, 0x3e, 0x03, 0xff, 0xe0, 0x07, 0xff, 0xc0, 0x7f, 0xfe, 0x03, 0xe0, 0x30, 0x1e, 0x03, +0xe0, 0x3c, 0x0e, 0x03, 0xff, 0xe0, 0x0f, 0xff, 0xc0, 0x7f, 0xfe, 0x03, 0xe0, 0x3c, 0x0e, 0x03, +0xe0, 0x3e, 0x06, 0x03, 0xff, 0xc0, 0x03, 0xff, 0xc0, 0x7f, 0xfe, 0x03, 0xe0, 0x3e, 0x06, 0x03, +0xe0, 0x3f, 0x02, 0x03, 0xff, 0x00, 0x01, 0xff, 0xc0, 0x7f, 0xfc, 0x07, 0xe0, 0x3f, 0x00, 0x03, +0xe0, 0x3f, 0xc0, 0x03, 0xfe, 0x01, 0x80, 0x7f, 0xc0, 0x7f, 0xf8, 0x07, 0xe0, 0x3f, 0xc0, 0x03, +0xe0, 0x3f, 0xe0, 0x03, 0xfc, 0x07, 0xc0, 0x3f, 0xc0, 0x7f, 0xe0, 0x0f, 0xe0, 0x3f, 0xe0, 0x03, +0xe0, 0x3f, 0xf0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f, 0xc0, 0x00, 0x00, 0x3f, 0xe0, 0x3f, 0xf8, 0x03, +0xe0, 0x3f, 0xfc, 0x03, 0xe0, 0x3f, 0xf8, 0x07, 0xc0, 0x00, 0x00, 0xff, 0xe0, 0x3f, 0xfc, 0x03, +0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +}; COLED::COLED(unsigned char displayType, unsigned char displayBrightness, bool displayInvert, bool displayScroll, bool slot1Enabled, bool slot2Enabled) : m_displayType(displayType), @@ -479,9 +520,9 @@ void COLED::OLED_statusbar() else if (m_mode == MODE_YSF) display.drawBitmap(0, 0, logo_fusion_bmp, 128, 16, WHITE); else if (m_mode == MODE_P25) - display.print("P25"); + display.drawBitmap(0, 0, logo_P25_bmp, 128, 16, WHITE); else if (m_mode == MODE_NXDN) - display.print("NXDN"); + display.drawBitmap(0, 0, logo_NXDN_bmp, 128, 16, WHITE); else display.drawBitmap(0, 0, logo_glcd_bmp, 128, 16, WHITE);