From 638399d691566825b3e47b52b56f2a5826387ead Mon Sep 17 00:00:00 2001 From: zxkmm Date: Thu, 17 Oct 2024 01:10:06 +0800 Subject: [PATCH 1/2] replace instead of add --- firmware/common/portapack_persistent_memory.cpp | 5 +---- hackrf | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/firmware/common/portapack_persistent_memory.cpp b/firmware/common/portapack_persistent_memory.cpp index 6c655e237..58f9a0b0c 100644 --- a/firmware/common/portapack_persistent_memory.cpp +++ b/firmware/common/portapack_persistent_memory.cpp @@ -254,8 +254,6 @@ struct data_t { uint16_t touchscreen_threshold; - uint16_t UNUSED_16; - constexpr data_t() : structure_version(data_structure_version_enum::VERSION_CURRENT), target_frequency(target_frequency_reset_value), @@ -312,8 +310,7 @@ struct data_t { config_mode_storage(CONFIG_MODE_NORMAL_VALUE), dst_config(), menu_color(Color::grey()), - touchscreen_threshold(32), - UNUSED_16() { + touchscreen_threshold(32) { } }; diff --git a/hackrf b/hackrf index d4ed8474e..22c9ff10f 160000 --- a/hackrf +++ b/hackrf @@ -1 +1 @@ -Subproject commit d4ed8474e532ccdbf605ee71c0f1fa0557da19e1 +Subproject commit 22c9ff10f934695065b6f79f4d95b812b0ab8365 From 598a1cf00af8bfa0504616b4d70de1b1612cc94e Mon Sep 17 00:00:00 2001 From: zxkmm Date: Thu, 17 Oct 2024 01:11:47 +0800 Subject: [PATCH 2/2] submodule --- hackrf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hackrf b/hackrf index 22c9ff10f..d4ed8474e 160000 --- a/hackrf +++ b/hackrf @@ -1 +1 @@ -Subproject commit 22c9ff10f934695065b6f79f4d95b812b0ab8365 +Subproject commit d4ed8474e532ccdbf605ee71c0f1fa0557da19e1