Latest RM0424-1225-0.420.0-6d42555 on PATREON - UPD WEEBO

Author: RogueMaster

ReadMe.md

@@ -54,7 +54,7 @@ This software is for experimental purposes only and is not meant for any illegal
 - Updated: [FlipWorld v0.8.3 (By jblanked)](https://github.com/jblanked/FlipWorld) `Req: ESP32` with [FliperHTTP Firmware](https://github.com/jblanked/FlipperHTTP)
 - Updated: [Protocol Visualizer v1.3 (By antirez)](https://github.com/antirez/protoview) [Extra history page for TPMS detections (By Mascot68)](https://github.com/Mascot68/ProtoViewTPMS) [Add optional display in bar (By Mascot68)](https://github.com/Mascot68/ProtoViewTPMS/commit/f2c61eafdfb70f2ac0510b09577ec37c3c18b8d1)
 - Added: [Nickname Generator v0.1 (By disaxq)](https://github.com/disaxq/Nickname-Generator)
-- Updated: [Weebo v0.1.1 (By bettse)](https://github.com/bettse/weebo) [Expanded DB of Amiibo for Info (By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/ed6b16e94253ebe629e8bf9ccc644673e21f64f9)
+- Updated: [Weebo v0.2 (By bettse)](https://github.com/bettse/weebo) [Expanded DB of Amiibo for Info (By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/ed6b16e94253ebe629e8bf9ccc644673e21f64f9)
 
 <a name="release">
 
@@ -704,7 +704,7 @@ $ ./fbt dolphin_ext
 - [WHC SWIO Flasher v1.1 (By sukvojte)](https://github.com/sukvojte/wch_swio_flasher)
 - [Weather Station v1.9.3 (By Skorpionm)-OFW](https://github.com/flipperdevices/flipperzero-good-faps/tree/dev/weather_station)
 - [Web Crawler v1.0.1 (By jblanked)](https://github.com/jblanked/WebCrawler-FlipperZero) `Req: ESP32` with [FliperHTTP Firmware](https://github.com/jblanked/FlipperHTTP)
-- [Weebo v0.1.1 (By bettse)](https://github.com/bettse/weebo) `Req: key_retail.bin on SD card /apps_data/weebo`
+- [Weebo v0.2 (By bettse)](https://github.com/bettse/weebo) `Req: key_retail.bin on SD card /apps_data/weebo`
 - [Wendigo Bluetooth Tracker WIP v0.1 (By chris-bc)](https://github.com/chris-bc/wendigo) `WIP Req: ESP32`
 - [Wiegand Reader v1.4 (By jamisonderek)](https://github.com/jamisonderek/flipper-zero-tutorials/tree/main/gpio)
 - [WiFi (Deauther) V2 (By Timmotools)](https://github.com/Timmotools/flipperzero_esp8266_deautherv2) `Req: ESP8266`

applications/external/weebo/.catalog/changelog.md

@@ -1,8 +1,8 @@
-## 0.1
- - Initial release
-
-## 0.1.1
+## 0.2
  - Info shows the ID of the figure
  - More IDs added for Smash characters and many older figures
  - Image assets fixed using fbt format_img
  - FAM file expanded to include app creator / source information
+
+## 0.1
+ - Initial release

applications/external/weebo/application.fam

@@ -16,7 +16,7 @@ App(
     fap_category="NFC",
     fap_author="bettse",
     fap_weburl="https://github.com/bettse/weebo",
-    fap_version="0.1.1",
+    fap_version="0.2",
     fap_description="A maker/emulator/remixer for A figure files",
-    #  [v0.1.1: Expanded DB of Amiibo for Info (By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/ed6b16e94253ebe629e8bf9ccc644673e21f64f9)
+    #  [v0.2: Expanded DB of Amiibo for Info (By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/ed6b16e94253ebe629e8bf9ccc644673e21f64f9)
 )

applications/external/weebo/scenes/weebo_scene_info.c

@@ -17,10 +17,7 @@ void weebo_scene_info_on_enter(void* context) {
         furi_string_cat_printf(str, "Unknown\n");
     }
     furi_string_free(name);
-    uint16_t id = 0;
-    id |= weebo->figure[UNPACKED_FIGURE_ID + 0] << 8;
-    id |= weebo->figure[UNPACKED_FIGURE_ID + 1] << 0;
-    furi_string_cat_printf(str, "ID: %04x\n", id);
+    furi_string_cat_printf(str, "ID: %04x\n", weebo_get_figure_id(weebo));
 
     text_box_set_font(weebo->text_box, TextBoxFontText);
     text_box_set_text(weebo->text_box, furi_string_get_cstr(weebo->text_box_store));

applications/external/weebo/weebo.c

@@ -4,6 +4,7 @@
 
 #define WEEBO_KEY_RETAIL_FILENAME "key_retail"
 #define FIGURE_ID_LIST            APP_ASSETS_PATH("figure_ids.nfc")
+#define UNPACKED_FIGURE_ID        0x1dc
 #define NFC_APP_EXTENSION         ".nfc"
 #define NFC_APP_PATH_PREFIX       "/ext/nfc"
 
@@ -138,13 +139,18 @@ static bool
     return parsed;
 }
 
-bool weebo_get_figure_name(Weebo* weebo, FuriString* name) {
-    bool parsed = false;
-
+uint16_t weebo_get_figure_id(Weebo* weebo) {
     uint16_t id = 0;
     id |= weebo->figure[UNPACKED_FIGURE_ID + 0] << 8;
     id |= weebo->figure[UNPACKED_FIGURE_ID + 1] << 0;
     FURI_LOG_D(TAG, "id = %04x", id);
+    return id;
+}
+
+bool weebo_get_figure_name(Weebo* weebo, FuriString* name) {
+    bool parsed = false;
+
+    uint16_t id = weebo_get_figure_id(weebo);
 
     FuriString* key = furi_string_alloc_printf("%04x", id);
     if(weebo_search_data(weebo->storage, FIGURE_ID_LIST, key, name)) {

applications/external/weebo/weebo.h

@@ -2,4 +2,6 @@
 
 typedef struct Weebo Weebo;
 
+uint16_t weebo_get_figure_id(Weebo* weebo);
+
 bool weebo_get_figure_name(Weebo* weebo, FuriString* name);

applications/external/weebo/weebo_i.h

@@ -42,7 +42,6 @@
 
 #define WEEBO_TEXT_STORE_SIZE      128
 #define WEEBO_FILE_NAME_MAX_LENGTH 64
-#define UNPACKED_FIGURE_ID         0x1dc
 
 #define NTAG215_SIZE     540
 #define NFC3D_UID_OFFSET 0x1D4