Skip to content

logo_custom2 shown even when all disabled #17

@raph-topo

Description

@raph-topo

ModuleAir shows logo_custom2 screen even when all logos are disabled in configuration.h:

const int cfg_logo_moduleair = 0;
const int cfg_logo_aircarto = 0;
const int cfg_logo_atmo = 0;
const int cfg_logo_region = 0;
const int cfg_logo_custom1 = 0;
const int cfg_logo_custom2 = 0;

Logic in following code (supposed locations) is flawed:

bool has_logo;

ModuleAir_V2.1/moduleair.cpp

Lines 5734 to 5742 in bff7989

if (logo_index != -1)
{
has_logo = true;
logo_index = -1;
}
else
{
has_logo = false;
}

ModuleAir_V2.1/moduleair.cpp

Lines 5639 to 5659 in bff7989

if (has_logo && (logos[logo_index + 1] != 0 && logo_index != 5))
{
logo_index++;
}
else if (has_logo && (logos[logo_index + 1] == 0) || logo_index == 5)
{
logo_index = 0;
}
if (logos[logo_index] == cfg_logo_moduleair)
drawImage(0, 0, 32, 64, logo_moduleair);
if (logos[logo_index] == cfg_logo_aircarto)
drawImage(0, 0, 32, 64, logo_aircarto);
if (logos[logo_index] == cfg_logo_atmo)
drawImage(0, 0, 32, 64, logo_atmo);
if (logos[logo_index] == cfg_logo_region)
drawImage(0, 0, 32, 64, logo_region);
if (logos[logo_index] == cfg_logo_custom1)
drawImage(0, 0, 32, 64, logo_custom1);
if (logos[logo_index] == cfg_logo_custom2)
drawImage(0, 0, 32, 64, logo_custom2);

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type
    No fields configured for issues without a type.

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions