mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 20:49:49 +04:00
Code Issues Activity

Move multiple func calls into one var

Browse Source
This commit is contained in:
MX
2023-03-30 03:09:39 +03:00
parent fe6d44d273
commit b5ed26ad70
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/external/pocsag_pager/views/pocsag_pager_receiver.c vendored
View File

@@ -207,6 +207,8 @@ void pcsg_view_receiver_draw(Canvas* canvas, PCSGReceiverModel* model) {
FuriString* str_buff; FuriString* str_buff;
str_buff = furi_string_alloc(); str_buff = furi_string_alloc();
bool ext_module = furi_hal_subghz_get_radio_type();
PCSGReceiverMenuItem* item_menu; PCSGReceiverMenuItem* item_menu;
for(size_t i = 0; i < MIN(model->history_item, MENU_ITEMS); ++i) { for(size_t i = 0; i < MIN(model->history_item, MENU_ITEMS); ++i) {
@@ -232,15 +234,11 @@ void pcsg_view_receiver_draw(Canvas* canvas, PCSGReceiverModel* model) {
canvas_set_color(canvas, ColorBlack); canvas_set_color(canvas, ColorBlack);
if(model->history_item == 0) { if(model->history_item == 0) {
canvas_draw_icon( canvas_draw_icon(canvas, 0, 0, ext_module ? &I_Fishing_123x52 : &I_Scanning_123x52);
canvas,
0,
0,
furi_hal_subghz_get_radio_type() ? &I_Fishing_123x52 : &I_Scanning_123x52);
canvas_set_font(canvas, FontPrimary); canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 63, 46, "Scanning..."); canvas_draw_str(canvas, 63, 46, "Scanning...");
canvas_set_font(canvas, FontSecondary); canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 44, 10, furi_hal_subghz_get_radio_type() ? "Ext" : "Int"); canvas_draw_str(canvas, 44, 10, ext_module ? "Ext" : "Int");
} }
// Draw RSSI // Draw RSSI

10
applications/external/weather_station/views/weather_station_receiver.c vendored
View File

@@ -202,6 +202,8 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) {
FuriString* str_buff; FuriString* str_buff;
str_buff = furi_string_alloc(); str_buff = furi_string_alloc();
bool ext_module = furi_hal_subghz_get_radio_type();
WSReceiverMenuItem* item_menu; WSReceiverMenuItem* item_menu;
for(size_t i = 0; i < MIN(model->history_item, MENU_ITEMS); ++i) { for(size_t i = 0; i < MIN(model->history_item, MENU_ITEMS); ++i) {
@@ -226,15 +228,11 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) {
canvas_set_color(canvas, ColorBlack); canvas_set_color(canvas, ColorBlack);
if(model->history_item == 0) { if(model->history_item == 0) {
canvas_draw_icon( canvas_draw_icon(canvas, 0, 0, ext_module ? &I_Fishing_123x52 : &I_Scanning_123x52);
canvas,
0,
0,
furi_hal_subghz_get_radio_type() ? &I_Fishing_123x52 : &I_Scanning_123x52);
canvas_set_font(canvas, FontPrimary); canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 63, 46, "Scanning..."); canvas_draw_str(canvas, 63, 46, "Scanning...");
canvas_set_font(canvas, FontSecondary); canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 44, 10, furi_hal_subghz_get_radio_type() ? "Ext" : "Int"); canvas_draw_str(canvas, 44, 10, ext_module ? "Ext" : "Int");
} }
// Draw RSSI // Draw RSSI