From 926065e3a1008e2640caf08f2cd72ffe63725b42 Mon Sep 17 00:00:00 2001 From: olliw42 Date: Sun, 16 May 2021 23:33:58 +0200 Subject: [PATCH 1/2] add a gps icon if internal gps (and mavtelem) --- radio/src/bitmaps/480x272/mask_topmenu_gps_18.png | Bin 0 -> 781 bytes radio/src/gui/colorlcd/bitmaps.cpp | 4 ++++ radio/src/gui/colorlcd/bitmaps.h | 1 + radio/src/gui/colorlcd/layouts/topbar_impl.cpp | 12 ++++++++++++ 4 files changed, 17 insertions(+) create mode 100644 radio/src/bitmaps/480x272/mask_topmenu_gps_18.png diff --git a/radio/src/bitmaps/480x272/mask_topmenu_gps_18.png b/radio/src/bitmaps/480x272/mask_topmenu_gps_18.png new file mode 100644 index 0000000000000000000000000000000000000000..8e3ee9cfb8f4193f918835bf9d143cf336d940d2 GIT binary patch literal 781 zcmV+o1M>WdP)rfEJ=g1+pbfK$0K-XP%Bl;G)?Mg7vr7l`1iG2Y@s^Fri+3BiFK|zEr zEN)6)K<(yo@ffcsHvgM5a~C&}+@kk7kT6UpU(PrA4bWUDrEq(D`@Prec|?SW_~-VY zfGj~ojN>?2UtbRaz%P|b-tqCVn?9p&31wfb*XthV+;tphdU|?l0{|Wz98A*|{LYDR zYir8^favk@(amayhlheO7Mz`(1^Jggv-@G~?(WV50N*f-=bRn9xVVs-rbX>``=wT^ z`KD<~B2x1Q{L9+y?X3#{Xc)$itU(A7S1Oel04Te5cXyqC4x5PZ^77IJfUwnSNg+hg zY&PwMg@q(9RIAmzFNN|k9*;fFc~~eEkTIt6A^I0%`?lgd|lVWZnyi+IS*T{mdvAZa&q!oDwVumujhkhSx&WD^@)f&osPe>wB!;| zl3za}!tr?Q0YI2XLrVDu0MnhFohjJ1tu#&Z`~AL*qG-0VvJx*ZFS~=mAP_<%>CA|T zC`AJe!+3spcyIu~+1S_!l~M?)UzahaZf*^Cx3W_4|F9&FKFAUXDg1IR`BbheJ=-b(yb0F2|#zBX4nW(XUpk z{@&hRbaizVKRrG9a|?@~1E$UV3KiP00000 LNkvXXu0mjfcFSpq literal 0 HcmV?d00001 diff --git a/radio/src/gui/colorlcd/bitmaps.cpp b/radio/src/gui/colorlcd/bitmaps.cpp index a66602f93..c079a4225 100644 --- a/radio/src/gui/colorlcd/bitmaps.cpp +++ b/radio/src/gui/colorlcd/bitmaps.cpp @@ -32,6 +32,10 @@ const uint8_t LBM_DOT[] = { * Main view bitmaps */ +const uint8_t LBM_TOPMENU_GPS[] = { +#include "mask_topmenu_gps_18.lbm" +}; + const uint8_t LBM_TOPMENU_USB[] = { #include "mask_topmenu_usb.lbm" }; diff --git a/radio/src/gui/colorlcd/bitmaps.h b/radio/src/gui/colorlcd/bitmaps.h index 7c163867c..3c6512153 100644 --- a/radio/src/gui/colorlcd/bitmaps.h +++ b/radio/src/gui/colorlcd/bitmaps.h @@ -25,6 +25,7 @@ extern const uint8_t LBM_DOT[]; // Main view icons +extern const uint8_t LBM_TOPMENU_GPS[]; extern const uint8_t LBM_TOPMENU_USB[]; extern const uint8_t LBM_TOPMENU_ANTENNA[]; extern const uint8_t LBM_TOPMENU_VOLUME_0[]; diff --git a/radio/src/gui/colorlcd/layouts/topbar_impl.cpp b/radio/src/gui/colorlcd/layouts/topbar_impl.cpp index 70cbd56dc..4e12fe4ba 100644 --- a/radio/src/gui/colorlcd/layouts/topbar_impl.cpp +++ b/radio/src/gui/colorlcd/layouts/topbar_impl.cpp @@ -32,6 +32,9 @@ TopbarImpl::TopbarImpl(Window * parent) : unsigned int TopbarImpl::getZonesCount() const { +#if defined(TELEMETRY_MAVLINK) && defined(INTERNAL_GPS) + return MAX_TOPBAR_ZONES-1; +#endif return MAX_TOPBAR_ZONES; } @@ -88,6 +91,15 @@ void TopbarImpl::paint(BitmapBuffer * dc) getTimerString(str, getValue(MIXSRC_TX_TIME)); dc->drawText(DATETIME_MIDDLE, DATETIME_LINE2, str, FONT(XS) | CENTERED | MENU_COLOR); +#if defined(TELEMETRY_MAVLINK) && defined(INTERNAL_GPS) + if (gpsData.fix) { + char s[10]; + sprintf(s, "%d", gpsData.numSat); + dc->drawText(LCD_W-148, 4, s, FONT(XS) | CENTERED | MENU_COLOR); + } + dc->drawBitmapPattern(LCD_W-158, 22, LBM_TOPMENU_GPS, (gpsData.fix) ? MENU_COLOR : MENU_TITLE_DISABLE_COLOR); +#endif + // USB icon if (usbPlugged()) { dc->drawBitmapPattern(LCD_W - 98, 8, LBM_TOPMENU_USB, MENU_COLOR); From 5b4943e8764b8cd4671f8bd049dd9c68e1b5b403 Mon Sep 17 00:00:00 2001 From: olliw42 Date: Wed, 19 May 2021 19:13:10 +0200 Subject: [PATCH 2/2] it's for all users of gps --- radio/src/gui/colorlcd/layouts/topbar_impl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/colorlcd/layouts/topbar_impl.cpp b/radio/src/gui/colorlcd/layouts/topbar_impl.cpp index 4e12fe4ba..3fe2ce672 100644 --- a/radio/src/gui/colorlcd/layouts/topbar_impl.cpp +++ b/radio/src/gui/colorlcd/layouts/topbar_impl.cpp @@ -32,7 +32,7 @@ TopbarImpl::TopbarImpl(Window * parent) : unsigned int TopbarImpl::getZonesCount() const { -#if defined(TELEMETRY_MAVLINK) && defined(INTERNAL_GPS) +#if defined(INTERNAL_GPS) return MAX_TOPBAR_ZONES-1; #endif return MAX_TOPBAR_ZONES; @@ -91,7 +91,7 @@ void TopbarImpl::paint(BitmapBuffer * dc) getTimerString(str, getValue(MIXSRC_TX_TIME)); dc->drawText(DATETIME_MIDDLE, DATETIME_LINE2, str, FONT(XS) | CENTERED | MENU_COLOR); -#if defined(TELEMETRY_MAVLINK) && defined(INTERNAL_GPS) +#if defined(INTERNAL_GPS) if (gpsData.fix) { char s[10]; sprintf(s, "%d", gpsData.numSat);