Skip to content

memfault: fix symbol rename for device info #26168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gminn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

memfault: fix symbol rename for device info #26168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions modules/memfault-firmware-sdk/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ config MEMFAULT_NCS_PROJECT_KEY

choice
prompt "Choose built-in Memfault Device Info or custom implementation"
default MEMFAULT_DEVICE_INFO_BUILTIN
default MEMFAULT_NCS_DEVICE_INFO_BUILTIN

config MEMFAULT_DEVICE_INFO_BUILTIN
config MEMFAULT_NCS_DEVICE_INFO_BUILTIN
bool "Built-in Memfault Device Info implementation"
help
Use built-in Memfault Device Info implementation
Expand All @@ -29,7 +29,7 @@ config MEMFAULT_NCS_DEVICE_INFO_CUSTOM

endchoice

if MEMFAULT_DEVICE_INFO_BUILTIN
if MEMFAULT_NCS_DEVICE_INFO_BUILTIN

choice
prompt "Memfault device ID generation method"
Expand Down Expand Up @@ -132,7 +132,7 @@ config MEMFAULT_NCS_FW_VERSION
When using a statically configured firmware version, this value
will be reported to Memfault

endif # MEMFAULT_DEVICE_INFO_BUILTIN
endif # MEMFAULT_NCS_DEVICE_INFO_BUILTIN

config MEMFAULT_NCS_INIT_PRIORITY
int "Memfault initialization priority"
Expand Down
4 changes: 2 additions & 2 deletions modules/memfault-firmware-sdk/memfault_integration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ sMfltHttpClientConfig g_mflt_http_client_config = {
.api_key = CONFIG_MEMFAULT_NCS_PROJECT_KEY,
};

#if defined(CONFIG_MEMFAULT_DEVICE_INFO_BUILTIN)
#if defined(CONFIG_MEMFAULT_NCS_DEVICE_INFO_BUILTIN)
/* Firmware type check */
BUILD_ASSERT(sizeof(CONFIG_MEMFAULT_NCS_FW_TYPE) > 1, "Firmware type must be configured");

Expand Down Expand Up @@ -132,7 +132,7 @@ int memfault_ncs_device_id_set(const char *device_id, size_t len)

return 0;
}
#endif /* defined(CONFIG_MEMFAULT_DEVICE_INFO_BUILTIN) */
#endif /* defined(CONFIG_MEMFAULT_NCS_DEVICE_INFO_BUILTIN) */

#if defined(CONFIG_MEMFAULT_NCS_DEVICE_ID_HW_ID)
static int device_info_init(void)
Expand Down