DK1DA/FreeTRX
1
0
Fork 0
Code Issues Pull requests Projects Releases 13 Packages Wiki Activity Actions

Revert main-menu icons: plain-text entries again

Browse source 
Remove the 16x16 main-menu icon bitmaps, menuIconForMenuNumber(),
menuSetNextEntryIconByMenuNum() and the icon drawing + text offset in
menuDisplayEntry(). Top-level menu entries render as plain text as before.
Docs updated.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Marcus Kida 2026-07-13 12:04:56 +02:00
parent ff1559ec5e
commit 8dcda476aa
6 changed files with 1 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -7,7 +7,7 @@ single running list until the first versioned release.
## Unreleased
_Nothing yet._
- **Removed the main-menu icons** — the top-level menu entries are plain text again.
## 0.6.0

3
MANUAL.md
View file

@ -70,9 +70,6 @@ Pick a colour theme on the radio at **Menu → Options → Display Options → "
Editing colours in the CPS only affects **Custom**; the two built-in presets are
fixed. Every element (S-meter, frequencies, menus) follows the selected theme.
### Main-menu icons — 🟢 [FreeTRX]
Each top-level menu entry has a small icon next to it.
### Mute indicator — 🟢 [FreeTRX]
While muted, a bold **"M"** appears in the status bar (just left of the battery)
and the **red LED flashes** (0.5 s every 2 s). See *Mute* below.

3
MDUV380_firmware/application/include/user_interface/menuSystem.h
View file

@ -172,9 +172,6 @@ typedef struct
void menuDisplayTitle(const char *title);
void menuDisplayEntry(int loopOffset, int focusedItem, const char *entryText, int32_t optStart, themeItem_t fgItem, themeItem_t fgOptItem, themeItem_t bgItem);
#if defined(HAS_COLOURS)
void menuSetNextEntryIconByMenuNum(int menuNum); // sets the icon the next menuDisplayEntry() will draw (0/none for menus without an icon)
#endif
// menuGetMenuOffset() return values
#define MENU_OFFSET_BEFORE_FIRST_ENTRY -1

3
MDUV380_firmware/application/source/user_interface/menuDisplayMenuList.c
View file

@ -121,9 +121,6 @@ static void updateScreen(bool isFirstRun)
if (menuDataGlobal.currentMenuList[mNum].stringOffset >= 0)
{
const char *menuName = (currentLanguage->LANGUAGE_NAME + (menuDataGlobal.currentMenuList[mNum].stringOffset * LANGUAGE_TEXTS_LENGTH));
#if defined(HAS_COLOURS)
menuSetNextEntryIconByMenuNum(menuDataGlobal.currentMenuList[mNum].menuNum);
#endif
menuDisplayEntry(i, mNum, menuName, 0, THEME_ITEM_FG_MENU_ITEM, THEME_ITEM_COLOUR_NONE, THEME_ITEM_BG);
if (i == 0)

51
MDUV380_firmware/application/source/user_interface/menuSystem.c
View file

@ -725,53 +725,11 @@ void menuDisplayTitle(const char *title)
// optStart:
// - if less than 0, entryText will use fgOptItem colour
// - if equal to 0, no coloured option will be handled
#if defined(HAS_COLOURS)
// 16x16 1-bit main-menu icons (row-major, MSB-first) for displayDrawBitmap.
static const uint8_t menuIcon_zone[32] = { 0x00, 0x00, 0x3F, 0xFC, 0x20, 0x04, 0x2F, 0xF4, 0x20, 0x04, 0x2F, 0xF4, 0x20, 0x04, 0x2F, 0xF4, 0x20, 0x04, 0x2F, 0xF4, 0x20, 0x04, 0x3F, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
static const uint8_t menuIcon_contacts[32] = { 0x00, 0x00, 0x03, 0xC0, 0x07, 0xE0, 0x05, 0xA0, 0x07, 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x0F, 0xF0, 0x1F, 0xF8, 0x3F, 0xFC, 0x30, 0x0C, 0x30, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
static const uint8_t menuIcon_channel[32] = { 0x00, 0x00, 0x00, 0x00, 0x21, 0x08, 0x21, 0x08, 0x71, 0x1C, 0x51, 0x14, 0x73, 0x9C, 0x22, 0x88, 0x23, 0x88, 0x21, 0x08, 0x21, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
static const uint8_t menuIcon_rssi[32] = { 0x00, 0x00, 0x00, 0x06, 0x00, 0x06, 0x00, 0x66, 0x00, 0x66, 0x00, 0x66, 0x06, 0x66, 0x06, 0x66, 0x06, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
static const uint8_t menuIcon_info[32] = { 0x00, 0x00, 0x07, 0xE0, 0x18, 0x18, 0x21, 0x84, 0x21, 0x84, 0x40, 0x08, 0x43, 0xC2, 0x40, 0xC2, 0x40, 0xC2, 0x40, 0xC2, 0x21, 0xE2, 0x20, 0x04, 0x18, 0x18, 0x07, 0xE0, 0x00, 0x00, 0x00, 0x00 };
static const uint8_t menuIcon_options[32] = { 0x00, 0x00, 0x03, 0xC0, 0x13, 0xC8, 0x1B, 0xD8, 0x3F, 0xFC, 0x38, 0x1C, 0x7B, 0xDE, 0x7B, 0xDE, 0x7B, 0xDE, 0x38, 0x1C, 0x3F, 0xFC, 0x1B, 0xD8, 0x13, 0xC8, 0x03, 0xC0, 0x00, 0x00, 0x00, 0x00 };
static const uint8_t menuIcon_lastheard[32] = { 0x00, 0x00, 0x3F, 0xF8, 0x40, 0x04, 0x4C, 0x62, 0x40, 0x04, 0x4C, 0x62, 0x40, 0x04, 0x4C, 0x62, 0x40, 0x04, 0x3C, 0x7C, 0x04, 0x40, 0x02, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
static const uint8_t menuIcon_radio[32] = { 0x00, 0x10, 0x00, 0x20, 0x00, 0x40, 0x1F, 0xC0, 0x10, 0x40, 0x17, 0x40, 0x17, 0x40, 0x10, 0x40, 0x15, 0x40, 0x15, 0x40, 0x15, 0x40, 0x10, 0x40, 0x1F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
static const uint8_t menuIcon_satellite[32] = { 0x00, 0x00, 0x30, 0x00, 0x28, 0x10, 0x24, 0x28, 0x02, 0x44, 0x01, 0x94, 0x00, 0xA4, 0x01, 0x38, 0x02, 0x00, 0x0D, 0x00, 0x11, 0x00, 0x11, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
static const uint8_t menuIcon_gps[32] = { 0x00, 0x00, 0x07, 0xE0, 0x18, 0x18, 0x20, 0x04, 0x43, 0xC2, 0x44, 0x22, 0x44, 0x22, 0x44, 0x22, 0x43, 0xC2, 0x20, 0x04, 0x10, 0x08, 0x08, 0x10, 0x04, 0x20, 0x02, 0x40, 0x01, 0x80, 0x00, 0x00 };
static const uint8_t *menuIconForMenuNumber(int menuNum)
{
switch (menuNum)
{
case MENU_ZONE_LIST: return menuIcon_zone;
case MENU_CONTACTS_MENU: return menuIcon_contacts;
case MENU_CHANNEL_DETAILS: return menuIcon_channel;
case MENU_RSSI_SCREEN: return menuIcon_rssi;
case MENU_FIRMWARE_INFO: return menuIcon_info;
case MENU_OPTIONS: return menuIcon_options;
case MENU_LAST_HEARD: return menuIcon_lastheard;
case MENU_RADIO_INFOS: return menuIcon_radio;
case MENU_SATELLITE: return menuIcon_satellite;
case MENU_GPS: return menuIcon_gps;
default: return NULL;
}
}
// One-shot: the next menuDisplayEntry() draws this icon and shifts its text right.
static const uint8_t *nextMenuEntryIcon = NULL;
void menuSetNextEntryIconByMenuNum(int menuNum)
{
nextMenuEntryIcon = menuIconForMenuNumber(menuNum);
}
#endif // HAS_COLOURS
void menuDisplayEntry(int loopOffset, int focusedItem, const char *entryText, int32_t optStart, themeItem_t fgItem, themeItem_t fgOptItem, themeItem_t bgItem)
{
bool focused = (focusedItem == menuDataGlobal.currentItemIndex);
int16_t textXPos = DISPLAY_X_POS_MENU_TEXT_OFFSET;
#if defined(HAS_COLOURS)
const uint8_t *entryIcon = nextMenuEntryIcon;
nextMenuEntryIcon = NULL; // consume it (one-shot)
#endif
if (focused)
{
@ -785,15 +743,6 @@ void menuDisplayEntry(int loopOffset, int focusedItem, const char *entryText, in
displayThemeApply(fgItem, bgItem);
#if defined(HAS_COLOURS)
if (entryIcon != NULL)
{
int16_t iconY = DISPLAY_Y_POS_MENU_ENTRY_HIGHLIGHT + (loopOffset * MENU_ENTRY_HEIGHT);
displayDrawBitmap((DISPLAY_X_POS_MENU_OFFSET + 2), iconY, (uint8_t *)entryIcon, 16, 16, focused);
textXPos = (DISPLAY_X_POS_MENU_OFFSET + 2 + 16 + 3); // icon width + gap
}
#endif
if ((focused == false) && ((optStart < 0) || (optStart > 0)))
{
char buffer[SCREEN_LINE_BUFFER_SIZE];

1
README.md
View file

@ -40,7 +40,6 @@ FreeTRX keeps OpenGD77's core (DMR/FM, hotspot, CPS compatibility) and adds:
**Vertexic** (amber/orange). CPS edits only affect Custom.
- **On-radio channel management** — create and delete channels directly from the
Channel quick menu, no PC/CPS required (see [Managing channels](#managing-channels-on-the-radio)).
- **Main-menu icons** next to each top-level entry.
- **DMR reliability fix** — resolves a hard-fault (freeze needing a battery pull)
on the DMR path that affected recent self-built OpenGD77 revisions.