From a39b02c3645c5d1111d894f65163583ae8b5d591 Mon Sep 17 00:00:00 2001 From: Samuel Marrazzo Date: Fri, 14 Feb 2020 17:00:50 +0100 Subject: [PATCH] Add support for nRF5 SDK 16.0.0 --- apr-dongle/blank/config/sdk_config.h | 8 +++++ logitacker/logitacker_cli.c | 26 +++++++-------- logitacker/logitacker_flash.c | 46 +++++++++++++-------------- logitacker/logitacker_options.c | 12 +++---- logitacker/logitacker_script_engine.c | 38 +++++++++++----------- logitacker/logitacker_usb.c | 3 ++ logitacker/logitacker_usb.h | 3 +- mdk-dongle/blank/config/sdk_config.h | 7 ++++ mdk/blank/config/sdk_config.h | 8 +++++ pca10059/blank/config/sdk_config.h | 7 ++++ 10 files changed, 96 insertions(+), 62 deletions(-) diff --git a/apr-dongle/blank/config/sdk_config.h b/apr-dongle/blank/config/sdk_config.h index a7d14a5..a98eea2 100644 --- a/apr-dongle/blank/config/sdk_config.h +++ b/apr-dongle/blank/config/sdk_config.h @@ -1802,6 +1802,14 @@ #ifndef APP_USBD_DEVICE_VER_MINOR #define APP_USBD_DEVICE_VER_MINOR 0 #endif +// APP_USBD_DEVICE_VER_SUB - Sub-minor device version <0-9> + + +// 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 // APP_USBD_CONFIG_SELF_POWERED - Self-powered device, as opposed to bus-powered. diff --git a/logitacker/logitacker_cli.c b/logitacker/logitacker_cli.c index 16583b9..9c74ef2 100644 --- a/logitacker/logitacker_cli.c +++ b/logitacker/logitacker_cli.c @@ -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 } @@ -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"); } } @@ -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 } @@ -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"); } @@ -397,10 +397,10 @@ 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 } @@ -408,7 +408,7 @@ static void cmd_test_c(nrf_cli_t const * p_cli, size_t argc, char **argv) { 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"); } @@ -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); } @@ -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 } @@ -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") } diff --git a/logitacker/logitacker_flash.c b/logitacker/logitacker_flash.c index 7f14e02..21bc620 100644 --- a/logitacker/logitacker_flash.c +++ b/logitacker/logitacker_flash.c @@ -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; } @@ -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); @@ -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); @@ -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; } @@ -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 } @@ -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"); } } @@ -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; } @@ -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"); } @@ -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 } @@ -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"); } @@ -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 } @@ -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"); } @@ -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; } @@ -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"); } @@ -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 } @@ -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"); } } @@ -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 } @@ -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"); } diff --git a/logitacker/logitacker_options.c b/logitacker/logitacker_options.c index f40e980..32eccfd 100644 --- a/logitacker/logitacker_options.c +++ b/logitacker/logitacker_options.c @@ -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; } @@ -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; } @@ -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; @@ -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); } diff --git a/logitacker/logitacker_script_engine.c b/logitacker/logitacker_script_engine.c index 9fd4d1b..96c7e25 100644 --- a/logitacker/logitacker_script_engine.c +++ b/logitacker/logitacker_script_engine.c @@ -414,7 +414,7 @@ void logitacker_script_engine_fds_event_handler(fds_evt_t const *p_evt) { m_current_script_task_record_key++; NRF_LOG_DEBUG("FDS_EVENT_WRITE"); - if (p_evt->result == FDS_SUCCESS) + if (p_evt->result == NRF_SUCCESS) { switch (m_current_fds_op_write_script_sub_state) { case FDS_OP_WRITE_SCRIPT_SUB_STATE_WRITE_TASK_HEADER: @@ -496,8 +496,8 @@ uint32_t find_stored_script_info_by_name(const char *script_name, stored_script_ fds_flash_record_t flash_record; fds_record_desc_t fds_record_desc; - while(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(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 } @@ -511,7 +511,7 @@ uint32_t find_stored_script_info_by_name(const char *script_name, stored_script_ return NRF_SUCCESS; } - 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"); } } @@ -548,7 +548,7 @@ bool logitacker_script_engine_store_current_script_to_flash(const char *script_n fds_find_token_t ftoken; memset(&ftoken, 0x00, sizeof(fds_find_token_t)); uint16_t last_used_id = LOGITACKER_FLASH_FIRST_FILE_ID_STORED_SCRIPT_TASKS-1; - for (uint16_t test_id = LOGITACKER_FLASH_FIRST_FILE_ID_STORED_SCRIPT_TASKS; (fds_record_find(test_id, LOGITACKER_FLASH_RECORD_KEY_FIRST_STORED_SCRIPT_TASKS, &fds_record_desc, &ftoken) == FDS_SUCCESS) && (test_id < LOGITACKER_FLASH_MAXIMUM_FILE_ID_STORED_SCRIPT_TASKS); test_id++) { + for (uint16_t test_id = LOGITACKER_FLASH_FIRST_FILE_ID_STORED_SCRIPT_TASKS; (fds_record_find(test_id, LOGITACKER_FLASH_RECORD_KEY_FIRST_STORED_SCRIPT_TASKS, &fds_record_desc, &ftoken) == NRF_SUCCESS) && (test_id < LOGITACKER_FLASH_MAXIMUM_FILE_ID_STORED_SCRIPT_TASKS); test_id++) { last_used_id = test_id; //update last used ID, as test ID is in use } uint16_t next_usable_id = last_used_id+1; @@ -670,7 +670,7 @@ bool logitacker_script_engine_load_script_from_flash(const char *script_name) { m_current_script_task_record_key = LOGITACKER_FLASH_RECORD_KEY_FIRST_STORED_SCRIPT_TASKS; while (true) { uint32_t err = fds_record_find(m_current_fds_op_fds_script_info.script_tasks_file_id, m_current_script_task_record_key, &fds_record_desc, &ftoken); - if (err != FDS_SUCCESS) { + if (err != NRF_SUCCESS) { // should only fail with "RECORD_NOT_FOUND" NRF_LOG_DEBUG("error loading file_id %04x record_key %04x: %08x", err); break; @@ -681,7 +681,7 @@ bool logitacker_script_engine_load_script_from_flash(const char *script_name) { m_current_script_task_record_key++; // open task header - if (fds_record_open(&fds_record_desc, &fds_flash_record) != FDS_SUCCESS) { + if (fds_record_open(&fds_record_desc, &fds_flash_record) != NRF_SUCCESS) { NRF_LOG_ERROR("logitacker_script_engine_load_script_from_flash: failed to read task header"); script_engine_transfer_state(SCRIPT_ENGINE_STATE_FDS_READ_FAILED); return false; @@ -689,7 +689,7 @@ bool logitacker_script_engine_load_script_from_flash(const char *script_name) { memcpy(&m_current_fds_op_task, fds_flash_record.p_data, sizeof(inject_task_t)); - if (fds_record_close(&fds_record_desc) != FDS_SUCCESS) { + if (fds_record_close(&fds_record_desc) != NRF_SUCCESS) { NRF_LOG_ERROR("logitacker_script_engine_load_script_from_flash: failed to close task header record"); script_engine_transfer_state(SCRIPT_ENGINE_STATE_FDS_READ_FAILED); return false; @@ -697,7 +697,7 @@ bool logitacker_script_engine_load_script_from_flash(const char *script_name) { NRF_LOG_DEBUG("task type: %d", m_current_fds_op_task.type); // try to load next record, which should be the task data - if (fds_record_find(m_current_fds_op_fds_script_info.script_tasks_file_id, m_current_script_task_record_key, &fds_record_desc, &ftoken) != FDS_SUCCESS) { + if (fds_record_find(m_current_fds_op_fds_script_info.script_tasks_file_id, m_current_script_task_record_key, &fds_record_desc, &ftoken) != NRF_SUCCESS) { NRF_LOG_ERROR("logitacker_script_engine_load_script_from_flash: failed to read task data"); script_engine_transfer_state(SCRIPT_ENGINE_STATE_FDS_READ_FAILED); return false; @@ -706,7 +706,7 @@ bool logitacker_script_engine_load_script_from_flash(const char *script_name) { // open task data memset(&ftoken, 0x00, sizeof(fds_find_token_t)); // reset find token, next lookup is for different record_key - if (fds_record_open(&fds_record_desc, &fds_flash_record) != FDS_SUCCESS) { + if (fds_record_open(&fds_record_desc, &fds_flash_record) != NRF_SUCCESS) { NRF_LOG_ERROR("logitacker_script_engine_load_script_from_flash: failed to open task data"); script_engine_transfer_state(SCRIPT_ENGINE_STATE_FDS_READ_FAILED); return false; @@ -714,7 +714,7 @@ bool logitacker_script_engine_load_script_from_flash(const char *script_name) { if (m_current_fds_op_task.data_len > 0) memcpy(&m_current_fds_op_task_data, fds_flash_record.p_data, m_current_fds_op_task.data_len); - if (fds_record_close(&fds_record_desc) != FDS_SUCCESS) { + if (fds_record_close(&fds_record_desc) != NRF_SUCCESS) { NRF_LOG_ERROR("logitacker_script_engine_load_script_from_flash: failed to close task data record"); script_engine_transfer_state(SCRIPT_ENGINE_STATE_FDS_READ_FAILED); return false; @@ -742,8 +742,8 @@ void logitacker_script_engine_list_scripts_from_flash(nrf_cli_t const *p_cli) { fds_record_desc_t fds_record_desc; uint32_t task_num = 1; - while(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(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 } @@ -753,7 +753,7 @@ void logitacker_script_engine_list_scripts_from_flash(nrf_cli_t const *p_cli) { nrf_cli_fprintf(p_cli, NRF_CLI_DEFAULT, "%04d script '%s'\r\n", task_num, p_stored_tasks_fds_info_tmp->script_name); - 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"); } @@ -768,8 +768,8 @@ void delete_taskdata_from_flash(uint16_t file_id) { memset(&ftoken, 0x00, sizeof(fds_find_token_t)); fds_record_desc_t fds_record_desc; - while(fds_record_find_in_file(file_id, &fds_record_desc, &ftoken) == FDS_SUCCESS) { - if (fds_record_delete(&fds_record_desc) != FDS_SUCCESS) { + while(fds_record_find_in_file(file_id, &fds_record_desc, &ftoken) == NRF_SUCCESS) { + if (fds_record_delete(&fds_record_desc) != NRF_SUCCESS) { NRF_LOG_WARNING("failed to delete record"); continue; // go on with next } @@ -806,8 +806,8 @@ bool logitacker_script_engine_delete_script_from_flash(const char *script_name) fds_flash_record_t flash_record; fds_record_desc_t fds_record_desc; - while(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(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 } @@ -822,7 +822,7 @@ bool logitacker_script_engine_delete_script_from_flash(const char *script_name) break; } - 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"); } } diff --git a/logitacker/logitacker_usb.c b/logitacker/logitacker_usb.c index ab6ac23..94433e1 100644 --- a/logitacker/logitacker_usb.c +++ b/logitacker/logitacker_usb.c @@ -53,6 +53,7 @@ APP_USBD_HID_GENERIC_GLOBAL_DEF(m_app_hid_generic, hid_report_descriptors_raw_device, LOGITACKER_USB_HID_GENERIC_REPORT_IN_QUEUE_SIZE, LOGITACKER_USB_HID_GENERIC_OUT_REPORT_MAXSIZE, + LOGITACKER_USB_HID_GENERIC_REPORT_FEATURE_MAXSIZE, APP_USBD_HID_SUBCLASS_BOOT, APP_USBD_HID_PROTO_GENERIC); @@ -65,6 +66,7 @@ APP_USBD_HID_GENERIC_GLOBAL_DEF(m_app_hid_keyboard, hid_report_descriptors_keyboard_device, LOGITACKER_USB_HID_KEYBOARD_REPORT_IN_QUEUE_SIZE, LOGITACKER_USB_HID_KEYBOARD_OUT_REPORT_MAXSIZE, + LOGITACKER_USB_HID_GENERIC_REPORT_FEATURE_MAXSIZE, APP_USBD_HID_SUBCLASS_BOOT, APP_USBD_HID_PROTO_KEYBOARD); @@ -85,6 +87,7 @@ APP_USBD_HID_GENERIC_GLOBAL_DEF(m_app_hid_mouse, hid_report_descriptors_mouse_device, LOGITACKER_USB_HID_MOUSE_REPORT_IN_QUEUE_SIZE, 1, + LOGITACKER_USB_HID_GENERIC_REPORT_FEATURE_MAXSIZE, APP_USBD_HID_SUBCLASS_BOOT, APP_USBD_HID_PROTO_MOUSE); diff --git a/logitacker/logitacker_usb.h b/logitacker/logitacker_usb.h index 52f33b4..1c30b18 100644 --- a/logitacker/logitacker_usb.h +++ b/logitacker/logitacker_usb.h @@ -69,7 +69,8 @@ typedef enum { #define LOGITACKER_USB_HID_GENERIC_INTERFACE 2 // HID generic class interface number. #define LOGITACKER_USB_HID_GENERIC_EPIN NRF_DRV_USBD_EPIN3 // HID generic class endpoint number. #define LOGITACKER_USB_HID_GENERIC_OUT_REPORT_MAXSIZE 64 -#define LOGITACKER_USB_HID_GENERIC_REPORT_IN_QUEUE_SIZE 4 // Number of reports defined in report descriptor. +#define LOGITACKER_USB_HID_GENERIC_REPORT_IN_QUEUE_SIZE 4 +#define LOGITACKER_USB_HID_GENERIC_REPORT_FEATURE_MAXSIZE 1 // Number of reports defined in report descriptor. #define LOGITACKER_USB_HID_GENERIC_IN_REPORT_MAXSIZE LOGITACKER_USB_HID_GENERIC_OUT_REPORT_MAXSIZE #define LOGITACKER_USB_HID_GENERIC_INTERFACE_ENDPOINT_LIST() \ ( \ diff --git a/mdk-dongle/blank/config/sdk_config.h b/mdk-dongle/blank/config/sdk_config.h index a7d14a5..a89e36b 100644 --- a/mdk-dongle/blank/config/sdk_config.h +++ b/mdk-dongle/blank/config/sdk_config.h @@ -1802,7 +1802,14 @@ #ifndef APP_USBD_DEVICE_VER_MINOR #define APP_USBD_DEVICE_VER_MINOR 0 #endif +// APP_USBD_DEVICE_VER_SUB - Sub-minor device version <0-9> + +// 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 // APP_USBD_CONFIG_SELF_POWERED - Self-powered device, as opposed to bus-powered. diff --git a/mdk/blank/config/sdk_config.h b/mdk/blank/config/sdk_config.h index dafeac1..d0f76d9 100644 --- a/mdk/blank/config/sdk_config.h +++ b/mdk/blank/config/sdk_config.h @@ -1802,6 +1802,14 @@ #ifndef APP_USBD_DEVICE_VER_MINOR #define APP_USBD_DEVICE_VER_MINOR 0 #endif +// APP_USBD_DEVICE_VER_SUB - Sub-minor device version <0-9> + + +// 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 // APP_USBD_CONFIG_SELF_POWERED - Self-powered device, as opposed to bus-powered. diff --git a/pca10059/blank/config/sdk_config.h b/pca10059/blank/config/sdk_config.h index 143a7db..ef7008f 100644 --- a/pca10059/blank/config/sdk_config.h +++ b/pca10059/blank/config/sdk_config.h @@ -1802,7 +1802,14 @@ #ifndef APP_USBD_DEVICE_VER_MINOR #define APP_USBD_DEVICE_VER_MINOR 0 #endif +// APP_USBD_DEVICE_VER_SUB - Sub-minor device version <0-9> + +// 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 // APP_USBD_CONFIG_SELF_POWERED - Self-powered device, as opposed to bus-powered.