From e78d73c35fec268ac87a7a1e54075009241a6b21 Mon Sep 17 00:00:00 2001 From: DerSkythe Date: Tue, 11 Oct 2022 21:56:00 +0400 Subject: [PATCH] fix PNG, move waves 2px down and code to correct values --- .../subghz/scenes/subghz_scene_decode_raw.c | 9 --------- .../subghz/scenes/subghz_scene_read_raw.c | 5 +++++ applications/main/subghz/views/receiver.c | 4 ++-- assets/icons/SubGhz/Scanning_123x52.png | Bin 1690 -> 1466 bytes 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/applications/main/subghz/scenes/subghz_scene_decode_raw.c b/applications/main/subghz/scenes/subghz_scene_decode_raw.c index 42be550df..ccfb40820 100644 --- a/applications/main/subghz/scenes/subghz_scene_decode_raw.c +++ b/applications/main/subghz/scenes/subghz_scene_decode_raw.c @@ -33,16 +33,7 @@ static void subghz_scene_receiver_update_statusbar(void* context) { frequency_str = furi_string_alloc(); modulation_str = furi_string_alloc(); -#ifdef SUBGHZ_EXT_PRESET_NAME - if(subghz_history_get_last_index(subghz->txrx->history)> 0) { - subghz_get_frequency_modulation(subghz, frequency_str, modulation_str); - } else { - subghz_get_frequency_modulation(subghz, frequency_str, NULL); - furi_string_printf(modulation_str, "%s", furi_string_get_cstr(subghz->txrx->preset->name)); - } -#else subghz_get_frequency_modulation(subghz, frequency_str, modulation_str); -#endif subghz_view_receiver_add_data_statusbar( subghz->subghz_receiver, diff --git a/applications/main/subghz/scenes/subghz_scene_read_raw.c b/applications/main/subghz/scenes/subghz_scene_read_raw.c index a518c3594..fe9317d08 100644 --- a/applications/main/subghz/scenes/subghz_scene_read_raw.c +++ b/applications/main/subghz/scenes/subghz_scene_read_raw.c @@ -42,7 +42,12 @@ static void subghz_scene_read_raw_update_statusbar(void* context) { frequency_str = furi_string_alloc(); modulation_str = furi_string_alloc(); +#ifdef SUBGHZ_EXT_PRESET_NAME + subghz_get_frequency_modulation(subghz, frequency_str, NULL); + furi_string_printf(modulation_str, "%s", furi_string_get_cstr(subghz->txrx->preset->name)); +#else subghz_get_frequency_modulation(subghz, frequency_str, modulation_str); +#endif subghz_read_raw_add_data_statusbar( subghz->subghz_read_raw, furi_string_get_cstr(frequency_str), diff --git a/applications/main/subghz/views/receiver.c b/applications/main/subghz/views/receiver.c index 81d4fbdd6..22c1a75ed 100644 --- a/applications/main/subghz/views/receiver.c +++ b/applications/main/subghz/views/receiver.c @@ -270,12 +270,12 @@ void subghz_view_receiver_draw(Canvas* canvas, SubGhzViewReceiverModel* model) { #ifdef SUBGHZ_EXT_PRESET_NAME if(model->history_item == 0 && model->mode == SubGhzViewReceiverModeLive) { const char* str = furi_string_get_cstr(model->preset_str); - const uint8_t vertical_offset = 3; + const uint8_t vertical_offset = 7; const uint8_t horizontal_offset = 3; const uint8_t string_width = canvas_string_width(canvas, str); canvas_draw_str( canvas, - canvas_width(canvas) - string_width + horizontal_offset, + canvas_width(canvas) - (string_width + horizontal_offset), vertical_offset, str); } else { diff --git a/assets/icons/SubGhz/Scanning_123x52.png b/assets/icons/SubGhz/Scanning_123x52.png index ec785948d035b717944bc41811f73d190e6fc3bd..805b28d84d19ee6d99f93925fabc4f58c2245cef 100644 GIT binary patch delta 735 zcmV<50wDdG4Y~`E7*PZR00013=UVju0004VQb$4nuFf3k00004XF*Lt006O%3;baP z00006P)t-s|Ns900033O(|!N|010qNS#tmY4#NNd4#NS*Z>VGd00TdfN>2g}3Xz&_ z0}TowlL!Gq1q})yARx0!0bBtG4GJJ2ARr)fFDZ*D#f3LqdnFLGpNI#NVNJ`D;yFL*k5ZE$U6bYVUX3Oqk}aA9L>Wpp5AZe%?o zaw0!I#r!R+0005Pi~%^(14qPzrjIUTON4FX=Y)EGd!!fMU|I}Jh%9?8AL>XmEYrwc-hjOyy5GC zZ2kc@IP9s%pWlJ}hPF?&2Q^T`XAvMD<-C(B>$ zb%_^9unwA5!(M%HhBZU$z#2k- z7JKStbD@L`Ked+NW!k20pT5~(D-=J3y}6^A*{SE`5&qqK-7s zBubYb)ho>}IEFg9cw8GF)NAl$1kY;kb_c5zD`BjqCL%t2W?#8Kl+$G5so~bvp zJgoFoeA~{Y<`2cU4RtQQ`{8B{cPK8K{Hh+)vL^ToExgKqqAwTvoWHjv@&i?o9{DRq RvQ_{9002ovPDHLkV1kO6Mx6iv delta 958 zcmV;v13~<{3z`j(7%~U~0000btI&}E000?uMObuGZ)S9NVRB^vL1b@YWgtmyVP|Dh zWnpA_ami&o0009dk!eo>Ad$LmlPdv2vvL7k0h84Ni+?XZAUrQ}WM(=fFD zZ*D#yJTG!&W;#+tMm``sFL*k5ZE$U6bYVUqJU@7FVPk7$bRcDJWIZBsB0oOcUuW$A z00Rt3L_t(|+U#4=j>I4cyc+-im-jAd(&YdV5Utw!&|LOhs{;%;y2t19`FY#GmR<;6 z#5ZqQ-+%Qu4&lEqJ4GT6u`VHd^%)HP`QC->ovQ2kYv+2-=lKci<7X>%*tnV2n>6lo zf)1e<-Z2vQYfAURZJI-p2ZG*>ps&(;wa*^jZ8do^4P*kn8V##ExNic06*2bIBKa;XASR(F9lpP2vMuAgu|Y=Wt(RwU?6L1zJd!dT0>0u%G7Z_3E%a zJF!3uCm7b6y(*v4ygiKf^smeEm-Vu^5@>mfbSH)UMb_opc}!pS(D^Gt&vG_Len;z; zYl`rXuHsDZqP~&PJwA@efj!WnL$`-8jDM2SP&D%Hs^8ty$n@P5ZWiBuWun{hP2qKy z2$QMJt8iQ2#2VF_6+`@M2IVW4YDvvWrV{8x)U;Y< z&#z?VSa%55Z1=nBl}xT7*W*;wjZKfYvqy|mTI*!!)HOh$Z`qgnyQ( z@4-B)khqh_-D^Vu5l9FN(aX_}qcs5_22e^R`()0*wXwo1QV1yFKJDUpG9@Va$*SS* zDrMJWXj`Shid-Qjwjl33+Q&5_*VA@1X2cyDyc_iK+TQYeP8syl^M|`XBv8uU7m1Q} zc>?IAr_!SAFERGaoW6ad478pc*l%AOE%ysHv#!z(x|@Yd2HTa&o%(pxsT;bOxINrW zJ|4LBe-7N=T4j7~@JzVBwaQ@7=`H7nz>Rr)4861*K5Wo(`^Npny4A;ffc|1#@$o>= gyWZYfvHc1#06Z}%qdx$98~^|S07*qoM6N<$g2GhJxBvhE