Merge branch 'ul-dev' into xfw-dev

lib/SConscript

@@ -89,6 +89,7 @@ libs = env.BuildModules(
         "fatfs",
         "flipper_format",
         "one_wire",
+        "ibutton",
         "infrared",
         "littlefs",
         "mbedtls",

lib/flipper_application/elf/elf_file.c

@@ -830,8 +830,9 @@ void elf_file_init_debug_info(ELFFile* elf, ELFDebugInfo* debug_info) {
 
         const void* data_ptr = itref->value.data;
         if(data_ptr) {
-            debug_info->mmap_entries[mmap_entry_idx].address = (uint32_t)data_ptr;
-            debug_info->mmap_entries[mmap_entry_idx].name = itref->key;
+            ELFMemoryMapEntry* entry = &debug_info->mmap_entries[mmap_entry_idx];
+            entry->address = (uint32_t)data_ptr;
+            entry->name = itref->key;
             mmap_entry_idx++;
         }
     }

lib/flipper_application/flipper_application.c

@@ -3,7 +3,9 @@
 #include <notification/notification_messages.h>
 #include "application_assets.h"
 
-#define TAG "fapp"
+#include <m-list.h>
+
+#define TAG "Fap"
 
 struct FlipperApplication {
     ELFDebugInfo state;
@@ -13,8 +15,39 @@ struct FlipperApplication {
     void* ep_thread_args;
 };
 
-/* For debugger access to app state */
-FlipperApplication* last_loaded_app = NULL;
+/********************** Debugger access to loader state **********************/
+
+LIST_DEF(FlipperApplicationList, const FlipperApplication*, M_POD_OPLIST);
+
+FlipperApplicationList_t flipper_application_loaded_app_list = {0};
+static bool flipper_application_loaded_app_list_initialized = false;
+
+static void flipper_application_list_add_app(const FlipperApplication* app) {
+    furi_assert(app);
+
+    if(!flipper_application_loaded_app_list_initialized) {
+        FlipperApplicationList_init(flipper_application_loaded_app_list);
+        flipper_application_loaded_app_list_initialized = true;
+    }
+    FlipperApplicationList_push_back(flipper_application_loaded_app_list, app);
+}
+
+static void flipper_application_list_remove_app(const FlipperApplication* app) {
+    furi_assert(flipper_application_loaded_app_list_initialized);
+    furi_assert(app);
+
+    FlipperApplicationList_it_t it;
+    for(FlipperApplicationList_it(it, flipper_application_loaded_app_list);
+        !FlipperApplicationList_end_p(it);
+        FlipperApplicationList_next(it)) {
+        if(*FlipperApplicationList_ref(it) == app) {
+            FlipperApplicationList_remove(flipper_application_loaded_app_list, it);
+            break;
+        }
+    }
+}
+
+/*****************************************************************************/
 
 FlipperApplication*
     flipper_application_alloc(Storage* storage, const ElfApiInterface* api_interface) {
@@ -37,8 +70,8 @@ void flipper_application_free(FlipperApplication* app) {
         furi_thread_free(app->thread);
     }
 
-    if(!flipper_application_is_plugin(app)) {
-        last_loaded_app = NULL;
+    if(app->state.entry) {
+        flipper_application_list_remove_app(app);
     }
 
     elf_file_clear_debug_info(&app->state);
@@ -153,14 +186,12 @@ const FlipperApplicationManifest* flipper_application_get_manifest(FlipperApplic
 }
 
 FlipperApplicationLoadStatus flipper_application_map_to_memory(FlipperApplication* app) {
-    if(!flipper_application_is_plugin(app)) {
-        last_loaded_app = app;
-    }
     ELFFileLoadStatus status = elf_file_load_sections(app->elf);
 
     switch(status) {
     case ELFFileLoadStatusSuccess:
         elf_file_init_debug_info(app->elf, &app->state);
+        flipper_application_list_add_app(app);
         return FlipperApplicationLoadStatusSuccess;
     case ELFFileLoadStatusNoFreeMemory:
         return FlipperApplicationLoadStatusNoFreeMemory;

lib/ibutton/SConscript

@@ -0,0 +1,24 @@
+Import("env")
+
+env.Append(
+    LINT_SOURCES=[
+        Dir("."),
+    ],
+    CPPPATH=[
+        "#/lib/ibutton",
+    ],
+    SDK_HEADERS=[
+        File("ibutton_key.h"),
+        File("ibutton_worker.h"),
+        File("ibutton_protocols.h"),
+    ],
+)
+
+libenv = env.Clone(FW_LIB_NAME="ibutton")
+libenv.ApplyLibFlags()
+
+sources = libenv.GlobRecursive("*.c*")
+
+lib = libenv.StaticLibrary("${FW_LIB_NAME}", sources)
+libenv.Install("${LIB_DIST_DIR}", lib)
+Return("lib")

lib/ibutton/protocols/dallas/dallas_common.c

@@ -85,7 +85,7 @@ bool dallas_common_read_mem(OneWireHost* host, uint16_t address, uint8_t* data,
     onewire_host_write(host, DALLAS_COMMON_CMD_READ_MEM);
 
     onewire_host_write(host, (uint8_t)address);
-    onewire_host_write(host, (uint8_t)(address > BITS_IN_BYTE));
+    onewire_host_write(host, (uint8_t)(address >> BITS_IN_BYTE));
 
     onewire_host_read_bytes(host, data, (uint16_t)data_size);
 

lib/ibutton/protocols/dallas/protocol_ds1420.c

@@ -0,0 +1,144 @@
+#include "protocol_ds1420.h"
+
+#include <core/string.h>
+#include <core/core_defines.h>
+
+#include "dallas_common.h"
+
+#include "../blanks/rw1990.h"
+#include "../blanks/tm2004.h"
+
+#define DS1420_FAMILY_CODE 0x81U
+#define DS1420_FAMILY_NAME "DS1420"
+
+#define DS1420_CMD_READ_ROM 0x0FU
+
+typedef struct {
+    OneWireSlave* bus;
+} DS1420ProtocolState;
+
+typedef struct {
+    DallasCommonRomData rom_data;
+    DS1420ProtocolState state;
+} DS1420ProtocolData;
+
+static bool dallas_ds1420_read(OneWireHost*, iButtonProtocolData*);
+static bool dallas_ds1420_write_blank(OneWireHost*, iButtonProtocolData*);
+static void dallas_ds1420_emulate(OneWireSlave*, iButtonProtocolData*);
+static bool dallas_ds1420_load(FlipperFormat*, uint32_t, iButtonProtocolData*);
+static bool dallas_ds1420_save(FlipperFormat*, const iButtonProtocolData*);
+static void dallas_ds1420_render_brief_data(FuriString*, const iButtonProtocolData*);
+static void dallas_ds1420_render_error(FuriString*, const iButtonProtocolData*);
+static bool dallas_ds1420_is_data_valid(const iButtonProtocolData*);
+static void dallas_ds1420_get_editable_data(iButtonEditableData*, iButtonProtocolData*);
+static void dallas_ds1420_apply_edits(iButtonProtocolData*);
+
+const iButtonProtocolDallasBase ibutton_protocol_ds1420 = {
+    .family_code = DS1420_FAMILY_CODE,
+    .features = iButtonProtocolFeatureWriteBlank,
+    .data_size = sizeof(DS1420ProtocolData),
+    .manufacturer = DALLAS_COMMON_MANUFACTURER_NAME,
+    .name = DS1420_FAMILY_NAME,
+
+    .read = dallas_ds1420_read,
+    .write_blank = dallas_ds1420_write_blank,
+    .write_copy = NULL, /* No data to write a copy */
+    .emulate = dallas_ds1420_emulate,
+    .save = dallas_ds1420_save,
+    .load = dallas_ds1420_load,
+    .render_data = NULL, /* No data to render */
+    .render_brief_data = dallas_ds1420_render_brief_data,
+    .render_error = dallas_ds1420_render_error,
+    .is_valid = dallas_ds1420_is_data_valid,
+    .get_editable_data = dallas_ds1420_get_editable_data,
+    .apply_edits = dallas_ds1420_apply_edits,
+};
+
+bool dallas_ds1420_read(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DS1420ProtocolData* data = protocol_data;
+    return onewire_host_reset(host) && dallas_common_read_rom(host, &data->rom_data);
+}
+
+bool dallas_ds1420_write_blank(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DS1420ProtocolData* data = protocol_data;
+
+    return rw1990_write_v1(host, data->rom_data.bytes, sizeof(DallasCommonRomData)) ||
+           rw1990_write_v2(host, data->rom_data.bytes, sizeof(DallasCommonRomData)) ||
+           tm2004_write(host, data->rom_data.bytes, sizeof(DallasCommonRomData));
+}
+
+static bool dallas_ds1420_command_callback(uint8_t command, void* context) {
+    furi_assert(context);
+    DS1420ProtocolData* data = context;
+    OneWireSlave* bus = data->state.bus;
+
+    switch(command) {
+    case DALLAS_COMMON_CMD_SEARCH_ROM:
+        dallas_common_emulate_search_rom(bus, &data->rom_data);
+        break;
+    case DALLAS_COMMON_CMD_READ_ROM:
+    case DS1420_CMD_READ_ROM:
+        dallas_common_emulate_read_rom(bus, &data->rom_data);
+        break;
+    default:
+        break;
+    }
+
+    // No support for multiple consecutive commands
+    return false;
+}
+
+void dallas_ds1420_emulate(OneWireSlave* bus, iButtonProtocolData* protocol_data) {
+    DS1420ProtocolData* data = protocol_data;
+    data->state.bus = bus;
+
+    onewire_slave_set_reset_callback(bus, NULL, NULL);
+    onewire_slave_set_command_callback(bus, dallas_ds1420_command_callback, protocol_data);
+}
+
+bool dallas_ds1420_save(FlipperFormat* ff, const iButtonProtocolData* protocol_data) {
+    const DS1420ProtocolData* data = protocol_data;
+    return dallas_common_save_rom_data(ff, &data->rom_data);
+}
+
+bool dallas_ds1420_load(
+    FlipperFormat* ff,
+    uint32_t format_version,
+    iButtonProtocolData* protocol_data) {
+    DS1420ProtocolData* data = protocol_data;
+    return dallas_common_load_rom_data(ff, format_version, &data->rom_data);
+}
+
+void dallas_ds1420_render_brief_data(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1420ProtocolData* data = protocol_data;
+
+    for(size_t i = 0; i < sizeof(DallasCommonRomData); ++i) {
+        furi_string_cat_printf(result, "%02X ", data->rom_data.bytes[i]);
+    }
+}
+
+void dallas_ds1420_render_error(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1420ProtocolData* data = protocol_data;
+
+    if(!dallas_common_is_valid_crc(&data->rom_data)) {
+        dallas_common_render_crc_error(result, &data->rom_data);
+    }
+}
+
+bool dallas_ds1420_is_data_valid(const iButtonProtocolData* protocol_data) {
+    const DS1420ProtocolData* data = protocol_data;
+    return dallas_common_is_valid_crc(&data->rom_data);
+}
+
+void dallas_ds1420_get_editable_data(
+    iButtonEditableData* editable_data,
+    iButtonProtocolData* protocol_data) {
+    DS1420ProtocolData* data = protocol_data;
+    editable_data->ptr = data->rom_data.bytes;
+    editable_data->size = sizeof(DallasCommonRomData);
+}
+
+void dallas_ds1420_apply_edits(iButtonProtocolData* protocol_data) {
+    DS1420ProtocolData* data = protocol_data;
+    dallas_common_apply_edits(&data->rom_data, DS1420_FAMILY_CODE);
+}

lib/ibutton/protocols/dallas/protocol_ds1420.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include "protocol_dallas_base.h"
+
+extern const iButtonProtocolDallasBase ibutton_protocol_ds1420;

lib/ibutton/protocols/dallas/protocol_group_dallas_defs.c

@@ -4,6 +4,7 @@
 #include "protocol_ds1992.h"
 #include "protocol_ds1996.h"
 #include "protocol_ds1971.h"
+#include "protocol_ds1420.h"
 #include "protocol_ds_generic.h"
 
 const iButtonProtocolDallasBase* ibutton_protocols_dallas[] = {
@@ -11,6 +12,7 @@ const iButtonProtocolDallasBase* ibutton_protocols_dallas[] = {
     [iButtonProtocolDS1992] = &ibutton_protocol_ds1992,
     [iButtonProtocolDS1996] = &ibutton_protocol_ds1996,
     [iButtonProtocolDS1971] = &ibutton_protocol_ds1971,
+    [iButtonProtocolDS1420] = &ibutton_protocol_ds1420,
     /* Add new 1-Wire protocols here */
 
     /* Default catch-all 1-Wire protocol */

lib/ibutton/protocols/dallas/protocol_group_dallas_defs.h

@@ -7,6 +7,7 @@ typedef enum {
     iButtonProtocolDS1992,
     iButtonProtocolDS1996,
     iButtonProtocolDS1971,
+    iButtonProtocolDS1420,
     /* Add new 1-Wire protocols here */
 
     /* Default catch-all 1-Wire protocol */

lib/one_wire/SConscript

@@ -11,9 +11,6 @@ env.Append(
         File("one_wire_host_timing.h"),
         File("one_wire_host.h"),
         File("one_wire_slave.h"),
-        File("ibutton/ibutton_key.h"),
-        File("ibutton/ibutton_worker.h"),
-        File("ibutton/ibutton_protocols.h"),
         File("maxim_crc.h"),
     ],
 )

lib/subghz/subghz_setting.c

@@ -447,7 +447,7 @@ uint32_t subghz_setting_get_frequency(SubGhzSetting* instance, size_t idx) {
 
 uint32_t subghz_setting_get_hopper_frequency(SubGhzSetting* instance, size_t idx) {
     furi_assert(instance);
-    if(idx < FrequencyList_size(instance->frequencies)) {
+    if(idx < FrequencyList_size(instance->hopper_frequencies)) {
         return *FrequencyList_get(instance->hopper_frequencies, idx);
     } else {
         return 0;