From eb97b3b80a0c7b5ec1643a97c085489a48212593 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Sun, 19 Feb 2023 02:37:32 +0000 Subject: [PATCH 1/2] Add asset pack support to external cc1101 scanning --- applications/main/subghz/views/receiver.c | 4 ++-- applications/services/xtreme/assets.c | 2 ++ applications/services/xtreme/assets.h | 1 + .../custom/NSFW/Icons/SubGhz/Fishing_123x52.png | Bin 0 -> 4092 bytes .../WatchDogs/Icons/SubGhz/Fishing_123x52.png | Bin 0 -> 15377 bytes .../NSFW/Icons/SubGhz/Fishing_123x52.bmx | Bin 0 -> 458 bytes .../WatchDogs/Icons/SubGhz/Fishing_123x52.bmx | Bin 0 -> 438 bytes 7 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 assets/dolphin/custom/NSFW/Icons/SubGhz/Fishing_123x52.png create mode 100644 assets/dolphin/custom/WatchDogs/Icons/SubGhz/Fishing_123x52.png create mode 100644 assets/resources/dolphin_custom/NSFW/Icons/SubGhz/Fishing_123x52.bmx create mode 100644 assets/resources/dolphin_custom/WatchDogs/Icons/SubGhz/Fishing_123x52.bmx diff --git a/applications/main/subghz/views/receiver.c b/applications/main/subghz/views/receiver.c index 48630eafb..943fdf815 100644 --- a/applications/main/subghz/views/receiver.c +++ b/applications/main/subghz/views/receiver.c @@ -265,7 +265,7 @@ void subghz_view_receiver_draw(Canvas* canvas, SubGhzViewReceiverModel* model) { canvas, 0, 0, - furi_hal_subghz_get_radio_type() ? &I_Fishing_123x52 : XTREME_ASSETS()->I_Scanning_123x52); + furi_hal_subghz_get_radio_type() ? XTREME_ASSETS()->I_Fishing_123x52 : XTREME_ASSETS()->I_Scanning_123x52); canvas_set_font(canvas, FontPrimary); canvas_draw_str(canvas, 63, 46, "Scanning..."); //canvas_draw_line(canvas, 46, 51, 125, 51); @@ -275,7 +275,7 @@ void subghz_view_receiver_draw(Canvas* canvas, SubGhzViewReceiverModel* model) { canvas, 0, 0, - furi_hal_subghz_get_radio_type() ? &I_Fishing_123x52 : XTREME_ASSETS()->I_Scanning_123x52); + furi_hal_subghz_get_radio_type() ? XTREME_ASSETS()->I_Fishing_123x52 : XTREME_ASSETS()->I_Scanning_123x52); canvas_set_font(canvas, FontPrimary); canvas_draw_str(canvas, 63, 46, "Decoding..."); canvas_set_font(canvas, FontSecondary); diff --git a/applications/services/xtreme/assets.c b/applications/services/xtreme/assets.c index 88a6d563d..ce73e4f87 100644 --- a/applications/services/xtreme/assets.c +++ b/applications/services/xtreme/assets.c @@ -102,6 +102,7 @@ void swap(XtremeAssets* x, FuriString* p, File* f) { icon(&x->I_RFIDDolphinSend_97x61, "RFID/RFIDDolphinSend_97x61", p, f); icon(&x->I_RFIDDolphinSuccess_108x57, "RFID/RFIDDolphinSuccess_108x57", p, f); icon(&x->I_Cry_dolph_55x52, "Settings/Cry_dolph_55x52", p, f); + icon(&x->I_Fishing_123x52, "SubGhz/Fishing_123x52", p, f); icon(&x->I_Scanning_123x52, "SubGhz/Scanning_123x52", p, f); icon(&x->I_Auth_62x31, "U2F/Auth_62x31", p, f); icon(&x->I_Connect_me_62x31, "U2F/Connect_me_62x31", p, f); @@ -131,6 +132,7 @@ void XTREME_ASSETS_LOAD() { xtreme_assets->I_RFIDDolphinSend_97x61 = &I_RFIDDolphinSend_97x61; xtreme_assets->I_RFIDDolphinSuccess_108x57 = &I_RFIDDolphinSuccess_108x57; xtreme_assets->I_Cry_dolph_55x52 = &I_Cry_dolph_55x52; + xtreme_assets->I_Fishing_123x52 = &I_Fishing_123x52; xtreme_assets->I_Scanning_123x52 = &I_Scanning_123x52; xtreme_assets->I_Auth_62x31 = &I_Auth_62x31; xtreme_assets->I_Connect_me_62x31 = &I_Connect_me_62x31; diff --git a/applications/services/xtreme/assets.h b/applications/services/xtreme/assets.h index b88a6cf1e..7abaac450 100644 --- a/applications/services/xtreme/assets.h +++ b/applications/services/xtreme/assets.h @@ -25,6 +25,7 @@ typedef struct { const Icon* I_RFIDDolphinSend_97x61; const Icon* I_RFIDDolphinSuccess_108x57; const Icon* I_Cry_dolph_55x52; + const Icon* I_Fishing_123x52; const Icon* I_Scanning_123x52; const Icon* I_Auth_62x31; const Icon* I_Connect_me_62x31; diff --git a/assets/dolphin/custom/NSFW/Icons/SubGhz/Fishing_123x52.png b/assets/dolphin/custom/NSFW/Icons/SubGhz/Fishing_123x52.png new file mode 100644 index 0000000000000000000000000000000000000000..a48c5330e85c2135866fe99bcb6f3534d06c6d53 GIT binary patch literal 4092 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 literal 0 HcmV?d00001 diff --git a/assets/resources/dolphin_custom/WatchDogs/Icons/SubGhz/Fishing_123x52.bmx b/assets/resources/dolphin_custom/WatchDogs/Icons/SubGhz/Fishing_123x52.bmx new file mode 100644 index 0000000000000000000000000000000000000000..7c576cb7bb1e3cd238851d215f87387f5a78f7ff GIT binary patch literal 438 zcmV;n0ZIOQ0000q000010IC517NhqA2j^3M58GF?9g`1l{sIrVX6sZBy#`lb{tsP) z|Gw1$Mg$LzhN`PA2i;@8zJ&osf_x;e~_B2oHYkYib`bd|kHv(fI@8 z0o}EJ!RH7Mzuv922cN(k)D8VtR6iqpU@cW!tP~71C3Iiqb(isAf$zW%ja9r*NElFn z2T-r-ZGiLs3*PHh)Pu;~77F=%K*bOTzoToa+Xu?Q0E`3IVSme7j>iE)5CH0)y;p1w zf8ikj58;06?VoS}EZ1LaeGM>ucfP%J3xWTGgWh?6*8btT53+TD19kP<_3*C;egqGH zReQUAjs8A_DDQo4dYM&Y{!fdoe`|oK{-;3r?frPr3I~234~@3}TC5w~EFT`buq=2T z;QaReyJ!}J?v98BuYa$Ve{ZPhfOmei>Muk751qGvca^(K+4E}p`?X(T^uRis{r<1| zUYG^j>wDMj Date: Sun, 19 Feb 2023 03:23:53 +0000 Subject: [PATCH 2/2] Asset packer use manifest for anim subfolders --- scripts/asset_packer.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/asset_packer.py b/scripts/asset_packer.py index 02ed0b94e..cc28ee540 100755 --- a/scripts/asset_packer.py +++ b/scripts/asset_packer.py @@ -6,7 +6,9 @@ import shutil import struct import typing import time +import re import io +import os def convert_bm(img: "Image.Image | pathlib.Path") -> bytes: @@ -94,7 +96,7 @@ def pack( if not source.is_dir(): continue - logger(f"Packing {source.name}... ") + logger(f"Pack: custom user pack '{source.name}'") packed = output / source.name if packed.exists(): try: @@ -110,10 +112,11 @@ def pack( shutil.copyfile( source / "Anims/manifest.txt", packed / "Anims/manifest.txt" ) - for anim in (source / "Anims").iterdir(): - if not anim.is_dir(): - continue - pack_anim(anim, packed / "Anims" / anim.name) + manifest = (source / "Anims/manifest.txt").read_bytes() + for anim in re.finditer(rb"Name: (.*)", manifest): + anim = anim.group(1).decode().replace("\\", "/").replace("/", os.sep) + logger(f"Compile: anim for pack '{source.name}': {anim}") + pack_anim(source / "Anims" / anim, packed / "Anims" / anim) if (source / "Icons").is_dir(): for icons in (source / "Icons").iterdir(): @@ -121,10 +124,12 @@ def pack( continue for icon in icons.iterdir(): if icon.is_dir(): + logger(f"Compile: icon for pack '{source.name}': {icons.name}/{icon.name}") pack_icon_animated( icon, packed / "Icons" / icons.name / icon.name ) elif icon.is_file(): + logger(f"Compile: icon for pack '{source.name}': {icons.name}/{icon.name}") pack_icon_static( icon, packed / "Icons" / icons.name / icon.name )