Finished jammer modes

Shaved off a few kBs by using the Labels widget
This commit is contained in:
furrtek 2017-02-13 05:35:13 +00:00
parent d12cd0d8af
commit 4e8980e5d8
26 changed files with 232 additions and 304 deletions

View file

@ -81,6 +81,15 @@ private:
.foreground = Color::grey(),
};
Labels labels {
{ { 8 * 8, 3 * 8 }, "Header:", Color::light_grey() },
{ { 4 * 8, 5 * 8 }, "Code ville:", Color::light_grey() },
{ { 7 * 8, 7 * 8 }, "Famille:", Color::light_grey() },
{ { 2 * 8, 9 * 8 + 2 }, "Sous-famille:", Color::light_grey() },
{ { 2 * 8, 13 * 8 }, "ID recepteur:", Color::light_grey() },
{ { 1 * 8, 17 * 8 }, "Relais:", Color::light_grey() },
{ { 27 * 8 + 4, 20 * 8 + 4 }, "s.", Color::light_grey() }
};
OptionsField options_mode {
{ 10 * 8, 4 },
@ -103,10 +112,6 @@ private:
ui::Color::black()
};
Text text_header {
{ 8 * 8, 3 * 8, 7 * 8, 16 },
"Header:"
};
NumberField header_code_a {
{ 16 * 8, 3 * 8 },
2,
@ -122,10 +127,6 @@ private:
'0'
};
Text text_city {
{ 4 * 8, 5 * 8, 11 * 8, 16 },
"Code ville:"
};
NumberField city_code_xy {
{ 16 * 8, 5 * 8 },
2,
@ -141,10 +142,6 @@ private:
' '
};
Text text_family {
{ 7 * 8, 7 * 8, 8 * 8, 16 },
"Famille:"
};
NumberField family_code_xy {
{ 16 * 8, 7 * 8 },
1,
@ -163,10 +160,6 @@ private:
}
};
Text text_subfamily {
{ 2 * 8, 9 * 8 + 2, 13 * 8, 16 },
"Sous-famille:"
};
NumberField subfamily_code {
{ 16 * 8, 9 * 8 + 2 },
1,
@ -180,10 +173,6 @@ private:
"Toutes"
};
Text text_receiver {
{ 2 * 8, 13 * 8, 13 * 8, 16 },
"ID recepteur:"
};
NumberField receiver_code {
{ 16 * 8, 13 * 8 },
2,
@ -197,11 +186,6 @@ private:
"Tous"
};
Text text_relais {
{ 1 * 8, 8 * 16 + 8, 7 * 8, 16 },
"Relais:"
};
std::array<ImageOptionsField, 4> relay_states { };
ImageOptionsField::options_t relay_options = {
@ -230,10 +214,6 @@ private:
1,
' '
};
Text text_cligno {
{ 27 * 8 + 4, 10 * 16 + 4, 2 * 8, 16 },
"s."
};
TransmitterView tx_view {
16 * 16,