Skip to content

Feature/nrf5 sdk 16 #50

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
smarrazzo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feature/nrf5 sdk 16 #50

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: 8 additions & 0 deletions apr-dongle/blank/config/sdk_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1802,6 +1802,14 @@
#ifndef APP_USBD_DEVICE_VER_MINOR
#define APP_USBD_DEVICE_VER_MINOR 0
#endif
// <o> APP_USBD_DEVICE_VER_SUB - Sub-minor device version <0-9>


// <i> Sub-minor device version, will be converted automatically to BCD notation. Use just decimal values.

#ifndef APP_USBD_DEVICE_VER_SUB
#define APP_USBD_DEVICE_VER_SUB 0
#endif

// <q> APP_USBD_CONFIG_SELF_POWERED - Self-powered device, as opposed to bus-powered.

Expand Down
26 changes: 13 additions & 13 deletions logitacker/logitacker_cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ static void stored_devices_str_list_update() {
fds_flash_record_t flash_record;
memset(&ftok, 0x00, sizeof(fds_find_token_t));

while(fds_record_find(LOGITACKER_FLASH_FILE_ID_DEVICES, LOGITACKER_FLASH_RECORD_KEY_DEVICES, &record_desc, &ftok) == FDS_SUCCESS &&
while(fds_record_find(LOGITACKER_FLASH_FILE_ID_DEVICES, LOGITACKER_FLASH_RECORD_KEY_DEVICES, &record_desc, &ftok) == NRF_SUCCESS &&
m_stored_device_addr_str_list_len <= STORED_DEVICES_AUTOCOMPLETE_LIST_MAX_ENTRIES) {
if (fds_record_open(&record_desc, &flash_record) != FDS_SUCCESS) {
if (fds_record_open(&record_desc, &flash_record) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to open record");
continue; // go on with next
}
Expand All @@ -86,7 +86,7 @@ static void stored_devices_str_list_update() {
m_stored_device_addr_str_list_len++;


if (fds_record_close(&record_desc) != FDS_SUCCESS) {
if (fds_record_close(&record_desc) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to close record");
}
}
Expand All @@ -100,8 +100,8 @@ static void stored_script_names_str_list_update() {
fds_record_desc_t fds_record_desc;

m_stored_script_names_str_list_len = 0;
while(m_stored_script_names_str_list_len < STORED_SCRIPTS_AUTOCOMPLETE_LIST_MAX_ENTRIES && fds_record_find(LOGITACKER_FLASH_FILE_ID_STORED_SCRIPTS_INFO, LOGITACKER_FLASH_RECORD_KEY_STORED_SCRIPTS_INFO, &fds_record_desc, &ftoken) == FDS_SUCCESS) {
if (fds_record_open(&fds_record_desc, &flash_record) != FDS_SUCCESS) {
while(m_stored_script_names_str_list_len < STORED_SCRIPTS_AUTOCOMPLETE_LIST_MAX_ENTRIES && fds_record_find(LOGITACKER_FLASH_FILE_ID_STORED_SCRIPTS_INFO, LOGITACKER_FLASH_RECORD_KEY_STORED_SCRIPTS_INFO, &fds_record_desc, &ftoken) == NRF_SUCCESS) {
if (fds_record_open(&fds_record_desc, &flash_record) != NRF_SUCCESS) {
NRF_LOG_WARNING("failed to open record");
continue; // go on with next
}
Expand All @@ -112,7 +112,7 @@ static void stored_script_names_str_list_update() {
slen = slen >= LOGITACKER_SCRIPT_ENGINE_SCRIPT_NAME_MAX_LEN ? LOGITACKER_SCRIPT_ENGINE_SCRIPT_NAME_MAX_LEN-1 : slen;
memcpy(m_stored_script_names_str_list[m_stored_script_names_str_list_len], p_stored_tasks_fds_info_tmp->script_name, slen);

if (fds_record_close(&fds_record_desc) != FDS_SUCCESS) {
if (fds_record_close(&fds_record_desc) != NRF_SUCCESS) {
NRF_LOG_WARNING("failed to close record");
}

Expand Down Expand Up @@ -397,18 +397,18 @@ static void cmd_test_c(nrf_cli_t const * p_cli, size_t argc, char **argv) {

char * tmp_str[256] = {0};

while (fds_record_iterate(&rd,&ft) == FDS_SUCCESS) {
while (fds_record_iterate(&rd,&ft) == NRF_SUCCESS) {
uint32_t err;
err = fds_record_open(&rd, &flash_record);
if (err != FDS_SUCCESS) {
if (err != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to open record %08x", err);
continue; // go on with next
}

sprintf((char *) tmp_str, "Record file_id %04x record_key %04x", flash_record.p_header->file_id, flash_record.p_header->record_key);
NRF_LOG_INFO("%s",nrf_log_push((char*) tmp_str));

if (fds_record_close(&rd) != FDS_SUCCESS) {
if (fds_record_close(&rd) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to close record");
}

Expand Down Expand Up @@ -436,7 +436,7 @@ static void cmd_erase_flash(nrf_cli_t const * p_cli, size_t argc, char **argv) {
fds_find_token_t ft;
memset(&ft, 0x00, sizeof(fds_find_token_t));
fds_record_desc_t rd;
while (fds_record_iterate(&rd,&ft) == FDS_SUCCESS) {
while (fds_record_iterate(&rd,&ft) == NRF_SUCCESS) {
NRF_LOG_INFO("Deleting record...")
fds_record_delete(&rd);
}
Expand Down Expand Up @@ -1020,8 +1020,8 @@ static void cmd_devices_storage_list(nrf_cli_t const *p_cli, size_t argc, char *

nrf_cli_fprintf(p_cli, NRF_CLI_DEFAULT, "list of devices stored on flash:\r\n");
NRF_LOG_INFO("Devices on flash");
while(fds_record_find(LOGITACKER_FLASH_FILE_ID_DEVICES, LOGITACKER_FLASH_RECORD_KEY_DEVICES, &record_desc, &ftok) == FDS_SUCCESS) {
if (fds_record_open(&record_desc, &flash_record) != FDS_SUCCESS) {
while(fds_record_find(LOGITACKER_FLASH_FILE_ID_DEVICES, LOGITACKER_FLASH_RECORD_KEY_DEVICES, &record_desc, &ftok) == NRF_SUCCESS) {
if (fds_record_open(&record_desc, &flash_record) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to open record");
continue; // go on with next
}
Expand All @@ -1033,7 +1033,7 @@ static void cmd_devices_storage_list(nrf_cli_t const *p_cli, size_t argc, char *



if (fds_record_close(&record_desc) != FDS_SUCCESS) {
if (fds_record_close(&record_desc) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to close record")
}

Expand Down
46 changes: 23 additions & 23 deletions logitacker/logitacker_flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ static void fds_callback(fds_evt_t const * p_evt)
{
case FDS_EVT_INIT:
NRF_LOG_INFO("FDS_EVENT_INIT");
if (p_evt->result == FDS_SUCCESS)
if (p_evt->result == NRF_SUCCESS)
{
m_fds_initialized = true;
}
Expand All @@ -36,7 +36,7 @@ static void fds_callback(fds_evt_t const * p_evt)
case FDS_EVT_WRITE:
{
NRF_LOG_DEBUG("FDS_EVENT_WRITE");
if (p_evt->result == FDS_SUCCESS)
if (p_evt->result == NRF_SUCCESS)
{
NRF_LOG_DEBUG("Record ID:\t0x%04x", p_evt->write.record_id);
NRF_LOG_DEBUG("File ID:\t0x%04x", p_evt->write.file_id);
Expand All @@ -47,7 +47,7 @@ static void fds_callback(fds_evt_t const * p_evt)
case FDS_EVT_DEL_RECORD:
{
NRF_LOG_DEBUG("FDS_EVENT_DEL_RECORD");
if (p_evt->result == FDS_SUCCESS)
if (p_evt->result == NRF_SUCCESS)
{
NRF_LOG_DEBUG("Record ID:\t0x%04x", p_evt->del.record_id);
NRF_LOG_DEBUG("File ID:\t0x%04x", p_evt->del.file_id);
Expand Down Expand Up @@ -86,7 +86,7 @@ uint32_t logitacker_flash_init() {
wait_for_fds_ready();
NRF_LOG_INFO("flash-storage initialized");

if (fds_gc() == FDS_SUCCESS) NRF_LOG_INFO("garbage collection done");
if (fds_gc() == NRF_SUCCESS) NRF_LOG_INFO("garbage collection done");
return NRF_SUCCESS;
}

Expand Down Expand Up @@ -120,8 +120,8 @@ uint32_t logitacker_flash_list_stored_devices() {

char addr_str[LOGITACKER_DEVICE_ADDR_STR_LEN];
NRF_LOG_INFO("Devices on flash");
while(fds_record_find(LOGITACKER_FLASH_FILE_ID_DEVICES, LOGITACKER_FLASH_RECORD_KEY_DEVICES, &record_desc, &ftok) == FDS_SUCCESS) {
if (fds_record_open(&record_desc, &flash_record) != FDS_SUCCESS) {
while(fds_record_find(LOGITACKER_FLASH_FILE_ID_DEVICES, LOGITACKER_FLASH_RECORD_KEY_DEVICES, &record_desc, &ftok) == NRF_SUCCESS) {
if (fds_record_open(&record_desc, &flash_record) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to open record");
continue; // go on with next
}
Expand All @@ -130,7 +130,7 @@ uint32_t logitacker_flash_list_stored_devices() {
helper_addr_to_hex_str(addr_str, LOGITACKER_DEVICE_ADDR_LEN, p_device->rf_address);
NRF_LOG_INFO("Stored device %s", nrf_log_push(addr_str));

if (fds_record_close(&record_desc) != FDS_SUCCESS) {
if (fds_record_close(&record_desc) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to close record");
}
}
Expand Down Expand Up @@ -161,7 +161,7 @@ uint32_t logitacker_flash_get_device(logitacker_devices_unifying_device_t * p_de
if (logitacker_flash_get_record_desc_for_device(&record_desc, rf_address) == NRF_SUCCESS) {
char addr_str[LOGITACKER_DEVICE_ADDR_STR_LEN];
uint32_t res = fds_record_open(&record_desc, &flash_record);
if (res != FDS_SUCCESS) {
if (res != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to open record");
return res;
}
Expand All @@ -171,7 +171,7 @@ uint32_t logitacker_flash_get_device(logitacker_devices_unifying_device_t * p_de
helper_addr_to_hex_str(addr_str, LOGITACKER_DEVICE_ADDR_LEN, rf_address);
NRF_LOG_INFO("Found %s ...", nrf_log_push(addr_str));

if (fds_record_close(&record_desc) != FDS_SUCCESS) {
if (fds_record_close(&record_desc) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to close record");
}

Expand All @@ -189,8 +189,8 @@ uint32_t logitacker_flash_get_record_desc_for_device(fds_record_desc_t * p_recor
bool found = false;

char addr_str[LOGITACKER_DEVICE_ADDR_STR_LEN];
while(fds_record_find(LOGITACKER_FLASH_FILE_ID_DEVICES, LOGITACKER_FLASH_RECORD_KEY_DEVICES, p_record_desc, &ftok) == FDS_SUCCESS) {
if (fds_record_open(p_record_desc, &flash_record) != FDS_SUCCESS) {
while(fds_record_find(LOGITACKER_FLASH_FILE_ID_DEVICES, LOGITACKER_FLASH_RECORD_KEY_DEVICES, p_record_desc, &ftok) == NRF_SUCCESS) {
if (fds_record_open(p_record_desc, &flash_record) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to open record");
continue; // go on with next
}
Expand All @@ -203,7 +203,7 @@ uint32_t logitacker_flash_get_record_desc_for_device(fds_record_desc_t * p_recor
}


if (fds_record_close(p_record_desc) != FDS_SUCCESS) {
if (fds_record_close(p_record_desc) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to close record");
}

Expand All @@ -224,8 +224,8 @@ uint32_t logitacker_flash_get_next_device_for_dongle(logitacker_devices_unifying
helper_base_and_prefix_to_addr(tmp_addr, p_dongle->base_addr, 0x00, 5);

char addr_str[LOGITACKER_DEVICE_ADDR_STR_LEN];
while(fds_record_find(LOGITACKER_FLASH_FILE_ID_DEVICES, LOGITACKER_FLASH_RECORD_KEY_DEVICES, &record_desc, p_find_token) == FDS_SUCCESS) {
if (fds_record_open(&record_desc, &flash_record) != FDS_SUCCESS) {
while(fds_record_find(LOGITACKER_FLASH_FILE_ID_DEVICES, LOGITACKER_FLASH_RECORD_KEY_DEVICES, &record_desc, p_find_token) == NRF_SUCCESS) {
if (fds_record_open(&record_desc, &flash_record) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to open record");
continue; // go on with next
}
Expand All @@ -239,7 +239,7 @@ uint32_t logitacker_flash_get_next_device_for_dongle(logitacker_devices_unifying
}


if (fds_record_close(&record_desc) != FDS_SUCCESS) {
if (fds_record_close(&record_desc) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to close record");
}

Expand Down Expand Up @@ -293,7 +293,7 @@ uint32_t logitacker_flash_get_dongle(logitacker_devices_unifying_dongle_t * p_do
helper_addr_to_hex_str(base_addr_str, 4, base_addr);
if (logitacker_flash_get_record_desc_for_dongle(&record_desc, base_addr) == NRF_SUCCESS) {
uint32_t res = fds_record_open(&record_desc, &flash_record);
if (res != FDS_SUCCESS) {
if (res != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to open record");
return res;
}
Expand All @@ -305,7 +305,7 @@ uint32_t logitacker_flash_get_dongle(logitacker_devices_unifying_dongle_t * p_do

NRF_LOG_INFO("Found dongle %s ...", nrf_log_push(base_addr_str));

if (fds_record_close(&record_desc) != FDS_SUCCESS) {
if (fds_record_close(&record_desc) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to close record");
}

Expand All @@ -326,8 +326,8 @@ uint32_t logitacker_flash_list_stored_dongles() {

char base_addr_str[LOGITACKER_DEVICE_ADDR_STR_LEN];
NRF_LOG_INFO("Dongles on flash:");
while(fds_record_find(LOGITACKER_FLASH_FILE_ID_DONGLES, LOGITACKER_FLASH_RECORD_KEY_DONGLES, &record_desc, &ftok) == FDS_SUCCESS) {
if (fds_record_open(&record_desc, &flash_record) != FDS_SUCCESS) {
while(fds_record_find(LOGITACKER_FLASH_FILE_ID_DONGLES, LOGITACKER_FLASH_RECORD_KEY_DONGLES, &record_desc, &ftok) == NRF_SUCCESS) {
if (fds_record_open(&record_desc, &flash_record) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to open record");
continue; // go on with next
}
Expand All @@ -336,7 +336,7 @@ uint32_t logitacker_flash_list_stored_dongles() {
helper_addr_to_hex_str(base_addr_str, 4, p_device->base_addr);
NRF_LOG_INFO("Stored dongle %s", nrf_log_push(base_addr_str));

if (fds_record_close(&record_desc) != FDS_SUCCESS) {
if (fds_record_close(&record_desc) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to close record");
}
}
Expand All @@ -360,8 +360,8 @@ uint32_t logitacker_flash_get_record_desc_for_dongle(fds_record_desc_t * p_recor
bool found = false;


while(fds_record_find(LOGITACKER_FLASH_FILE_ID_DONGLES, LOGITACKER_FLASH_RECORD_KEY_DONGLES, p_record_desc, &ftok) == FDS_SUCCESS) {
if (fds_record_open(p_record_desc, &flash_record) != FDS_SUCCESS) {
while(fds_record_find(LOGITACKER_FLASH_FILE_ID_DONGLES, LOGITACKER_FLASH_RECORD_KEY_DONGLES, p_record_desc, &ftok) == NRF_SUCCESS) {
if (fds_record_open(p_record_desc, &flash_record) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to open record");
continue; // go on with next
}
Expand All @@ -372,7 +372,7 @@ uint32_t logitacker_flash_get_record_desc_for_dongle(fds_record_desc_t * p_recor
}


if (fds_record_close(p_record_desc) != FDS_SUCCESS) {
if (fds_record_close(p_record_desc) != NRF_SUCCESS) {
NRF_LOG_WARNING("Failed to close record");
}

Expand Down
12 changes: 6 additions & 6 deletions logitacker/logitacker_options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ uint32_t logitacker_options_update_flash(void) {

// only search for file_id-key-combination once (not account for multiple entries)
ret_code_t res = fds_record_find(LOGITACKER_FLASH_FILE_ID_GLOBAL_OPTIONS, LOGITACKER_FLASH_KEY_GLOBAL_OPTIONS_LOGITACKER, &record_desc, &find_token);
if (res != FDS_SUCCESS) {
if (res != NRF_SUCCESS) {
NRF_LOG_WARNING("failed to find Flash Data Storage record for global options: %d", res);
return res;
}
Expand All @@ -35,14 +35,14 @@ uint32_t logitacker_options_update_flash(void) {


res = fds_record_update(&record_desc, &record);
if (res != FDS_SUCCESS) {
if (res != NRF_SUCCESS) {
NRF_LOG_WARNING("update: failed to update Flash Data Storage record for global options: %d", res);
return res;
}



return res == FDS_SUCCESS ? NRF_SUCCESS : res;
return res == NRF_SUCCESS ? NRF_SUCCESS : res;

}

Expand Down Expand Up @@ -80,14 +80,14 @@ uint32_t logitacker_options_restore_from_flash(void) {
bool restore_failed = false;
// only search for file_id-key-combination once (not account for multiple entries)
ret_code_t res = fds_record_find(LOGITACKER_FLASH_FILE_ID_GLOBAL_OPTIONS, LOGITACKER_FLASH_KEY_GLOBAL_OPTIONS_LOGITACKER, &record_desc, &find_token);
if (res != FDS_SUCCESS) {
if (res != NRF_SUCCESS) {
NRF_LOG_WARNING("restore: failed to find Flash Data Storage record for global options: %d", res);
restore_failed = true;
goto finish;
}

res = fds_record_open(&record_desc, &flash_record);
if (res != FDS_SUCCESS) {
if (res != NRF_SUCCESS) {
NRF_LOG_WARNING("restore: failed to open Flash Data Storage record for global options: %d", res);
restore_failed = true;
goto finish;
Expand All @@ -96,7 +96,7 @@ uint32_t logitacker_options_restore_from_flash(void) {
memcpy(&g_logitacker_global_config, flash_record.p_data, sizeof(g_logitacker_global_config));

res = fds_record_close(&record_desc);
if (res != FDS_SUCCESS) {
if (res != NRF_SUCCESS) {
NRF_LOG_WARNING("restore: failed to close Flash Data Storage record for global options: %d", res);
}

Expand Down
Loading