fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Fix level meter and set it to platform mic level

This commit is contained in:
Federico Amedeo Izzo 2021-09-26 18:38:29 +02:00
parent 5113a39f2a
commit 990f5e8ce6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openrtx/src/graphics.c
View File

@ -721,7 +721,7 @@ void gfx_drawSmeterLevel(point_t start, uint16_t width, uint16_t height, float r
gfx_setPixel(pixel_pos, white); gfx_setPixel(pixel_pos, white);
} }
// Level bar // Level bar
uint16_t level_width = (level / 255 * width); uint16_t level_width = (level / 255.0 * width);
point_t level_pos = { start.x, start.y + 2 }; point_t level_pos = { start.x, start.y + 2 };
gfx_drawRect(level_pos, level_width, bar_height, green, true); gfx_drawRect(level_pos, level_width, bar_height, green, true);
// RSSI bar // RSSI bar

5
openrtx/src/ui/ui_main.c
View File

@ -158,6 +158,7 @@ void _ui_drawMainBottom()
uint16_t meter_height = layout.bottom_h; uint16_t meter_height = layout.bottom_h;
point_t meter_pos = { layout.horizontal_pad, point_t meter_pos = { layout.horizontal_pad,
SCREEN_HEIGHT - meter_height - layout.bottom_pad}; SCREEN_HEIGHT - meter_height - layout.bottom_pad};
uint8_t mic_level = platform_getMicLevel();
switch(last_state.channel.mode) switch(last_state.channel.mode)
{ {
case FM: case FM:
@ -173,14 +174,14 @@ void _ui_drawMainBottom()
meter_width, meter_width,
meter_height, meter_height,
rssi, rssi,
255); mic_level);
break; break;
case M17: case M17:
gfx_drawSmeterLevel(meter_pos, gfx_drawSmeterLevel(meter_pos,
meter_width, meter_width,
meter_height, meter_height,
rssi, rssi,
255); mic_level);
break; break;
} }
} }