Просмотр исходного кода

Merge spi_mem_manager from https://github.com/flipperdevices/flipperzero-good-faps

Willy-JL 1 год назад
Родитель
Сommit
e5ded4fb20

+ 3 - 0
spi_mem_manager/.catalog/changelog.md

@@ -1,3 +1,6 @@
+## 1.4
+ - Fixed UI rendering bug related to line breaks
+ - Removed call to legacy SDK API
 ## 1.3
 ## 1.3
    XM25QH64C and XM25QH128A flash chip support added
    XM25QH64C and XM25QH128A flash chip support added
 ## 1.2
 ## 1.2

+ 1 - 1
spi_mem_manager/application.fam

@@ -6,7 +6,7 @@ App(
     requires=["gui"],
     requires=["gui"],
     stack_size=1 * 2048,
     stack_size=1 * 2048,
     fap_description="Application for reading and writing 25-series SPI memory chips",
     fap_description="Application for reading and writing 25-series SPI memory chips",
-    fap_version="1.3",
+    fap_version="1.4",
     fap_icon="images/Dip8_10px.png",
     fap_icon="images/Dip8_10px.png",
     fap_category="GPIO/Debug",
     fap_category="GPIO/Debug",
     fap_icon_assets="images",
     fap_icon_assets="images",

+ 2 - 2
spi_mem_manager/scenes/spi_mem_scene_chip_detect_fail.c

@@ -26,13 +26,13 @@ void spi_mem_scene_chip_detect_fail_on_enter(void* context) {
         app->widget, 64, 20, AlignCenter, AlignBottom, FontPrimary, "unknown SPI chip");
         app->widget, 64, 20, AlignCenter, AlignBottom, FontPrimary, "unknown SPI chip");
     furi_string_printf(str, "Vendor\nid: 0x%02X", spi_mem_chip_get_vendor_id(app->chip_info));
     furi_string_printf(str, "Vendor\nid: 0x%02X", spi_mem_chip_get_vendor_id(app->chip_info));
     widget_add_string_multiline_element(
     widget_add_string_multiline_element(
-        app->widget, 16, 44, AlignCenter, AlignBottom, FontSecondary, furi_string_get_cstr(str));
+        app->widget, 18, 44, AlignCenter, AlignBottom, FontSecondary, furi_string_get_cstr(str));
     furi_string_printf(str, "Type\nid: 0x%02X", spi_mem_chip_get_type_id(app->chip_info));
     furi_string_printf(str, "Type\nid: 0x%02X", spi_mem_chip_get_type_id(app->chip_info));
     widget_add_string_multiline_element(
     widget_add_string_multiline_element(
         app->widget, 64, 44, AlignCenter, AlignBottom, FontSecondary, furi_string_get_cstr(str));
         app->widget, 64, 44, AlignCenter, AlignBottom, FontSecondary, furi_string_get_cstr(str));
     furi_string_printf(str, "Capacity\nid: 0x%02X", spi_mem_chip_get_capacity_id(app->chip_info));
     furi_string_printf(str, "Capacity\nid: 0x%02X", spi_mem_chip_get_capacity_id(app->chip_info));
     widget_add_string_multiline_element(
     widget_add_string_multiline_element(
-        app->widget, 110, 44, AlignCenter, AlignBottom, FontSecondary, furi_string_get_cstr(str));
+        app->widget, 108, 44, AlignCenter, AlignBottom, FontSecondary, furi_string_get_cstr(str));
     furi_string_free(str);
     furi_string_free(str);
     view_dispatcher_switch_to_view(app->view_dispatcher, SPIMemViewWidget);
     view_dispatcher_switch_to_view(app->view_dispatcher, SPIMemViewWidget);
 }
 }