diff --git a/applications/main/archive/helpers/archive_browser.c b/applications/main/archive/helpers/archive_browser.c index 9ff7e49ce..988124e0b 100644 --- a/applications/main/archive/helpers/archive_browser.c +++ b/applications/main/archive/helpers/archive_browser.c @@ -64,13 +64,7 @@ static void archive_add_file_item(browser, is_folder, furi_string_get_cstr(item_path)); } else { with_view_model( - browser->view, - ArchiveBrowserViewModel * model, - { - files_array_sort(model->files); - model->list_loading = false; - }, - true); + browser->view, ArchiveBrowserViewModel * model, { model->list_loading = false; }, true); } } @@ -485,7 +479,7 @@ void archive_switch_tab(ArchiveBrowserView* browser, InputKey key) { // Hide dot files everywhere except Browser bool hide_dot_files = (strcmp(archive_get_tab_ext(tab), "*") == 0) ? false : true; archive_file_browser_set_path( - browser, browser->path, archive_get_tab_ext(tab), skip_assets, false); + browser, browser->path, archive_get_tab_ext(tab), skip_assets, hide_dot_files); tab_empty = false; // Empty check will be performed later } } @@ -533,4 +527,4 @@ void archive_refresh_dir(ArchiveBrowserView* browser) { with_view_model( browser->view, ArchiveBrowserViewModel * model, { idx_temp = model->item_idx; }, false); file_browser_worker_folder_refresh(browser->worker, idx_temp); -} +} \ No newline at end of file diff --git a/applications/main/nfc/nfc.c b/applications/main/nfc/nfc.c index 90fcf9f27..cf4584d7a 100644 --- a/applications/main/nfc/nfc.c +++ b/applications/main/nfc/nfc.c @@ -87,13 +87,6 @@ Nfc* nfc_alloc() { nfc->view_dispatcher, NfcViewTextBox, text_box_get_view(nfc->text_box)); nfc->text_box_store = furi_string_alloc(); - // Variable Item List - nfc->variable_item_list = variable_item_list_alloc(); - view_dispatcher_add_view( - nfc->view_dispatcher, - NfcViewVarItemList, - variable_item_list_get_view(nfc->variable_item_list)); - // Custom Widget nfc->widget = widget_alloc(); view_dispatcher_add_view(nfc->view_dispatcher, NfcViewWidget, widget_get_view(nfc->widget)); @@ -166,10 +159,6 @@ void nfc_free(Nfc* nfc) { text_box_free(nfc->text_box); furi_string_free(nfc->text_box_store); - // Variable Item List - view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewVarItemList); - variable_item_list_free(nfc->variable_item_list); - // Custom Widget view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewWidget); widget_free(nfc->widget); @@ -301,11 +290,6 @@ int32_t nfc_app(void* p) { } else if(nfc->dev->format == NfcDeviceSaveFormatMifareClassic) { scene_manager_next_scene(nfc->scene_manager, NfcSceneMfClassicEmulate); DOLPHIN_DEED(DolphinDeedNfcEmulate); - } else if(nfc->dev->format == NfcDeviceSaveFormatNfcV) { - scene_manager_next_scene(nfc->scene_manager, NfcSceneEmulateNfcV); - DOLPHIN_DEED(DolphinDeedNfcEmulate); - } else if(nfc->dev->format == NfcDeviceSaveFormatBankCard) { - scene_manager_next_scene(nfc->scene_manager, NfcSceneDeviceInfo); } else { scene_manager_next_scene(nfc->scene_manager, NfcSceneEmulateUid); DOLPHIN_DEED(DolphinDeedNfcEmulate); diff --git a/applications/main/nfc/nfc_i.h b/applications/main/nfc/nfc_i.h index a3a62972c..f7e489902 100644 --- a/applications/main/nfc/nfc_i.h +++ b/applications/main/nfc/nfc_i.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include @@ -78,7 +77,6 @@ struct Nfc { TextInput* text_input; ByteInput* byte_input; TextBox* text_box; - VariableItemList* variable_item_list; Widget* widget; DictAttack* dict_attack; DetectReader* detect_reader; @@ -94,7 +92,6 @@ typedef enum { NfcViewTextInput, NfcViewByteInput, NfcViewTextBox, - NfcViewVarItemList, NfcViewWidget, NfcViewDictAttack, NfcViewDetectReader, diff --git a/applications/main/nfc/scenes/nfc_scene_config.h b/applications/main/nfc/scenes/nfc_scene_config.h index 045080fea..ce51d000d 100644 --- a/applications/main/nfc/scenes/nfc_scene_config.h +++ b/applications/main/nfc/scenes/nfc_scene_config.h @@ -14,11 +14,6 @@ ADD_SCENE(nfc, file_select, FileSelect) ADD_SCENE(nfc, emulate_uid, EmulateUid) ADD_SCENE(nfc, nfca_read_success, NfcaReadSuccess) ADD_SCENE(nfc, nfca_menu, NfcaMenu) -ADD_SCENE(nfc, nfcv_menu, NfcVMenu) -ADD_SCENE(nfc, nfcv_unlock_menu, NfcVUnlockMenu) -ADD_SCENE(nfc, nfcv_key_input, NfcVKeyInput) -ADD_SCENE(nfc, nfcv_unlock, NfcVUnlock) -ADD_SCENE(nfc, emulate_nfcv, EmulateNfcV) ADD_SCENE(nfc, mf_ultralight_read_success, MfUltralightReadSuccess) ADD_SCENE(nfc, mf_ultralight_data, MfUltralightData) ADD_SCENE(nfc, mf_ultralight_menu, MfUltralightMenu) @@ -50,14 +45,6 @@ ADD_SCENE(nfc, mf_classic_update_success, MfClassicUpdateSuccess) ADD_SCENE(nfc, mf_classic_wrong_card, MfClassicWrongCard) ADD_SCENE(nfc, emv_read_success, EmvReadSuccess) ADD_SCENE(nfc, emv_menu, EmvMenu) -ADD_SCENE(nfc, passport_read, PassportReadSuccess) -ADD_SCENE(nfc, passport_read_auth, PassportReadAuthSuccess) -ADD_SCENE(nfc, passport_menu, PassportMenu) -ADD_SCENE(nfc, passport_auth, PassportAuth) -ADD_SCENE(nfc, passport_auth_save_name, PassportAuthSaveName) -ADD_SCENE(nfc, passport_date, PassportDate) -ADD_SCENE(nfc, passport_docnr, PassportDocNr) -ADD_SCENE(nfc, passport_pace_todo, PassportPaceTodo) ADD_SCENE(nfc, emulate_apdu_sequence, EmulateApduSequence) ADD_SCENE(nfc, device_info, DeviceInfo) ADD_SCENE(nfc, delete, Delete) diff --git a/applications/main/nfc/scenes/nfc_scene_emulate_nfcv.c b/applications/main/nfc/scenes/nfc_scene_emulate_nfcv.c deleted file mode 100644 index e6fc60d86..000000000 --- a/applications/main/nfc/scenes/nfc_scene_emulate_nfcv.c +++ /dev/null @@ -1,149 +0,0 @@ -#include "../nfc_i.h" - -#define NFC_SCENE_EMULATE_NFCV_LOG_SIZE_MAX (100) - -enum { - NfcSceneEmulateNfcVStateWidget, - NfcSceneEmulateNfcVStateTextBox, -}; - -bool nfc_emulate_nfcv_worker_callback(NfcWorkerEvent event, void* context) { - UNUSED(event); - furi_assert(context); - Nfc* nfc = context; - view_dispatcher_send_custom_event(nfc->view_dispatcher, NfcCustomEventWorkerExit); - return true; -} - -void nfc_scene_emulate_nfcv_widget_callback(GuiButtonType result, InputType type, void* context) { - furi_assert(context); - Nfc* nfc = context; - if(type == InputTypeShort) { - view_dispatcher_send_custom_event(nfc->view_dispatcher, result); - } -} - -void nfc_emulate_nfcv_textbox_callback(void* context) { - furi_assert(context); - Nfc* nfc = context; - view_dispatcher_send_custom_event(nfc->view_dispatcher, NfcCustomEventViewExit); -} - -// Add widget with device name or inform that data received -static void nfc_scene_emulate_nfcv_widget_config(Nfc* nfc, bool data_received) { - FuriHalNfcDevData* data = &nfc->dev->dev_data.nfc_data; - Widget* widget = nfc->widget; - widget_reset(widget); - FuriString* info_str; - info_str = furi_string_alloc(); - - widget_add_icon_element(widget, 0, 3, &I_RFIDDolphinSend_97x61); - widget_add_string_element( - widget, 89, 32, AlignCenter, AlignTop, FontPrimary, "Emulating NfcV"); - if(strcmp(nfc->dev->dev_name, "")) { - furi_string_printf(info_str, "%s", nfc->dev->dev_name); - } else { - for(uint8_t i = 0; i < data->uid_len; i++) { - furi_string_cat_printf(info_str, "%02X ", data->uid[i]); - } - } - furi_string_trim(info_str); - widget_add_text_box_element( - widget, 56, 43, 70, 21, AlignCenter, AlignTop, furi_string_get_cstr(info_str), true); - furi_string_free(info_str); - if(data_received) { - widget_add_button_element( - widget, GuiButtonTypeCenter, "Log", nfc_scene_emulate_nfcv_widget_callback, nfc); - } -} - -void nfc_scene_emulate_nfcv_on_enter(void* context) { - Nfc* nfc = context; - - // Setup Widget - nfc_scene_emulate_nfcv_widget_config(nfc, false); - // Setup TextBox - TextBox* text_box = nfc->text_box; - text_box_set_font(text_box, TextBoxFontHex); - text_box_set_focus(text_box, TextBoxFocusEnd); - furi_string_reset(nfc->text_box_store); - - // Set Widget state and view - scene_manager_set_scene_state( - nfc->scene_manager, NfcSceneEmulateNfcV, NfcSceneEmulateNfcVStateWidget); - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewWidget); - // Start worker - memset(&nfc->dev->dev_data.reader_data, 0, sizeof(NfcReaderRequestData)); - nfc_worker_start( - nfc->worker, - NfcWorkerStateNfcVEmulate, - &nfc->dev->dev_data, - nfc_emulate_nfcv_worker_callback, - nfc); - - nfc_blink_emulate_start(nfc); -} - -bool nfc_scene_emulate_nfcv_on_event(void* context, SceneManagerEvent event) { - Nfc* nfc = context; - NfcVData* nfcv_data = &nfc->dev->dev_data.nfcv_data; - uint32_t state = scene_manager_get_scene_state(nfc->scene_manager, NfcSceneEmulateNfcV); - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - if(event.event == NfcCustomEventWorkerExit) { - // Add data button to widget if data is received for the first time - if(!furi_string_size(nfc->text_box_store)) { - nfc_scene_emulate_nfcv_widget_config(nfc, true); - } - if(strlen(nfcv_data->last_command) > 0) { - /* use the last n bytes from the log so there's enough space for the new log entry */ - size_t maxSize = - NFC_SCENE_EMULATE_NFCV_LOG_SIZE_MAX - (strlen(nfcv_data->last_command) + 1); - if(furi_string_size(nfc->text_box_store) >= maxSize) { - furi_string_right(nfc->text_box_store, (strlen(nfcv_data->last_command) + 1)); - } - furi_string_cat_printf(nfc->text_box_store, "%s", nfcv_data->last_command); - furi_string_push_back(nfc->text_box_store, '\n'); - text_box_set_text(nfc->text_box, furi_string_get_cstr(nfc->text_box_store)); - - /* clear previously logged command */ - strcpy(nfcv_data->last_command, ""); - } - consumed = true; - } else if(event.event == GuiButtonTypeCenter && state == NfcSceneEmulateNfcVStateWidget) { - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewTextBox); - scene_manager_set_scene_state( - nfc->scene_manager, NfcSceneEmulateNfcV, NfcSceneEmulateNfcVStateTextBox); - consumed = true; - } else if(event.event == NfcCustomEventViewExit && state == NfcSceneEmulateNfcVStateTextBox) { - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewWidget); - scene_manager_set_scene_state( - nfc->scene_manager, NfcSceneEmulateNfcV, NfcSceneEmulateNfcVStateWidget); - consumed = true; - } - } else if(event.type == SceneManagerEventTypeBack) { - if(state == NfcSceneEmulateNfcVStateTextBox) { - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewWidget); - scene_manager_set_scene_state( - nfc->scene_manager, NfcSceneEmulateNfcV, NfcSceneEmulateNfcVStateWidget); - consumed = true; - } - } - - return consumed; -} - -void nfc_scene_emulate_nfcv_on_exit(void* context) { - Nfc* nfc = context; - - // Stop worker - nfc_worker_stop(nfc->worker); - - // Clear view - widget_reset(nfc->widget); - text_box_reset(nfc->text_box); - furi_string_reset(nfc->text_box_store); - - nfc_blink_stop(nfc); -} diff --git a/applications/main/nfc/scenes/nfc_scene_extra_actions.c b/applications/main/nfc/scenes/nfc_scene_extra_actions.c index 147c89757..717e8efc4 100644 --- a/applications/main/nfc/scenes/nfc_scene_extra_actions.c +++ b/applications/main/nfc/scenes/nfc_scene_extra_actions.c @@ -4,7 +4,6 @@ enum SubmenuIndex { SubmenuIndexReadCardType, SubmenuIndexMfClassicKeys, SubmenuIndexMfUltralightUnlock, - SubmenuIndexNfcVUnlock, }; void nfc_scene_extra_actions_submenu_callback(void* context, uint32_t index) { @@ -35,12 +34,6 @@ void nfc_scene_extra_actions_on_enter(void* context) { SubmenuIndexMfUltralightUnlock, nfc_scene_extra_actions_submenu_callback, nfc); - submenu_add_item( - submenu, - "Unlock SLIX-L", - SubmenuIndexNfcVUnlock, - nfc_scene_extra_actions_submenu_callback, - nfc); view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewMenu); } @@ -63,9 +56,6 @@ bool nfc_scene_extra_actions_on_event(void* context, SceneManagerEvent event) { scene_manager_set_scene_state(nfc->scene_manager, NfcSceneReadCardType, 0); scene_manager_next_scene(nfc->scene_manager, NfcSceneReadCardType); consumed = true; - } else if(event.event == SubmenuIndexNfcVUnlock) { - scene_manager_next_scene(nfc->scene_manager, NfcSceneNfcVUnlockMenu); - consumed = true; } scene_manager_set_scene_state(nfc->scene_manager, NfcSceneExtraActions, event.event); } diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_dict_attack.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_dict_attack.c index 9b477e301..b82bf5521 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_classic_dict_attack.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_dict_attack.c @@ -58,7 +58,7 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(Nfc* nfc, DictAttackSt // If failed to load user dictionary - try the system dictionary if(!dict) { - FURI_LOG_E(TAG, "User Dictionary Not Found"); + FURI_LOG_E(TAG, "User dictionary not found"); state = DictAttackStateFlipperDictInProgress; } } @@ -67,8 +67,8 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(Nfc* nfc, DictAttackSt dict_attack_set_header(nfc->dict_attack, "MF Classic System Dictionary"); dict = mf_classic_dict_alloc(MfClassicDictTypeSystem); if(!dict) { - FURI_LOG_E(TAG, "Flipper Dictionary Not Found"); - // Pass through to let worker handle the failure + FURI_LOG_E(TAG, "Flipper dictionary not found"); + // Pass through to let the worker handle the failure } } // Free previous dictionary diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_keys.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_keys.c index 8b61904b4..8a7dc2c18 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_classic_keys.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_keys.c @@ -28,9 +28,9 @@ void nfc_scene_mf_classic_keys_on_enter(void* context) { widget_add_string_element( nfc->widget, 0, 0, AlignLeft, AlignTop, FontPrimary, "MIFARE Classic Keys"); char temp_str[32]; - snprintf(temp_str, sizeof(temp_str), "System Dict: %ld", flipper_dict_keys_total); + snprintf(temp_str, sizeof(temp_str), "System dict: %lu", flipper_dict_keys_total); widget_add_string_element(nfc->widget, 0, 20, AlignLeft, AlignTop, FontSecondary, temp_str); - snprintf(temp_str, sizeof(temp_str), "User Dict: %ld", user_dict_keys_total); + snprintf(temp_str, sizeof(temp_str), "User dict: %lu", user_dict_keys_total); widget_add_string_element(nfc->widget, 0, 32, AlignLeft, AlignTop, FontSecondary, temp_str); widget_add_button_element( nfc->widget, GuiButtonTypeCenter, "Add", nfc_scene_mf_classic_keys_widget_callback, nfc); diff --git a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c index e4e2a4493..9d8f17f9a 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c @@ -1,103 +1,20 @@ #include "../nfc_i.h" -#include - -#define NFC_SCENE_MF_ULTRALIGHT_EMULATE_LOG_SIZE_MAX (200) #define NFC_MF_UL_DATA_NOT_CHANGED (0UL) #define NFC_MF_UL_DATA_CHANGED (1UL) -enum { - // View states - NfcSceneMfUltralightEmulateStateWidget, - NfcSceneMfUltralightEmulateStateTextBox, - NfcSceneMfUltralightEmulateStateMax = 0xFF, - // State flags - NfcSceneMfUltralightEmulateStateDataChanged = 1 << 8, - NfcSceneMfUltralightEmulateStateAuthAttempted = 1 << 9, - NfcSceneMfUltralightEmulateStateLogButtonShown = 1 << 10, -}; - bool nfc_mf_ultralight_emulate_worker_callback(NfcWorkerEvent event, void* context) { + UNUSED(event); Nfc* nfc = context; - uint32_t state = - scene_manager_get_scene_state(nfc->scene_manager, NfcSceneMfUltralightEmulate); - - if(event == NfcWorkerEventSuccess) - state |= NfcSceneMfUltralightEmulateStateDataChanged; - else if(event == NfcWorkerEventMfUltralightPwdAuth) { - // Don't update if we're exiting - if(nfc_worker_get_state(nfc->worker) != NfcWorkerStateStop) { - // Event data is only available for the duration of this callback, so we're updating the - // text box right here - MfUltralightAuth* auth = nfc_worker_get_event_data(nfc->worker); - if(auth != NULL && furi_string_size(nfc->text_box_store) < - NFC_SCENE_MF_ULTRALIGHT_EMULATE_LOG_SIZE_MAX) { - furi_string_cat(nfc->text_box_store, "PWD:"); - for(size_t i = 0; i < sizeof(auth->pwd.raw); ++i) { - furi_string_cat_printf(nfc->text_box_store, " %02X", auth->pwd.raw[i]); - } - furi_string_push_back(nfc->text_box_store, '\n'); - text_box_set_text(nfc->text_box, furi_string_get_cstr(nfc->text_box_store)); - } - state |= NfcSceneMfUltralightEmulateStateAuthAttempted; - } - } - scene_manager_set_scene_state(nfc->scene_manager, NfcSceneMfUltralightEmulate, state); - view_dispatcher_send_custom_event(nfc->view_dispatcher, NfcCustomEventWorkerExit); + scene_manager_set_scene_state( + nfc->scene_manager, NfcSceneMfUltralightEmulate, NFC_MF_UL_DATA_CHANGED); return true; } -void nfc_scene_mf_ultralight_emulate_widget_callback( - GuiButtonType result, - InputType type, - void* context) { - furi_assert(context); - Nfc* nfc = context; - if(type == InputTypeShort) { - view_dispatcher_send_custom_event(nfc->view_dispatcher, result); - } -} - -void nfc_scene_mf_ultralight_emulate_widget_config(Nfc* nfc, bool auth_attempted) { - Widget* widget = nfc->widget; - widget_reset(widget); - FuriString* info_str; - info_str = furi_string_alloc(); - - widget_add_icon_element(widget, 0, 3, &I_RFIDDolphinSend_97x61); - if(strcmp(nfc->dev->dev_name, "")) { - furi_string_printf(info_str, "Emulating\n%s", nfc->dev->dev_name); - } else { - furi_string_printf(info_str, "Emulating\nMf Ultralight"); - } - - widget_add_string_multiline_element( - widget, 56, 31, AlignLeft, AlignTop, FontPrimary, furi_string_get_cstr(info_str)); - furi_string_free(info_str); - if(auth_attempted) { - widget_add_button_element( - widget, - GuiButtonTypeCenter, - "Log", - nfc_scene_mf_ultralight_emulate_widget_callback, - nfc); - } -} - void nfc_scene_mf_ultralight_emulate_on_enter(void* context) { Nfc* nfc = context; - uint32_t state = - scene_manager_get_scene_state(nfc->scene_manager, NfcSceneMfUltralightEmulate); - // Setup Widget - nfc_scene_mf_ultralight_emulate_widget_config(nfc, false); - state &= ~NfcSceneMfUltralightEmulateStateLogButtonShown; - // Setup TextBox - TextBox* text_box = nfc->text_box; - text_box_set_font(text_box, TextBoxFontHex); - text_box_set_focus(text_box, TextBoxFocusEnd); - furi_string_reset(nfc->text_box_store); // Setup view MfUltralightType type = nfc->dev->dev_data.mf_ul_data.type; bool is_ultralight = (type == MfUltralightTypeUL11) || (type == MfUltralightTypeUL21) || @@ -114,12 +31,8 @@ void nfc_scene_mf_ultralight_emulate_on_enter(void* context) { popup_set_icon(popup, 0, 3, &I_NFC_dolphin_emulation_47x61); popup_set_text(popup, nfc->text_store, 90, 28, AlignCenter, AlignTop); - // Set Widget state and view - state = (state & ~NfcSceneMfUltralightEmulateStateMax) | - NfcSceneMfUltralightEmulateStateWidget; - scene_manager_set_scene_state(nfc->scene_manager, NfcSceneMfUltralightEmulate, state); - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewWidget); - // Start worker + // Setup and start worker + view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewPopup); nfc_worker_start( nfc->worker, NfcWorkerStateMfUltralightEmulate, @@ -131,8 +44,6 @@ void nfc_scene_mf_ultralight_emulate_on_enter(void* context) { bool nfc_scene_mf_ultralight_emulate_on_event(void* context, SceneManagerEvent event) { Nfc* nfc = context; - uint32_t state = - scene_manager_get_scene_state(nfc->scene_manager, NfcSceneMfUltralightEmulate); bool consumed = false; if(event.type == SceneManagerEventTypeBack) { @@ -148,28 +59,16 @@ bool nfc_scene_mf_ultralight_emulate_on_event(void* context, SceneManagerEvent e nfc_device_save_shadow(nfc->dev, furi_string_get_cstr(nfc->dev->load_path)); } } + consumed = false; } return consumed; } void nfc_scene_mf_ultralight_emulate_on_exit(void* context) { Nfc* nfc = context; - uint32_t state = - scene_manager_get_scene_state(nfc->scene_manager, NfcSceneMfUltralightEmulate); - - // Stop worker - nfc_worker_stop(nfc->worker); - // Check if data changed and save in shadow file - if(state & NfcSceneMfUltralightEmulateStateDataChanged) { - state &= ~NfcSceneMfUltralightEmulateStateDataChanged; - scene_manager_set_scene_state(nfc->scene_manager, NfcSceneMfUltralightEmulate, state); - nfc_device_save_shadow(nfc->dev, nfc->dev->dev_name); - } // Clear view - widget_reset(nfc->widget); - text_box_reset(nfc->text_box); - furi_string_reset(nfc->text_box_store); + popup_reset(nfc->popup); nfc_blink_stop(nfc); } diff --git a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_key_input.c b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_key_input.c index 174d1a406..089187d5b 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_key_input.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_key_input.c @@ -11,7 +11,7 @@ void nfc_scene_mf_ultralight_key_input_on_enter(void* context) { // Setup view ByteInput* byte_input = nfc->byte_input; - byte_input_set_header_text(byte_input, "Enter The Password In Hex"); + byte_input_set_header_text(byte_input, "Enter the password in hex"); byte_input_set_result_callback( byte_input, nfc_scene_mf_ultralight_key_input_byte_input_callback, diff --git a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_menu.c b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_menu.c index ddf30c54a..c511e9dcb 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_menu.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_menu.c @@ -2,8 +2,7 @@ #include enum SubmenuIndex { - SubmenuIndexUnlockByReader, - SubmenuIndexUnlockByPassword, + SubmenuIndexUnlock, SubmenuIndexSave, SubmenuIndexEmulate, SubmenuIndexInfo, @@ -23,14 +22,8 @@ void nfc_scene_mf_ultralight_menu_on_enter(void* context) { if(!mf_ul_is_full_capture(data)) { submenu_add_item( submenu, - "Unlock With Reader", - SubmenuIndexUnlockByReader, - nfc_scene_mf_ultralight_menu_submenu_callback, - nfc); - submenu_add_item( - submenu, - "Unlock With Password", - SubmenuIndexUnlockByPassword, + "Unlock", + SubmenuIndexUnlock, nfc_scene_mf_ultralight_menu_submenu_callback, nfc); } @@ -70,10 +63,7 @@ bool nfc_scene_mf_ultralight_menu_on_event(void* context, SceneManagerEvent even DOLPHIN_DEED(DolphinDeedNfcEmulate); } consumed = true; - } else if(event.event == SubmenuIndexUnlockByReader) { - scene_manager_next_scene(nfc->scene_manager, NfcSceneMfUltralightUnlockAuto); - consumed = true; - } else if(event.event == SubmenuIndexUnlockByPassword) { + } else if(event.event == SubmenuIndexUnlock) { scene_manager_next_scene(nfc->scene_manager, NfcSceneMfUltralightUnlockMenu); consumed = true; } else if(event.event == SubmenuIndexInfo) { diff --git a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_read_auth.c b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_read_auth.c index 8e2dd0c22..2ab5e3f3f 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_read_auth.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_read_auth.c @@ -24,22 +24,21 @@ void nfc_scene_mf_ultralight_read_auth_set_state(Nfc* nfc, NfcSceneMfUlReadState if(curr_state != state) { if(state == NfcSceneMfUlReadStateDetecting) { popup_reset(nfc->popup); - popup_set_text( - nfc->popup, "Apply Card To\nFlipper's Back", 97, 24, AlignCenter, AlignTop); + popup_set_text(nfc->popup, "Apply the\ntarget card", 97, 24, AlignCenter, AlignTop); popup_set_icon(nfc->popup, 0, 8, &I_NFC_manual_60x50); nfc_blink_read_start(nfc); } else if(state == NfcSceneMfUlReadStateReading) { popup_reset(nfc->popup); popup_set_header( - nfc->popup, "Reading Card\nDon't Move...", 85, 24, AlignCenter, AlignTop); + nfc->popup, "Reading card\nDon't move...", 85, 24, AlignCenter, AlignTop); popup_set_icon(nfc->popup, 12, 23, &A_Loading_24); nfc_blink_detect_start(nfc); } else if(state == NfcSceneMfUlReadStateNotSupportedCard) { popup_reset(nfc->popup); - popup_set_header(nfc->popup, "Wrong Type Of Card!", 64, 3, AlignCenter, AlignTop); + popup_set_header(nfc->popup, "Wrong type of card!", 64, 3, AlignCenter, AlignTop); popup_set_text( nfc->popup, - "Only MIFARE\nUltralight & NTAG\n Are Supported", + "Only MIFARE\nUltralight & NTAG\nare supported", 4, 22, AlignLeft, diff --git a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_auto.c b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_auto.c index 050f6db1e..c59fe3a7d 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_auto.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_unlock_auto.c @@ -31,7 +31,7 @@ void nfc_scene_mf_ultralight_unlock_auto_on_enter(void* context) { nfc_scene_mf_ultralight_unlock_auto_worker_callback, nfc); - nfc_blink_emulate_start(nfc); + nfc_blink_read_start(nfc); } bool nfc_scene_mf_ultralight_unlock_auto_on_event(void* context, SceneManagerEvent event) { @@ -58,7 +58,6 @@ void nfc_scene_mf_ultralight_unlock_auto_on_exit(void* context) { // Stop worker nfc_worker_stop(nfc->worker); // Clear view - popup_reset(nfc->popup); widget_reset(nfc->widget); nfc_blink_stop(nfc); diff --git a/applications/main/nfc/scenes/nfc_scene_nfc_data_info.c b/applications/main/nfc/scenes/nfc_scene_nfc_data_info.c index 372da8860..b44ab7823 100644 --- a/applications/main/nfc/scenes/nfc_scene_nfc_data_info.c +++ b/applications/main/nfc/scenes/nfc_scene_nfc_data_info.c @@ -7,17 +7,6 @@ void nfc_scene_nfc_data_info_widget_callback(GuiButtonType result, InputType typ } } -uint32_t nfc_scene_nfc_data_info_get_key(uint8_t* data) { - uint32_t value = 0; - - for(uint32_t pos = 0; pos < 4; pos++) { - value <<= 8; - value |= data[pos]; - } - - return value; -} - void nfc_scene_nfc_data_info_on_enter(void* context) { Nfc* nfc = context; Widget* widget = nfc->widget; @@ -25,8 +14,7 @@ void nfc_scene_nfc_data_info_on_enter(void* context) { NfcDeviceData* dev_data = &nfc->dev->dev_data; NfcProtocol protocol = dev_data->protocol; uint8_t text_scroll_height = 0; - if((protocol == NfcDeviceProtocolMifareDesfire) || (protocol == NfcDeviceProtocolMifareUl) || - (protocol == NfcDeviceProtocolNfcV)) { + if((protocol == NfcDeviceProtocolMifareDesfire) || (protocol == NfcDeviceProtocolMifareUl)) { widget_add_button_element( widget, GuiButtonTypeRight, "More", nfc_scene_nfc_data_info_widget_callback, nfc); text_scroll_height = 52; @@ -44,8 +32,6 @@ void nfc_scene_nfc_data_info_on_enter(void* context) { // Set tag type if(protocol == NfcDeviceProtocolEMV) { furi_string_cat_printf(temp_str, "\e#EMV Bank Card\n"); - } else if(protocol == NfcDeviceProtocolMRTD) { - furi_string_cat_printf(temp_str, "\e#Passport/ID\n"); } else if(protocol == NfcDeviceProtocolMifareUl) { furi_string_cat_printf( temp_str, "\e#%s\n", nfc_mf_ul_type(dev_data->mf_ul_data.type, true)); @@ -54,156 +40,19 @@ void nfc_scene_nfc_data_info_on_enter(void* context) { temp_str, "\e#%s\n", nfc_mf_classic_type(dev_data->mf_classic_data.type)); } else if(protocol == NfcDeviceProtocolMifareDesfire) { furi_string_cat_printf(temp_str, "\e#MIFARE DESfire\n"); - } else if(protocol == NfcDeviceProtocolNfcV) { - switch(dev_data->nfcv_data.sub_type) { - case NfcVTypePlain: - furi_string_cat_printf(temp_str, "\e#ISO15693\n"); - break; - case NfcVTypeSlix: - furi_string_cat_printf(temp_str, "\e#ISO15693 SLIX\n"); - break; - case NfcVTypeSlixS: - furi_string_cat_printf(temp_str, "\e#ISO15693 SLIX-S\n"); - break; - case NfcVTypeSlixL: - furi_string_cat_printf(temp_str, "\e#ISO15693 SLIX-L\n"); - break; - case NfcVTypeSlix2: - furi_string_cat_printf(temp_str, "\e#ISO15693 SLIX2\n"); - break; - default: - furi_string_cat_printf(temp_str, "\e#ISO15693 (unknown)\n"); - break; - } } else { furi_string_cat_printf(temp_str, "\e#Unknown ISO tag\n"); } // Set tag iso data - if(protocol == NfcDeviceProtocolNfcV) { - NfcVData* nfcv_data = &nfc->dev->dev_data.nfcv_data; - - furi_string_cat_printf(temp_str, "UID:\n"); - for(size_t i = 0; i < nfc_data->uid_len; i++) { - furi_string_cat_printf(temp_str, " %02X", nfc_data->uid[i]); - } - furi_string_cat_printf(temp_str, "\n"); - - furi_string_cat_printf(temp_str, "DSFID: %02X\n", nfcv_data->dsfid); - furi_string_cat_printf(temp_str, "AFI: %02X\n", nfcv_data->afi); - furi_string_cat_printf(temp_str, "IC Ref: %02X\n", nfcv_data->ic_ref); - furi_string_cat_printf(temp_str, "Blocks: %02X\n", nfcv_data->block_num); - furi_string_cat_printf(temp_str, "Blocksize: %02X\n", nfcv_data->block_size); - - furi_string_cat_printf( - temp_str, "Data (%d byte)\n", nfcv_data->block_num * nfcv_data->block_size); - - int maxBlocks = nfcv_data->block_num; - if(maxBlocks > 32) { - maxBlocks = 32; - furi_string_cat_printf(temp_str, "(truncated to %d blocks)\n", maxBlocks); - } - - for(int block = 0; block < maxBlocks; block++) { - for(int pos = 0; pos < nfcv_data->block_size; pos++) { - furi_string_cat_printf( - temp_str, " %02X", nfcv_data->data[block * nfcv_data->block_size + pos]); - } - furi_string_cat_printf(temp_str, "\n"); - } - furi_string_cat_printf(temp_str, "\n"); - - switch(dev_data->nfcv_data.sub_type) { - case NfcVTypePlain: - furi_string_cat_printf(temp_str, "Type: Plain\n"); - break; - case NfcVTypeSlix: - furi_string_cat_printf(temp_str, "Type: SLIX\n"); - furi_string_cat_printf(temp_str, "Keys:\n"); - furi_string_cat_printf( - temp_str, - " EAS %08lX\n", - nfc_scene_nfc_data_info_get_key(nfcv_data->sub_data.slix.key_eas)); - break; - case NfcVTypeSlixS: - furi_string_cat_printf(temp_str, "Type: SLIX-S\n"); - furi_string_cat_printf(temp_str, "Keys:\n"); - furi_string_cat_printf( - temp_str, - " Read %08lX\n", - nfc_scene_nfc_data_info_get_key(nfcv_data->sub_data.slix.key_read)); - furi_string_cat_printf( - temp_str, - " Write %08lX\n", - nfc_scene_nfc_data_info_get_key(nfcv_data->sub_data.slix.key_write)); - furi_string_cat_printf( - temp_str, - " Privacy %08lX\n", - nfc_scene_nfc_data_info_get_key(nfcv_data->sub_data.slix.key_privacy)); - furi_string_cat_printf( - temp_str, - " Destroy %08lX\n", - nfc_scene_nfc_data_info_get_key(nfcv_data->sub_data.slix.key_destroy)); - furi_string_cat_printf( - temp_str, - " EAS %08lX\n", - nfc_scene_nfc_data_info_get_key(nfcv_data->sub_data.slix.key_eas)); - break; - case NfcVTypeSlixL: - furi_string_cat_printf(temp_str, "Type: SLIX-L\n"); - furi_string_cat_printf(temp_str, "Keys:\n"); - furi_string_cat_printf( - temp_str, - " Privacy %08lX\n", - nfc_scene_nfc_data_info_get_key(nfcv_data->sub_data.slix.key_privacy)); - furi_string_cat_printf( - temp_str, - " Destroy %08lX\n", - nfc_scene_nfc_data_info_get_key(nfcv_data->sub_data.slix.key_destroy)); - furi_string_cat_printf( - temp_str, - " EAS %08lX\n", - nfc_scene_nfc_data_info_get_key(nfcv_data->sub_data.slix.key_eas)); - break; - case NfcVTypeSlix2: - furi_string_cat_printf(temp_str, "Type: SLIX2\n"); - furi_string_cat_printf(temp_str, "Keys:\n"); - furi_string_cat_printf( - temp_str, - " Read %08lX\n", - nfc_scene_nfc_data_info_get_key(nfcv_data->sub_data.slix.key_read)); - furi_string_cat_printf( - temp_str, - " Write %08lX\n", - nfc_scene_nfc_data_info_get_key(nfcv_data->sub_data.slix.key_write)); - furi_string_cat_printf( - temp_str, - " Privacy %08lX\n", - nfc_scene_nfc_data_info_get_key(nfcv_data->sub_data.slix.key_privacy)); - furi_string_cat_printf( - temp_str, - " Destroy %08lX\n", - nfc_scene_nfc_data_info_get_key(nfcv_data->sub_data.slix.key_destroy)); - furi_string_cat_printf( - temp_str, - " EAS %08lX\n", - nfc_scene_nfc_data_info_get_key(nfcv_data->sub_data.slix.key_eas)); - break; - default: - furi_string_cat_printf(temp_str, "\e#ISO15693 (unknown)\n"); - break; - } - } else { - char iso_type = FURI_BIT(nfc_data->sak, 5) ? '4' : '3'; - furi_string_cat_printf(temp_str, "ISO 14443-%c (NFC-A)\n", iso_type); - furi_string_cat_printf(temp_str, "UID:"); - for(size_t i = 0; i < nfc_data->uid_len; i++) { - furi_string_cat_printf(temp_str, " %02X", nfc_data->uid[i]); - } - furi_string_cat_printf( - temp_str, "\nATQA: %02X %02X ", nfc_data->atqa[1], nfc_data->atqa[0]); - furi_string_cat_printf(temp_str, " SAK: %02X", nfc_data->sak); + char iso_type = FURI_BIT(nfc_data->sak, 5) ? '4' : '3'; + furi_string_cat_printf(temp_str, "ISO 14443-%c (NFC-A)\n", iso_type); + furi_string_cat_printf(temp_str, "UID:"); + for(size_t i = 0; i < nfc_data->uid_len; i++) { + furi_string_cat_printf(temp_str, " %02X", nfc_data->uid[i]); } + furi_string_cat_printf(temp_str, "\nATQA: %02X %02X ", nfc_data->atqa[1], nfc_data->atqa[0]); + furi_string_cat_printf(temp_str, " SAK: %02X", nfc_data->sak); // Set application specific data if(protocol == NfcDeviceProtocolMifareDesfire) { @@ -287,9 +136,6 @@ bool nfc_scene_nfc_data_info_on_event(void* context, SceneManagerEvent event) { } else if(protocol == NfcDeviceProtocolMifareUl) { scene_manager_next_scene(nfc->scene_manager, NfcSceneMfUltralightData); consumed = true; - } else if(protocol == NfcDeviceProtocolNfcV) { - scene_manager_next_scene(nfc->scene_manager, NfcSceneNfcVMenu); - consumed = true; } } } diff --git a/applications/main/nfc/scenes/nfc_scene_nfcv_key_input.c b/applications/main/nfc/scenes/nfc_scene_nfcv_key_input.c deleted file mode 100644 index cc53c4dcb..000000000 --- a/applications/main/nfc/scenes/nfc_scene_nfcv_key_input.c +++ /dev/null @@ -1,48 +0,0 @@ -#include "../nfc_i.h" -#include - -void nfc_scene_nfcv_key_input_byte_input_callback(void* context) { - Nfc* nfc = context; - NfcVSlixData* data = &nfc->dev->dev_data.nfcv_data.sub_data.slix; - - memcpy(data->key_privacy, nfc->byte_input_store, 4); - view_dispatcher_send_custom_event(nfc->view_dispatcher, NfcCustomEventByteInputDone); -} - -void nfc_scene_nfcv_key_input_on_enter(void* context) { - Nfc* nfc = context; - - // Setup view - ByteInput* byte_input = nfc->byte_input; - byte_input_set_header_text(byte_input, "Enter The Password In Hex"); - byte_input_set_result_callback( - byte_input, - nfc_scene_nfcv_key_input_byte_input_callback, - NULL, - nfc, - nfc->byte_input_store, - 4); - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewByteInput); -} - -bool nfc_scene_nfcv_key_input_on_event(void* context, SceneManagerEvent event) { - Nfc* nfc = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - if(event.event == NfcCustomEventByteInputDone) { - scene_manager_next_scene(nfc->scene_manager, NfcSceneNfcVUnlock); - DOLPHIN_DEED(DolphinDeedNfcRead); - consumed = true; - } - } - return consumed; -} - -void nfc_scene_nfcv_key_input_on_exit(void* context) { - Nfc* nfc = context; - - // Clear view - byte_input_set_result_callback(nfc->byte_input, NULL, NULL, NULL, NULL, 0); - byte_input_set_header_text(nfc->byte_input, ""); -} diff --git a/applications/main/nfc/scenes/nfc_scene_nfcv_menu.c b/applications/main/nfc/scenes/nfc_scene_nfcv_menu.c deleted file mode 100644 index b30495a05..000000000 --- a/applications/main/nfc/scenes/nfc_scene_nfcv_menu.c +++ /dev/null @@ -1,63 +0,0 @@ -#include "../nfc_i.h" -#include - -enum SubmenuIndex { - SubmenuIndexSave, - SubmenuIndexEmulate, -}; - -void nfc_scene_nfcv_menu_submenu_callback(void* context, uint32_t index) { - Nfc* nfc = context; - - view_dispatcher_send_custom_event(nfc->view_dispatcher, index); -} - -void nfc_scene_nfcv_menu_on_enter(void* context) { - Nfc* nfc = context; - Submenu* submenu = nfc->submenu; - - submenu_add_item(submenu, "Save", SubmenuIndexSave, nfc_scene_nfcv_menu_submenu_callback, nfc); - submenu_add_item( - submenu, "Emulate", SubmenuIndexEmulate, nfc_scene_nfcv_menu_submenu_callback, nfc); - - submenu_set_selected_item( - nfc->submenu, scene_manager_get_scene_state(nfc->scene_manager, NfcSceneNfcVMenu)); - - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewMenu); -} - -bool nfc_scene_nfcv_menu_on_event(void* context, SceneManagerEvent event) { - Nfc* nfc = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - if(event.event == SubmenuIndexSave) { - nfc->dev->format = NfcDeviceSaveFormatNfcV; - // Clear device name - nfc_device_set_name(nfc->dev, ""); - scene_manager_next_scene(nfc->scene_manager, NfcSceneSaveName); - consumed = true; - } else if(event.event == SubmenuIndexEmulate) { - scene_manager_next_scene(nfc->scene_manager, NfcSceneEmulateNfcV); - if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSetType)) { - DOLPHIN_DEED(DolphinDeedNfcAddEmulate); - } else { - DOLPHIN_DEED(DolphinDeedNfcEmulate); - } - consumed = true; - } - scene_manager_set_scene_state(nfc->scene_manager, NfcSceneNfcVMenu, event.event); - - } else if(event.type == SceneManagerEventTypeBack) { - consumed = scene_manager_previous_scene(nfc->scene_manager); - } - - return consumed; -} - -void nfc_scene_nfcv_menu_on_exit(void* context) { - Nfc* nfc = context; - - // Clear view - submenu_reset(nfc->submenu); -} diff --git a/applications/main/nfc/scenes/nfc_scene_nfcv_unlock.c b/applications/main/nfc/scenes/nfc_scene_nfcv_unlock.c deleted file mode 100644 index b52cc0caa..000000000 --- a/applications/main/nfc/scenes/nfc_scene_nfcv_unlock.c +++ /dev/null @@ -1,155 +0,0 @@ -#include "../nfc_i.h" -#include - -typedef enum { - NfcSceneNfcVUnlockStateIdle, - NfcSceneNfcVUnlockStateDetecting, - NfcSceneNfcVUnlockStateUnlocked, - NfcSceneNfcVUnlockStateAlreadyUnlocked, - NfcSceneNfcVUnlockStateNotSupportedCard, -} NfcSceneNfcVUnlockState; - -static bool nfc_scene_nfcv_unlock_worker_callback(NfcWorkerEvent event, void* context) { - Nfc* nfc = context; - NfcVSlixData* data = &nfc->dev->dev_data.nfcv_data.sub_data.slix; - - if(event == NfcWorkerEventNfcVPassKey) { - memcpy(data->key_privacy, nfc->byte_input_store, 4); - } else { - view_dispatcher_send_custom_event(nfc->view_dispatcher, event); - } - return true; -} - -void nfc_scene_nfcv_unlock_popup_callback(void* context) { - Nfc* nfc = context; - view_dispatcher_send_custom_event(nfc->view_dispatcher, NfcCustomEventViewExit); -} - -void nfc_scene_nfcv_unlock_set_state(Nfc* nfc, NfcSceneNfcVUnlockState state) { - FuriHalNfcDevData* nfc_data = &(nfc->dev->dev_data.nfc_data); - NfcVData* nfcv_data = &(nfc->dev->dev_data.nfcv_data); - - uint32_t curr_state = scene_manager_get_scene_state(nfc->scene_manager, NfcSceneNfcVUnlock); - if(curr_state != state) { - Popup* popup = nfc->popup; - if(state == NfcSceneNfcVUnlockStateDetecting) { - popup_reset(popup); - popup_set_text( - popup, "Put figurine on\nFlipper's back", 97, 24, AlignCenter, AlignTop); - popup_set_icon(popup, 0, 8, &I_NFC_manual_60x50); - } else if(state == NfcSceneNfcVUnlockStateUnlocked) { - popup_reset(popup); - - if(nfc_worker_get_state(nfc->worker) == NfcWorkerStateNfcVUnlockAndSave) { - nfc_text_store_set( - nfc, - "%s/SLIX_%02X%02X%02X%02X%02X%02X%02X%02X%s", - NFC_APP_FOLDER, - nfc_data->uid[0], - nfc_data->uid[1], - nfc_data->uid[2], - nfc_data->uid[3], - nfc_data->uid[4], - nfc_data->uid[5], - nfc_data->uid[6], - nfc_data->uid[7], - NFC_APP_EXTENSION); - - nfc->dev->format = NfcDeviceSaveFormatNfcV; - - if(nfc_device_save(nfc->dev, nfc->text_store)) { - popup_set_header(popup, "Successfully\nsaved", 94, 3, AlignCenter, AlignTop); - } else { - popup_set_header( - popup, "Unlocked but\nsave failed!", 94, 3, AlignCenter, AlignTop); - } - } else { - popup_set_header(popup, "Successfully\nunlocked", 94, 3, AlignCenter, AlignTop); - } - - notification_message(nfc->notifications, &sequence_single_vibro); - //notification_message(nfc->notifications, &sequence_success); - - popup_set_icon(popup, 0, 6, &I_RFIDDolphinSuccess_108x57); - popup_set_context(popup, nfc); - popup_set_callback(popup, nfc_scene_nfcv_unlock_popup_callback); - popup_set_timeout(popup, 1500); - - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewPopup); - DOLPHIN_DEED(DolphinDeedNfcReadSuccess); - - } else if(state == NfcSceneNfcVUnlockStateAlreadyUnlocked) { - popup_reset(popup); - - popup_set_header(popup, "Already\nUnlocked!", 94, 3, AlignCenter, AlignTop); - popup_set_icon(popup, 0, 6, &I_RFIDDolphinSuccess_108x57); - popup_set_context(popup, nfc); - popup_set_callback(popup, nfc_scene_nfcv_unlock_popup_callback); - popup_set_timeout(popup, 1500); - - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewPopup); - } else if(state == NfcSceneNfcVUnlockStateNotSupportedCard) { - popup_reset(popup); - popup_set_header(popup, "Wrong Type Of Card!", 64, 3, AlignCenter, AlignTop); - popup_set_text(popup, nfcv_data->error, 4, 22, AlignLeft, AlignTop); - popup_set_icon(popup, 73, 20, &I_DolphinCommon_56x48); - } - scene_manager_set_scene_state(nfc->scene_manager, NfcSceneNfcVUnlock, state); - } -} - -void nfc_scene_nfcv_unlock_on_enter(void* context) { - Nfc* nfc = context; - - nfc_device_clear(nfc->dev); - // Setup view - nfc_scene_nfcv_unlock_set_state(nfc, NfcSceneNfcVUnlockStateDetecting); - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewPopup); - - // Start worker - nfc_worker_start( - nfc->worker, - NfcWorkerStateNfcVUnlockAndSave, - &nfc->dev->dev_data, - nfc_scene_nfcv_unlock_worker_callback, - nfc); - - nfc_blink_read_start(nfc); -} - -bool nfc_scene_nfcv_unlock_on_event(void* context, SceneManagerEvent event) { - Nfc* nfc = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - if(event.event == NfcWorkerEventCardDetected) { - nfc_scene_nfcv_unlock_set_state(nfc, NfcSceneNfcVUnlockStateUnlocked); - consumed = true; - } else if(event.event == NfcWorkerEventAborted) { - nfc_scene_nfcv_unlock_set_state(nfc, NfcSceneNfcVUnlockStateAlreadyUnlocked); - consumed = true; - } else if(event.event == NfcWorkerEventNoCardDetected) { - nfc_scene_nfcv_unlock_set_state(nfc, NfcSceneNfcVUnlockStateDetecting); - consumed = true; - } else if(event.event == NfcWorkerEventWrongCardDetected) { - nfc_scene_nfcv_unlock_set_state(nfc, NfcSceneNfcVUnlockStateNotSupportedCard); - } - } else if(event.type == SceneManagerEventTypeBack) { - consumed = scene_manager_search_and_switch_to_previous_scene( - nfc->scene_manager, NfcSceneNfcVUnlockMenu); - } - return consumed; -} - -void nfc_scene_nfcv_unlock_on_exit(void* context) { - Nfc* nfc = context; - - // Stop worker - nfc_worker_stop(nfc->worker); - // Clear view - popup_reset(nfc->popup); - nfc_blink_stop(nfc); - scene_manager_set_scene_state( - nfc->scene_manager, NfcSceneNfcVUnlock, NfcSceneNfcVUnlockStateIdle); -} diff --git a/applications/main/nfc/scenes/nfc_scene_nfcv_unlock_menu.c b/applications/main/nfc/scenes/nfc_scene_nfcv_unlock_menu.c deleted file mode 100644 index 9c4c81fbd..000000000 --- a/applications/main/nfc/scenes/nfc_scene_nfcv_unlock_menu.c +++ /dev/null @@ -1,60 +0,0 @@ -#include "../nfc_i.h" -#include - -enum SubmenuIndex { - SubmenuIndexNfcVUnlockMenuManual, - SubmenuIndexNfcVUnlockMenuTonieBox, -}; - -void nfc_scene_nfcv_unlock_menu_submenu_callback(void* context, uint32_t index) { - Nfc* nfc = context; - - view_dispatcher_send_custom_event(nfc->view_dispatcher, index); -} - -void nfc_scene_nfcv_unlock_menu_on_enter(void* context) { - Nfc* nfc = context; - Submenu* submenu = nfc->submenu; - - uint32_t state = scene_manager_get_scene_state(nfc->scene_manager, NfcSceneNfcVUnlockMenu); - submenu_add_item( - submenu, - "Enter PWD Manually", - SubmenuIndexNfcVUnlockMenuManual, - nfc_scene_nfcv_unlock_menu_submenu_callback, - nfc); - submenu_add_item( - submenu, - "Auth As TonieBox", - SubmenuIndexNfcVUnlockMenuTonieBox, - nfc_scene_nfcv_unlock_menu_submenu_callback, - nfc); - submenu_set_selected_item(submenu, state); - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewMenu); -} - -bool nfc_scene_nfcv_unlock_menu_on_event(void* context, SceneManagerEvent event) { - Nfc* nfc = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - if(event.event == SubmenuIndexNfcVUnlockMenuManual) { - nfc->dev->dev_data.nfcv_data.auth_method = NfcVAuthMethodManual; - scene_manager_next_scene(nfc->scene_manager, NfcSceneNfcVKeyInput); - consumed = true; - } else if(event.event == SubmenuIndexNfcVUnlockMenuTonieBox) { - nfc->dev->dev_data.nfcv_data.auth_method = NfcVAuthMethodTonieBox; - scene_manager_next_scene(nfc->scene_manager, NfcSceneNfcVUnlock); - DOLPHIN_DEED(DolphinDeedNfcRead); - consumed = true; - } - scene_manager_set_scene_state(nfc->scene_manager, NfcSceneNfcVUnlockMenu, event.event); - } - return consumed; -} - -void nfc_scene_nfcv_unlock_menu_on_exit(void* context) { - Nfc* nfc = context; - - submenu_reset(nfc->submenu); -} diff --git a/applications/main/nfc/scenes/nfc_scene_passport_auth.c b/applications/main/nfc/scenes/nfc_scene_passport_auth.c deleted file mode 100644 index c78c8b70e..000000000 --- a/applications/main/nfc/scenes/nfc_scene_passport_auth.c +++ /dev/null @@ -1,194 +0,0 @@ -#include "../nfc_i.h" - -#define TAG "PassportAuth" - -#define MRTD_AUTH_METHOD_COUNT 4 -// Must match MrtdAuthMethod size (lib/nfc/protocols/mrtd_helpers.h) - -typedef enum { - NfcScenePassportAuthSelectDob, - NfcScenePassportAuthSelectDoe, - NfcScenePassportAuthSelectDocNr, - NfcScenePassportAuthSelectMethod, - NfcScenePassportAuthSelectAuth, - NfcScenePassportAuthSelectSave, - NfcScenePassportAuthSelectLoad, -} NfcScenePassportAuthSelect; - -void nfc_scene_passport_auth_var_list_enter_callback(void* context, uint32_t index) { - Nfc* nfc = context; - view_dispatcher_send_custom_event(nfc->view_dispatcher, index); -} - -void nfc_scene_passport_auth_method_changed(VariableItem* item) { - Nfc* nfc = variable_item_get_context(item); - uint8_t index = variable_item_get_current_value_index(item); - nfc->dev->dev_data.mrtd_data.auth.method = index; - variable_item_set_current_value_text(item, mrtd_auth_method_string(index)); -} - -bool nfc_scene_passport_auth_load(Nfc* nfc) { - const DialogsFileBrowserOptions browser_options = { - .extension = MRTD_APP_EXTENSION, - .skip_assets = true, - .icon = &I_u2f_10px, - .hide_ext = true, - .item_loader_callback = NULL, - .item_loader_context = NULL, - }; - - FuriString* mrtd_app_folder; - mrtd_app_folder = furi_string_alloc_set(MRTD_APP_FOLDER); - - FuriString* file_path; - file_path = furi_string_alloc(); - - bool res = - dialog_file_browser_show(nfc->dev->dialogs, file_path, mrtd_app_folder, &browser_options); - - furi_string_free(mrtd_app_folder); - - if(res) { - mrtd_auth_params_load( - nfc->dev->storage, - nfc->dev->dialogs, - &nfc->dev->dev_data.mrtd_data.auth, - furi_string_get_cstr(file_path), - true); - - nfc_scene_passport_auth_on_enter(nfc); - variable_item_list_set_selected_item( - nfc->variable_item_list, NfcScenePassportAuthSelectAuth); - } - - return res; -} - -void nfc_scene_passport_auth_on_enter(void* context) { - Nfc* nfc = context; - MrtdData* mrtd_data = &nfc->dev->dev_data.mrtd_data; - - // By entering the Auth menu, we default to Auth: Any - MrtdAuthMethod* auth_method = &mrtd_data->auth.method; - if(*auth_method == MrtdAuthMethodNone) { - *auth_method = MrtdAuthMethodAny; - } - - VariableItemList* variable_item_list = nfc->variable_item_list; - variable_item_list_reset(variable_item_list); - - VariableItem* item; - uint8_t value_index; - - const size_t temp_str_size = 15; - char temp_str[temp_str_size]; - snprintf( - temp_str, - temp_str_size, - "%02u%02u%02u", - mrtd_data->auth.birth_date.year, - mrtd_data->auth.birth_date.month, - mrtd_data->auth.birth_date.day); - - item = variable_item_list_add(variable_item_list, "Birth Date", 1, NULL, NULL); - variable_item_set_current_value_text(item, temp_str); - - snprintf( - temp_str, - temp_str_size, - "%02u%02u%02u", - mrtd_data->auth.expiry_date.year, - mrtd_data->auth.expiry_date.month, - mrtd_data->auth.expiry_date.day); - - item = variable_item_list_add(variable_item_list, "Expiry Date", 1, NULL, NULL); - variable_item_set_current_value_text(item, temp_str); - - item = variable_item_list_add(variable_item_list, "Document Nr.", 1, NULL, NULL); - - strncpy(temp_str, mrtd_data->auth.doc_number, temp_str_size); - temp_str[temp_str_size] = '\x00'; - if(strlen(temp_str) > 8) { - temp_str[8] = '.'; - temp_str[9] = '.'; - temp_str[10] = '.'; - temp_str[11] = '\x00'; - } - variable_item_set_current_value_text(item, temp_str); - - item = variable_item_list_add( - variable_item_list, - "Method", - MRTD_AUTH_METHOD_COUNT, - nfc_scene_passport_auth_method_changed, - nfc); - - value_index = *auth_method; - variable_item_set_current_value_index(item, value_index); - variable_item_set_current_value_text(item, mrtd_auth_method_string(value_index)); - - variable_item_list_add(variable_item_list, "Authenticate and read", 1, NULL, NULL); - - variable_item_list_add(variable_item_list, "Save parameters", 1, NULL, NULL); - variable_item_list_add(variable_item_list, "Load parameters", 1, NULL, NULL); - - variable_item_list_set_enter_callback( - variable_item_list, nfc_scene_passport_auth_var_list_enter_callback, nfc); - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewVarItemList); -} - -bool nfc_scene_passport_auth_on_event(void* context, SceneManagerEvent event) { - Nfc* nfc = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - FURI_LOG_D(TAG, "event.event: %ld", event.event); - switch(event.event) { - case NfcScenePassportAuthSelectLoad: - nfc_scene_passport_auth_load(nfc); - consumed = true; - break; - case NfcScenePassportAuthSelectDob: - scene_manager_set_scene_state(nfc->scene_manager, NfcScenePassportDate, 0); - scene_manager_next_scene(nfc->scene_manager, NfcScenePassportDate); - consumed = true; - break; - case NfcScenePassportAuthSelectDoe: - scene_manager_set_scene_state(nfc->scene_manager, NfcScenePassportDate, 1); - scene_manager_next_scene(nfc->scene_manager, NfcScenePassportDate); - consumed = true; - break; - case NfcScenePassportAuthSelectDocNr: - scene_manager_next_scene(nfc->scene_manager, NfcScenePassportDocNr); - consumed = true; - break; - case NfcScenePassportAuthSelectMethod: - consumed = true; - break; - case NfcScenePassportAuthSelectAuth: - if(nfc->dev->dev_data.mrtd_data.auth.method == MrtdAuthMethodPace) { - scene_manager_next_scene(nfc->scene_manager, NfcScenePassportPaceTodo); - } else { - nfc_device_clear(nfc->dev); - scene_manager_next_scene(nfc->scene_manager, NfcSceneRead); - } - consumed = true; - break; - case NfcScenePassportAuthSelectSave: - scene_manager_next_scene(nfc->scene_manager, NfcScenePassportAuthSaveName); - consumed = true; - break; - } - } else if(event.type == SceneManagerEventTypeBack) { - consumed = scene_manager_previous_scene(nfc->scene_manager); - } - - return consumed; -} - -void nfc_scene_passport_auth_on_exit(void* context) { - Nfc* nfc = context; - - // Clear view - variable_item_list_reset(nfc->variable_item_list); -} diff --git a/applications/main/nfc/scenes/nfc_scene_passport_auth_save_name.c b/applications/main/nfc/scenes/nfc_scene_passport_auth_save_name.c deleted file mode 100644 index 65fee0bcf..000000000 --- a/applications/main/nfc/scenes/nfc_scene_passport_auth_save_name.c +++ /dev/null @@ -1,82 +0,0 @@ -#include "../nfc_i.h" -#include -#include -#include - -void nfc_scene_passport_auth_save_name_text_input_callback(void* context) { - Nfc* nfc = context; - - view_dispatcher_send_custom_event(nfc->view_dispatcher, NfcCustomEventTextInputDone); -} - -void nfc_scene_passport_auth_save_name_on_enter(void* context) { - Nfc* nfc = context; - - MrtdData* mrtd_data = &nfc->dev->dev_data.mrtd_data; - - // Setup view - TextInput* text_input = nfc->text_input; - bool docnr_empty = false; - if(!strcmp(mrtd_data->auth.doc_number, "")) { - set_random_name(nfc->text_store, sizeof(nfc->text_store)); - docnr_empty = true; - } else { - nfc_text_store_set(nfc, mrtd_data->auth.doc_number); - } - text_input_set_header_text(text_input, "Name the parameters"); - text_input_set_result_callback( - text_input, - nfc_scene_passport_auth_save_name_text_input_callback, - nfc, - nfc->text_store, - NFC_DEV_NAME_MAX_LEN, - docnr_empty); - - FuriString* folder_path; - folder_path = furi_string_alloc(); - - if(furi_string_end_with(nfc->dev->load_path, NFC_APP_EXTENSION)) { - path_extract_dirname(furi_string_get_cstr(nfc->dev->load_path), folder_path); - } else { - furi_string_set(folder_path, NFC_APP_FOLDER); - } - - ValidatorIsFile* validator_is_file = - validator_is_file_alloc_init(furi_string_get_cstr(folder_path), NFC_APP_EXTENSION, NULL); - text_input_set_validator(text_input, validator_is_file_callback, validator_is_file); - - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewTextInput); - - furi_string_free(folder_path); -} - -bool nfc_scene_passport_auth_save_name_on_event(void* context, SceneManagerEvent event) { - Nfc* nfc = context; - MrtdData* mrtd_data = &nfc->dev->dev_data.mrtd_data; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - if(event.event == NfcCustomEventTextInputDone) { - if(mrtd_auth_params_save( - nfc->dev->storage, nfc->dev->dialogs, &mrtd_data->auth, nfc->text_store)) { - scene_manager_next_scene(nfc->scene_manager, NfcSceneSaveSuccess); - consumed = true; - } else { - consumed = scene_manager_search_and_switch_to_previous_scene( - nfc->scene_manager, NfcSceneStart); - } - } - } - return consumed; -} - -void nfc_scene_passport_auth_save_name_on_exit(void* context) { - Nfc* nfc = context; - - // Clear view - void* validator_context = text_input_get_validator_callback_context(nfc->text_input); - text_input_set_validator(nfc->text_input, NULL, NULL); - validator_is_file_free(validator_context); - - text_input_reset(nfc->text_input); -} diff --git a/applications/main/nfc/scenes/nfc_scene_passport_date.c b/applications/main/nfc/scenes/nfc_scene_passport_date.c deleted file mode 100644 index 4dc174326..000000000 --- a/applications/main/nfc/scenes/nfc_scene_passport_date.c +++ /dev/null @@ -1,120 +0,0 @@ -#include "../nfc_i.h" -#include "m-string.h" -#include - -#define TAG "PassportDate" - -#define DATE_LENGTH 6 - -//TODO: use types in .h file? also in nfc_scene_passport_bac.c -#define NFC_PASSPORT_DATE_BIRTH 0 -#define NFC_PASSPORT_DATE_EXPIRY 1 - -void nfc_scene_passport_date_text_input_callback(void* context) { - Nfc* nfc = context; - - view_dispatcher_send_custom_event(nfc->view_dispatcher, NfcCustomEventTextInputDone); -} - -void nfc_scene_passport_date_on_enter(void* context) { - Nfc* nfc = context; - - MrtdDate date_value; - - uint32_t date_type = scene_manager_get_scene_state(nfc->scene_manager, NfcScenePassportDate); - - //TODO: numbers only - TextInput* text_input = nfc->text_input; - - switch(date_type) { - case NFC_PASSPORT_DATE_BIRTH: - text_input_set_header_text(text_input, "Birth Date"); - date_value = nfc->dev->dev_data.mrtd_data.auth.birth_date; - break; - case NFC_PASSPORT_DATE_EXPIRY: - text_input_set_header_text(text_input, "Expiry Date"); - date_value = nfc->dev->dev_data.mrtd_data.auth.expiry_date; - break; - } - - bool date_empty = false; - if(date_value.year == 0 || date_value.month == 0 || date_value.day == 0 || - date_value.year > 100 || date_value.month > 13 || date_value.day > 31) { - nfc_text_store_set(nfc, "YYMMDD"); - date_empty = true; - } else { - char temp_str[10]; - snprintf(temp_str, 10, "%02u%02u%02u", date_value.year, date_value.month, date_value.day); - - memcpy(nfc->text_store, temp_str, DATE_LENGTH); - nfc->text_store[DATE_LENGTH] = '\x00'; - } - - text_input_set_result_callback( - text_input, - nfc_scene_passport_date_text_input_callback, - nfc, - nfc->text_store, - DATE_LENGTH + 1, // incl. '\x00' - date_empty); // Use as template - - //TODO: add validator for valid date (YYMMDD) - - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewTextInput); -} - -bool nfc_scene_passport_date_save(Nfc* nfc) { - int year; - int month; - int day; - int ret = sscanf(nfc->text_store, "%02d%02d%02d", &year, &month, &day); - - if(ret != 3) { - FURI_LOG_E(TAG, "Invalid date entered (YYMMDD): %s", nfc->text_store); - return false; - } - - MrtdDate date_value; - date_value.year = year; - date_value.month = month; - date_value.day = day; - - uint32_t date_type = scene_manager_get_scene_state(nfc->scene_manager, NfcScenePassportDate); - - //TODO: use types in .h file? also in nfc_scene_passport_bac.c - switch(date_type) { - case NFC_PASSPORT_DATE_BIRTH: - nfc->dev->dev_data.mrtd_data.auth.birth_date = date_value; - break; - case NFC_PASSPORT_DATE_EXPIRY: - nfc->dev->dev_data.mrtd_data.auth.expiry_date = date_value; - break; - } - - return true; -} - -bool nfc_scene_passport_date_on_event(void* context, SceneManagerEvent event) { - Nfc* nfc = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - if(event.event == NfcCustomEventTextInputDone) { - nfc_scene_passport_date_save(nfc); - //TODO: handle invalid date (returned false) - - consumed = scene_manager_search_and_switch_to_previous_scene( - nfc->scene_manager, NfcScenePassportAuth); - } - } - return consumed; -} - -void nfc_scene_passport_date_on_exit(void* context) { - Nfc* nfc = context; - - // Clear view - // TODO: clear validator - - text_input_reset(nfc->text_input); -} diff --git a/applications/main/nfc/scenes/nfc_scene_passport_docnr.c b/applications/main/nfc/scenes/nfc_scene_passport_docnr.c deleted file mode 100644 index 109415759..000000000 --- a/applications/main/nfc/scenes/nfc_scene_passport_docnr.c +++ /dev/null @@ -1,67 +0,0 @@ -#include "../nfc_i.h" -#include "m-string.h" -#include - -#define TAG "PassportDocnr" - -void nfc_scene_passport_docnr_text_input_callback(void* context) { - Nfc* nfc = context; - - view_dispatcher_send_custom_event(nfc->view_dispatcher, NfcCustomEventTextInputDone); -} - -void nfc_scene_passport_docnr_on_enter(void* context) { - Nfc* nfc = context; - - TextInput* text_input = nfc->text_input; - text_input_set_header_text(text_input, "Document Nr."); - - char* docnr = nfc->dev->dev_data.mrtd_data.auth.doc_number; - bool docnr_empty = false; - - if(*docnr) { - nfc_text_store_set(nfc, docnr); - docnr_empty = false; - } else { - nfc_text_store_set(nfc, "PA7HJ34M8"); - docnr_empty = true; - } - - text_input_set_result_callback( - text_input, - nfc_scene_passport_docnr_text_input_callback, - nfc, - nfc->text_store, - MRTD_DOCNR_MAX_LENGTH, // incl. '\x00' - docnr_empty); // Use as template - - //TODO: add validator? - - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewTextInput); -} - -bool nfc_scene_passport_docnr_save(Nfc* nfc) { - strncpy(nfc->dev->dev_data.mrtd_data.auth.doc_number, nfc->text_store, MRTD_DOCNR_MAX_LENGTH); - return true; -} - -bool nfc_scene_passport_docnr_on_event(void* context, SceneManagerEvent event) { - Nfc* nfc = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - if(event.event == NfcCustomEventTextInputDone) { - nfc_scene_passport_docnr_save(nfc); - - consumed = scene_manager_search_and_switch_to_previous_scene( - nfc->scene_manager, NfcScenePassportAuth); - } - } - return consumed; -} - -void nfc_scene_passport_docnr_on_exit(void* context) { - Nfc* nfc = context; - - text_input_reset(nfc->text_input); -} diff --git a/applications/main/nfc/scenes/nfc_scene_passport_menu.c b/applications/main/nfc/scenes/nfc_scene_passport_menu.c deleted file mode 100644 index 27febcb18..000000000 --- a/applications/main/nfc/scenes/nfc_scene_passport_menu.c +++ /dev/null @@ -1,57 +0,0 @@ -#include "../nfc_i.h" - -enum SubmenuIndex { - SubmenuIndexSave, - SubmenuIndexInfo, -}; - -void nfc_scene_passport_menu_submenu_callback(void* context, uint32_t index) { - Nfc* nfc = context; - - view_dispatcher_send_custom_event(nfc->view_dispatcher, index); -} - -void nfc_scene_passport_menu_on_enter(void* context) { - Nfc* nfc = context; - Submenu* submenu = nfc->submenu; - - submenu_add_item( - submenu, "Save", SubmenuIndexSave, nfc_scene_passport_menu_submenu_callback, nfc); - submenu_add_item( - submenu, "Info", SubmenuIndexInfo, nfc_scene_passport_menu_submenu_callback, nfc); - submenu_set_selected_item( - nfc->submenu, scene_manager_get_scene_state(nfc->scene_manager, NfcScenePassportMenu)); - - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewMenu); -} - -bool nfc_scene_passport_menu_on_event(void* context, SceneManagerEvent event) { - Nfc* nfc = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - if(event.event == SubmenuIndexSave) { - //TODO: save more than just UID - nfc->dev->format = NfcDeviceSaveFormatUid; - // Clear device name - nfc_device_set_name(nfc->dev, ""); - scene_manager_next_scene(nfc->scene_manager, NfcSceneSaveName); - consumed = true; - } else if(event.event == SubmenuIndexInfo) { - scene_manager_next_scene(nfc->scene_manager, NfcSceneNfcDataInfo); - consumed = true; - } - scene_manager_set_scene_state(nfc->scene_manager, NfcScenePassportMenu, event.event); - } else if(event.type == SceneManagerEventTypeBack) { - consumed = scene_manager_previous_scene(nfc->scene_manager); - } - - return consumed; -} - -void nfc_scene_passport_menu_on_exit(void* context) { - Nfc* nfc = context; - - // Clear view - submenu_reset(nfc->submenu); -} diff --git a/applications/main/nfc/scenes/nfc_scene_passport_pace_todo.c b/applications/main/nfc/scenes/nfc_scene_passport_pace_todo.c deleted file mode 100644 index c6d7d7f6c..000000000 --- a/applications/main/nfc/scenes/nfc_scene_passport_pace_todo.c +++ /dev/null @@ -1,40 +0,0 @@ -#include "../nfc_i.h" - -void nfc_scene_passport_pace_todo_popup_callback(void* context) { - Nfc* nfc = context; - view_dispatcher_send_custom_event(nfc->view_dispatcher, NfcCustomEventViewExit); -} - -void nfc_scene_passport_pace_todo_on_enter(void* context) { - Nfc* nfc = context; - - // Setup view - Popup* popup = nfc->popup; - popup_set_icon(popup, 64, 16, &I_DolphinCommon_56x48); - popup_set_header(popup, "PACE not yet implemented", 4, 4, AlignLeft, AlignTop); - popup_set_timeout(popup, 2000); - popup_set_context(popup, nfc); - popup_set_callback(popup, nfc_scene_passport_pace_todo_popup_callback); - popup_enable_timeout(popup); - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewPopup); -} - -bool nfc_scene_passport_pace_todo_on_event(void* context, SceneManagerEvent event) { - Nfc* nfc = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - if(event.event == NfcCustomEventViewExit) { - consumed = scene_manager_search_and_switch_to_previous_scene( - nfc->scene_manager, NfcScenePassportAuth); - } - } - return consumed; -} - -void nfc_scene_passport_pace_todo_on_exit(void* context) { - Nfc* nfc = context; - - // Clear view - popup_reset(nfc->popup); -} diff --git a/applications/main/nfc/scenes/nfc_scene_passport_read.c b/applications/main/nfc/scenes/nfc_scene_passport_read.c deleted file mode 100644 index 74f173b52..000000000 --- a/applications/main/nfc/scenes/nfc_scene_passport_read.c +++ /dev/null @@ -1,90 +0,0 @@ -#include "../nfc_i.h" -#include - -void nfc_scene_passport_read_widget_callback(GuiButtonType result, InputType type, void* context) { - Nfc* nfc = context; - if(type == InputTypeShort) { - view_dispatcher_send_custom_event(nfc->view_dispatcher, result); - } -} - -void nfc_scene_passport_read_on_enter(void* context) { - Nfc* nfc = context; - FuriHalNfcDevData* data = &nfc->dev->dev_data.nfc_data; - MrtdData* mrtd_data = &nfc->dev->dev_data.mrtd_data; - - DOLPHIN_DEED(DolphinDeedNfcReadSuccess); - - Widget* widget = nfc->widget; - - // Setup Custom Widget view - FuriString* temp_str; - temp_str = furi_string_alloc(); - furi_string_set(temp_str, "\e#Passport\n"); - char iso_type = FURI_BIT(data->sak, 5) ? '4' : '3'; - - char nfc_type; - switch(data->type) { - case FuriHalNfcTypeA: - nfc_type = 'A'; - break; - case FuriHalNfcTypeB: - nfc_type = 'B'; - break; - default: - nfc_type = '?'; - break; - } - furi_string_cat_printf(temp_str, "ISO 14443-%c (NFC-%c)\n", iso_type, nfc_type); - furi_string_cat_printf(temp_str, "UID:"); - for(size_t i = 0; i < data->uid_len; i++) { - furi_string_cat_printf(temp_str, " %02X", data->uid[i]); - } - furi_string_cat_printf(temp_str, "\nATQA: %02X %02X ", data->atqa[1], data->atqa[0]); - furi_string_cat_printf(temp_str, " SAK: %02X\n", data->sak); - - if(mrtd_data->auth.method != MrtdAuthMethodNone && !mrtd_data->auth_success) { - furi_string_cat_printf(temp_str, "Auth failed. Wrong params?"); - } - - widget_add_text_scroll_element(widget, 0, 0, 128, 52, furi_string_get_cstr(temp_str)); - furi_string_free(temp_str); - - widget_add_button_element( - nfc->widget, GuiButtonTypeLeft, "Retry", nfc_scene_passport_read_widget_callback, nfc); - widget_add_button_element( - nfc->widget, GuiButtonTypeCenter, "Auth", nfc_scene_passport_read_widget_callback, nfc); - widget_add_button_element( - nfc->widget, GuiButtonTypeRight, "More", nfc_scene_passport_read_widget_callback, nfc); - - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewWidget); -} - -bool nfc_scene_passport_read_on_event(void* context, SceneManagerEvent event) { - Nfc* nfc = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - if(event.event == GuiButtonTypeLeft) { - scene_manager_next_scene(nfc->scene_manager, NfcSceneRetryConfirm); - consumed = true; - } else if(event.event == GuiButtonTypeCenter) { - scene_manager_next_scene(nfc->scene_manager, NfcScenePassportAuth); - consumed = true; - } else if(event.event == GuiButtonTypeRight) { - scene_manager_next_scene(nfc->scene_manager, NfcScenePassportMenu); - consumed = true; - } - } else if(event.type == SceneManagerEventTypeBack) { - scene_manager_next_scene(nfc->scene_manager, NfcSceneExitConfirm); - consumed = true; - } - return consumed; -} - -void nfc_scene_passport_read_on_exit(void* context) { - Nfc* nfc = context; - - // Clear view - widget_reset(nfc->widget); -} diff --git a/applications/main/nfc/scenes/nfc_scene_passport_read_auth.c b/applications/main/nfc/scenes/nfc_scene_passport_read_auth.c deleted file mode 100644 index 31a9e8ce1..000000000 --- a/applications/main/nfc/scenes/nfc_scene_passport_read_auth.c +++ /dev/null @@ -1,142 +0,0 @@ -#include "../nfc_i.h" -#include - -const char months[13][4] = { - "---", - "JAN", - "FEB", - "MAR", - "APR", - "MAY", - "JUN", - "JUL", - "AUG", - "SEP", - "OCT", - "NOV", - "DEC", -}; - -void nfc_scene_passport_read_auth_widget_callback( - GuiButtonType result, - InputType type, - void* context) { - Nfc* nfc = context; - if(type == InputTypeShort) { - view_dispatcher_send_custom_event(nfc->view_dispatcher, result); - } -} - -void nfc_scene_passport_read_auth_on_enter(void* context) { - Nfc* nfc = context; - MrtdData* mrtd_data = &nfc->dev->dev_data.mrtd_data; - - Widget* widget = nfc->widget; - - // Setup Custom Widget view - FuriString* temp_str; - temp_str = furi_string_alloc(); - furi_string_set(temp_str, "\e#Passport\n"); - furi_string_cat_printf( - temp_str, "Auth.method: %s\n", mrtd_auth_method_string(mrtd_data->auth_method_used)); - // TODO: indicate BAC / PACE used - - uint16_t lds_version = mrtd_data->files.EF_COM.lds_version; - furi_string_cat_printf(temp_str, "LDS version: %d.%d\n", lds_version / 100, lds_version % 100); - - uint32_t unicode_version = mrtd_data->files.EF_COM.unicode_version; - furi_string_cat_printf( - temp_str, - "Unicode version: %d.%d.%d\n", - (uint8_t)(unicode_version / 10000), - (uint8_t)(unicode_version / 100 % 100), - (uint8_t)(unicode_version % 100)); - - furi_string_cat_printf(temp_str, "Avail.files: "); - for(size_t i = 0; i < MAX_EFCOM_TAGS; ++i) { - uint8_t tag = mrtd_data->files.EF_COM.tag_list[i]; - const EFFile* file = mrtd_tag_to_file(tag); - if(file->tag) { - if(i > 0) furi_string_cat_printf(temp_str, ", "); - furi_string_cat_printf(temp_str, "%s", file->name); - } - } - furi_string_cat_printf(temp_str, "\n"); - - EF_DIR_contents* EF_DIR = &mrtd_data->files.EF_DIR; - if(EF_DIR->applications_count > 0) { - furi_string_cat_printf(temp_str, "Apps:\n"); - for(uint8_t i = 0; i < EF_DIR->applications_count; ++i) { - for(uint8_t n = 0; n < sizeof(AIDValue); ++n) { - furi_string_cat_printf(temp_str, "%02X ", EF_DIR->applications[i][n]); - } - furi_string_cat_printf(temp_str, "\n"); - } - } - - EF_DG1_contents* DG1 = &mrtd_data->files.DG1; - furi_string_cat_printf(temp_str, "\e#DG1\n"); - furi_string_cat_printf(temp_str, "Doc Type: %s\n", DG1->doctype); - furi_string_cat_printf(temp_str, "Issuing State: %s\n", DG1->issuing_state); - furi_string_cat_printf(temp_str, "Name: %s\n", DG1->name); - furi_string_cat_printf(temp_str, "DocNr: %s\n", DG1->docnr); - furi_string_cat_printf(temp_str, "Nationality: %s\n", DG1->nationality); - furi_string_cat_printf( - temp_str, - "Birth Date: %02d %s %02d\n", - DG1->birth_date.day, - months[DG1->birth_date.month], - DG1->birth_date.year); - furi_string_cat_printf(temp_str, "Sex: %s\n", DG1->sex); - furi_string_cat_printf( - temp_str, - "Expiry Date: %02d %s %02d\n", - DG1->expiry_date.day, - months[DG1->expiry_date.month], - DG1->expiry_date.year); - - widget_add_text_scroll_element(widget, 0, 0, 128, 52, furi_string_get_cstr(temp_str)); - furi_string_free(temp_str); - - widget_add_button_element( - nfc->widget, GuiButtonTypeLeft, "Retry", nfc_scene_passport_read_auth_widget_callback, nfc); - /* - widget_add_button_element( - nfc->widget, GuiButtonTypeCenter, "Auth", nfc_scene_passport_read_auth_widget_callback, nfc); - widget_add_button_element( - nfc->widget, GuiButtonTypeRight, "More", nfc_scene_passport_read_auth_widget_callback, nfc); - */ - - view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewWidget); -} - -bool nfc_scene_passport_read_auth_on_event(void* context, SceneManagerEvent event) { - Nfc* nfc = context; - bool consumed = false; - - if(event.type == SceneManagerEventTypeCustom) { - if(event.event == GuiButtonTypeLeft) { - nfc->dev->dev_data.mrtd_data.auth_success = false; - nfc->dev->dev_data.mrtd_data.auth.method = MrtdAuthMethodNone; - scene_manager_next_scene(nfc->scene_manager, NfcSceneRetryConfirm); - consumed = true; - } else if(event.event == GuiButtonTypeCenter) { - //scene_manager_next_scene(nfc->scene_manager, NfcScenePassportAuth); - //consumed = true; - } else if(event.event == GuiButtonTypeRight) { - //scene_manager_next_scene(nfc->scene_manager, NfcScenePassportMenu); - //consumed = true; - } - } else if(event.type == SceneManagerEventTypeBack) { - scene_manager_next_scene(nfc->scene_manager, NfcSceneExitConfirm); - consumed = true; - } - return consumed; -} - -void nfc_scene_passport_read_auth_on_exit(void* context) { - Nfc* nfc = context; - - // Clear view - widget_reset(nfc->widget); -} diff --git a/applications/main/nfc/scenes/nfc_scene_read.c b/applications/main/nfc/scenes/nfc_scene_read.c index 7164a155f..4252883b2 100644 --- a/applications/main/nfc/scenes/nfc_scene_read.c +++ b/applications/main/nfc/scenes/nfc_scene_read.c @@ -25,12 +25,12 @@ void nfc_scene_read_set_state(Nfc* nfc, NfcSceneReadState state) { if(state == NfcSceneReadStateDetecting) { popup_reset(nfc->popup); popup_set_text( - nfc->popup, "Apply Card To\nFlipper's Back", 97, 24, AlignCenter, AlignTop); + nfc->popup, "Apply card to\nFlipper's back", 97, 24, AlignCenter, AlignTop); popup_set_icon(nfc->popup, 0, 8, &I_NFC_manual_60x50); } else if(state == NfcSceneReadStateReading) { popup_reset(nfc->popup); popup_set_header( - nfc->popup, "Reading Card\nDon't Move...", 85, 24, AlignCenter, AlignTop); + nfc->popup, "Reading card\nDon't move...", 85, 24, AlignCenter, AlignTop); popup_set_icon(nfc->popup, 12, 23, &A_Loading_24); } scene_manager_set_scene_state(nfc->scene_manager, NfcSceneRead, state); @@ -68,11 +68,6 @@ bool nfc_scene_read_on_event(void* context, SceneManagerEvent event) { scene_manager_next_scene(nfc->scene_manager, NfcSceneNfcaReadSuccess); DOLPHIN_DEED(DolphinDeedNfcReadSuccess); consumed = true; - } else if(event.event == NfcWorkerEventReadNfcV) { - notification_message(nfc->notifications, &sequence_success); - scene_manager_next_scene(nfc->scene_manager, NfcSceneNfcDataInfo); - DOLPHIN_DEED(DolphinDeedNfcReadSuccess); - consumed = true; } else if(event.event == NfcWorkerEventReadMfUltralight) { notification_message(nfc->notifications, &sequence_success); // Set unlock password input to 0xFFFFFFFF only on fresh read @@ -95,19 +90,6 @@ bool nfc_scene_read_on_event(void* context, SceneManagerEvent event) { scene_manager_next_scene(nfc->scene_manager, NfcSceneEmvReadSuccess); DOLPHIN_DEED(DolphinDeedNfcReadSuccess); consumed = true; - } else if(event.event == NfcWorkerEventReadPassport) { - notification_message(nfc->notifications, &sequence_success); - FURI_LOG_D( - "NFC", - "Read passport, auth: %d, success: %d", - nfc->dev->dev_data.mrtd_data.auth.method, - nfc->dev->dev_data.mrtd_data.auth_success); - if(nfc->dev->dev_data.mrtd_data.auth_success) { - scene_manager_next_scene(nfc->scene_manager, NfcScenePassportReadAuthSuccess); - } else { - scene_manager_next_scene(nfc->scene_manager, NfcScenePassportReadSuccess); - } - consumed = true; } else if(event.event == NfcWorkerEventReadMfClassicDictAttackRequired) { if(mf_classic_dict_check_presence(MfClassicDictTypeSystem)) { scene_manager_next_scene(nfc->scene_manager, NfcSceneMfClassicDictAttack); diff --git a/applications/main/nfc/scenes/nfc_scene_rpc.c b/applications/main/nfc/scenes/nfc_scene_rpc.c index d06ee7564..60d01a30d 100644 --- a/applications/main/nfc/scenes/nfc_scene_rpc.c +++ b/applications/main/nfc/scenes/nfc_scene_rpc.c @@ -55,13 +55,6 @@ bool nfc_scene_rpc_on_event(void* context, SceneManagerEvent event) { &nfc->dev->dev_data, nfc_scene_rpc_emulate_callback, nfc); - } else if(nfc->dev->format == NfcDeviceSaveFormatNfcV) { - nfc_worker_start( - nfc->worker, - NfcWorkerStateNfcVEmulate, - &nfc->dev->dev_data, - nfc_scene_rpc_emulate_callback, - nfc); } else { nfc_worker_start( nfc->worker, NfcWorkerStateUidEmulate, &nfc->dev->dev_data, NULL, nfc); diff --git a/applications/main/nfc/scenes/nfc_scene_save_name.c b/applications/main/nfc/scenes/nfc_scene_save_name.c index 8f0e889ec..007274226 100644 --- a/applications/main/nfc/scenes/nfc_scene_save_name.c +++ b/applications/main/nfc/scenes/nfc_scene_save_name.c @@ -22,7 +22,7 @@ void nfc_scene_save_name_on_enter(void* context) { } else { nfc_text_store_set(nfc, nfc->dev->dev_name); } - text_input_set_header_text(text_input, "Name The Card"); + text_input_set_header_text(text_input, "Name the card"); text_input_set_result_callback( text_input, nfc_scene_save_name_text_input_callback, diff --git a/applications/main/nfc/scenes/nfc_scene_save_success.c b/applications/main/nfc/scenes/nfc_scene_save_success.c index 43f2246cd..34919cbd8 100644 --- a/applications/main/nfc/scenes/nfc_scene_save_success.c +++ b/applications/main/nfc/scenes/nfc_scene_save_success.c @@ -31,12 +31,6 @@ bool nfc_scene_save_success_on_event(void* context, SceneManagerEvent event) { } else if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSavedMenu)) { consumed = scene_manager_search_and_switch_to_previous_scene( nfc->scene_manager, NfcSceneSavedMenu); - } else if(scene_manager_has_previous_scene(nfc->scene_manager, NfcScenePassportAuth)) { - consumed = scene_manager_search_and_switch_to_previous_scene( - nfc->scene_manager, NfcScenePassportAuth); - } else if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneNfcDataInfo)) { - consumed = scene_manager_search_and_switch_to_previous_scene( - nfc->scene_manager, NfcSceneNfcDataInfo); } else { consumed = scene_manager_search_and_switch_to_another_scene( nfc->scene_manager, NfcSceneFileSelect); diff --git a/applications/main/nfc/scenes/nfc_scene_saved_menu.c b/applications/main/nfc/scenes/nfc_scene_saved_menu.c index 616dc0ef7..c0d3ed5c6 100644 --- a/applications/main/nfc/scenes/nfc_scene_saved_menu.c +++ b/applications/main/nfc/scenes/nfc_scene_saved_menu.c @@ -117,8 +117,6 @@ bool nfc_scene_saved_menu_on_event(void* context, SceneManagerEvent event) { scene_manager_next_scene(nfc->scene_manager, NfcSceneMfUltralightEmulate); } else if(nfc->dev->format == NfcDeviceSaveFormatMifareClassic) { scene_manager_next_scene(nfc->scene_manager, NfcSceneMfClassicEmulate); - } else if(nfc->dev->format == NfcDeviceSaveFormatNfcV) { - scene_manager_next_scene(nfc->scene_manager, NfcSceneEmulateNfcV); } else { scene_manager_next_scene(nfc->scene_manager, NfcSceneEmulateUid); } diff --git a/applications/main/nfc/views/dict_attack.c b/applications/main/nfc/views/dict_attack.c index 9ee9b1e15..a539e514b 100644 --- a/applications/main/nfc/views/dict_attack.c +++ b/applications/main/nfc/views/dict_attack.c @@ -32,7 +32,7 @@ static void dict_attack_draw_callback(Canvas* canvas, void* model) { DictAttackViewModel* m = model; if(m->state == DictAttackStateCardRemoved) { canvas_set_font(canvas, FontPrimary); - canvas_draw_str_aligned(canvas, 64, 4, AlignCenter, AlignTop, "Lost The Tag!"); + canvas_draw_str_aligned(canvas, 64, 4, AlignCenter, AlignTop, "Lost the tag!"); canvas_set_font(canvas, FontSecondary); elements_multiline_text_aligned( canvas, 64, 23, AlignCenter, AlignTop, "Make sure the tag is\npositioned correctly."); @@ -69,7 +69,7 @@ static void dict_attack_draw_callback(Canvas* canvas, void* model) { } elements_progress_bar_with_text(canvas, 0, 20, 128, dict_progress, draw_str); canvas_set_font(canvas, FontSecondary); - snprintf(draw_str, sizeof(draw_str), "Keys Found: %d/%d", m->keys_found, m->keys_total); + snprintf(draw_str, sizeof(draw_str), "Keys found: %d/%d", m->keys_found, m->keys_total); canvas_draw_str_aligned(canvas, 0, 33, AlignLeft, AlignTop, draw_str); snprintf( draw_str, sizeof(draw_str), "Sectors Read: %d/%d", m->sectors_read, m->sectors_total); diff --git a/applications/plugins/scorched_tanks/LICENSE b/applications/plugins/scorched_tanks/LICENSE deleted file mode 100644 index f288702d2..000000000 --- a/applications/plugins/scorched_tanks/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/applications/plugins/scorched_tanks/README.md b/applications/plugins/scorched_tanks/README.md deleted file mode 100644 index 1c1970c19..000000000 --- a/applications/plugins/scorched_tanks/README.md +++ /dev/null @@ -1,35 +0,0 @@ -# Scorched tanks - flipper zero game -A flipper zero game inspired by scorched earth. - -Current state is shown below: - -![input](scorched_tanks_v1.gif) - -## How to do: -Do not hesitate to create PRs. If you start working on sth, please start branch name with TODO id (e.g. `feature/2-change-tank-icon`) - -If you see an improvement, modify this readme and add suggestions via PR. Bugs can be reported via Issues - -## What to do next (it's not in the priority order): -5. flatten surface beneath tanks -7. explosion animation -9. sub-ghz multi-player -11. add other types of weapons -12. code AI -13. add terain destruction -14. add terain gravity (fall down after hitting the middle of the mountain) -18. Add menu with settings (vibartion on/off, difficulty) -20. add more ground modifiers (currently there is only one hill in the middle, maybe 2 hills, skew map, etc) - -## What have been done: -1. ~~remove movement~~ -2. ~~change tank icon~~ -3. ~~power as variable not constant~~ -4. ~~better map generation: high, low regions~~ (continuation in point 20.) -6. ~~collision with the enemy~~ -8. ~~local multi-player~~ -10. ~~improve projectile trace draw on angles > 80~~ -15. ~~FIX: firing stops when bullet fly above the screen~~ -16. ~~Slightly randomize player and enemy spawn locations~~ -17. ~~Shooting vibration~~ -19. ~~Add wind~~ diff --git a/applications/plugins/scorched_tanks/application.fam b/applications/plugins/scorched_tanks/application.fam deleted file mode 100644 index fa0e6dd2b..000000000 --- a/applications/plugins/scorched_tanks/application.fam +++ /dev/null @@ -1,12 +0,0 @@ -App( - appid="Scorched_Tanks", - name="Scorched Tanks", - apptype=FlipperAppType.EXTERNAL, - entry_point="scorched_tanks_game_app", - cdefines=["APP_SCORCHED_TANKS_GAME"], - requires=["gui"], - stack_size=1 * 1024, - order=100, - fap_icon="scorchedTanks_10px.png", - fap_category="Games", -) diff --git a/applications/plugins/scorched_tanks/scorchedTanks_10px.png b/applications/plugins/scorched_tanks/scorchedTanks_10px.png deleted file mode 100644 index 6e1ae4c04..000000000 Binary files a/applications/plugins/scorched_tanks/scorchedTanks_10px.png and /dev/null differ diff --git a/applications/plugins/scorched_tanks/scorched_tanks_game_app.c b/applications/plugins/scorched_tanks/scorched_tanks_game_app.c deleted file mode 100644 index fd4c73ee7..000000000 --- a/applications/plugins/scorched_tanks/scorched_tanks_game_app.c +++ /dev/null @@ -1,540 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - -#define SCREEN_WIDTH 128 -#define SCREEN_HEIGHT 64 -#define PLAYER_INIT_LOCATION_X 20 -#define PLAYER_INIT_AIM 45 -#define PLAYER_INIT_POWER 50 -#define ENEMY_INIT_LOCATION_X 108 -#define TANK_BARREL_LENGTH 8 -#define GRAVITY_FORCE (double)0.5 -#define MIN_GROUND_HEIGHT 35 -#define MAX_GROUND_HEIGHT 55 -#define MAX_FIRE_POWER 100 -#define MIN_FIRE_POWER 0 -#define TANK_COLLIDER_SIZE 3 -#define MAX_WIND 10 -#define MAX_PLAYER_DIFF_X 20 -#define MAX_ENEMY_DIFF_X 20 - -// That's a filthy workaround but sin(player.aimAngle) breaks it all... If you're able to fix it, please do create a PR! -double scorched_tanks_sin[91] = { - 0.000, -0.017, -0.035, -0.052, -0.070, -0.087, -0.105, -0.122, -0.139, -0.156, -0.174, -0.191, - -0.208, -0.225, -0.242, -0.259, -0.276, -0.292, -0.309, -0.326, -0.342, -0.358, -0.375, -0.391, - -0.407, -0.423, -0.438, -0.454, -0.469, -0.485, -0.500, -0.515, -0.530, -0.545, -0.559, -0.574, - -0.588, -0.602, -0.616, -0.629, -0.643, -0.656, -0.669, -0.682, -0.695, -0.707, -0.719, -0.731, - -0.743, -0.755, -0.766, -0.777, -0.788, -0.799, -0.809, -0.819, -0.829, -0.839, -0.848, -0.857, - -0.866, -0.875, -0.883, -0.891, -0.899, -0.906, -0.914, -0.921, -0.927, -0.934, -0.940, -0.946, - -0.951, -0.956, -0.961, -0.966, -0.970, -0.974, -0.978, -0.982, -0.985, -0.988, -0.990, -0.993, - -0.995, -0.996, -0.998, -0.999, -0.999, -1.000, -1.000}; -double scorched_tanks_cos[91] = { - 1.000, 1.000, 0.999, 0.999, 0.998, 0.996, 0.995, 0.993, 0.990, 0.988, 0.985, 0.982, 0.978, - 0.974, 0.970, 0.966, 0.961, 0.956, 0.951, 0.946, 0.940, 0.934, 0.927, 0.921, 0.914, 0.906, - 0.899, 0.891, 0.883, 0.875, 0.866, 0.857, 0.848, 0.839, 0.829, 0.819, 0.809, 0.799, 0.788, - 0.777, 0.766, 0.755, 0.743, 0.731, 0.719, 0.707, 0.695, 0.682, 0.669, 0.656, 0.643, 0.629, - 0.616, 0.602, 0.588, 0.574, 0.559, 0.545, 0.530, 0.515, 0.500, 0.485, 0.469, 0.454, 0.438, - 0.423, 0.407, 0.391, 0.375, 0.358, 0.342, 0.326, 0.309, 0.292, 0.276, 0.259, 0.242, 0.225, - 0.208, 0.191, 0.174, 0.156, 0.139, 0.122, 0.105, 0.087, 0.070, 0.052, 0.035, 0.017, 0.000}; -double scorched_tanks_tan[91] = { - 0.000, -0.017, -0.035, -0.052, -0.070, -0.087, -0.105, -0.123, -0.141, -0.158, -0.176, - -0.194, -0.213, -0.231, -0.249, -0.268, -0.287, -0.306, -0.325, -0.344, -0.364, -0.384, - -0.404, -0.424, -0.445, -0.466, -0.488, -0.510, -0.532, -0.554, -0.577, -0.601, -0.625, - -0.649, -0.674, -0.700, -0.727, -0.754, -0.781, -0.810, -0.839, -0.869, -0.900, -0.932, - -0.966, -1.000, -1.036, -1.072, -1.111, -1.150, -1.192, -1.235, -1.280, -1.327, -1.376, - -1.428, -1.483, -1.540, -1.600, -1.664, -1.732, -1.804, -1.881, -1.963, -2.050, -2.144, - -2.246, -2.356, -2.475, -2.605, -2.747, -2.904, -3.078, -3.271, -3.487, -3.732, -4.011, - -4.331, -4.704, -5.144, -5.671, -6.313, -7.115, -8.144, -9.513, -11.429, -14.298, -19.077, - -28.627, -57.254, -90747.269}; -unsigned char scorched_tanks_ground_modifiers[SCREEN_WIDTH] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 28, 26, 24, 22, 20, - 18, 16, 14, 12, 10, 8, 6, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - -typedef struct { - // +-----x - // | - // | - // y - uint8_t x; - uint8_t y; -} Point; - -typedef struct { - // +-----x - // | - // | - // y - double x; - double y; -} PointDetailed; - -typedef struct { - unsigned char locationX; - unsigned char hp; - int aimAngle; - unsigned char firePower; -} Tank; - -typedef struct { - Point ground[SCREEN_WIDTH]; - Tank player; - Tank enemy; - bool isPlayerTurn; - bool isShooting; - int windSpeed; - Point trajectory[SCREEN_WIDTH]; - unsigned char trajectoryAnimationStep; - PointDetailed bulletPosition; - PointDetailed bulletVector; -} Game; - -typedef enum { - EventTypeTick, - EventTypeKey, -} EventType; - -typedef struct { - EventType type; - InputEvent input; -} ScorchedTanksEvent; - -int scorched_tanks_random(int min, int max) { - return min + rand() % ((max + 1) - min); -} - -void scorched_tanks_generate_ground(Game* game_state) { - int lastHeight = 45; - - for(unsigned char a = 0; a < SCREEN_WIDTH; a++) { - int diffHeight = scorched_tanks_random(-2, 3); - int changeLength = scorched_tanks_random(1, 6); - - if(diffHeight == 0) { - changeLength = 1; - } - - for(int b = 0; b < changeLength; b++) { - if(a + b < SCREEN_WIDTH) { - int index = a + b; - int newPoint = lastHeight + diffHeight; - newPoint = newPoint < MIN_GROUND_HEIGHT ? MIN_GROUND_HEIGHT : newPoint; - newPoint = newPoint > MAX_GROUND_HEIGHT ? MAX_GROUND_HEIGHT : newPoint; - game_state->ground[index].x = index; - game_state->ground[index].y = newPoint - scorched_tanks_ground_modifiers[a]; - lastHeight = newPoint; - } else { - a += b; - break; - } - } - - a += changeLength - 1; - } -} - -void scorched_tanks_init_game(Game* game_state) { - game_state->player.locationX = PLAYER_INIT_LOCATION_X + - scorched_tanks_random(0, MAX_PLAYER_DIFF_X) - - MAX_PLAYER_DIFF_X / 2; - game_state->player.aimAngle = PLAYER_INIT_AIM; - game_state->player.firePower = PLAYER_INIT_POWER; - game_state->enemy.aimAngle = PLAYER_INIT_AIM; - game_state->enemy.firePower = PLAYER_INIT_POWER; - game_state->enemy.locationX = - ENEMY_INIT_LOCATION_X + scorched_tanks_random(0, MAX_ENEMY_DIFF_X) - MAX_ENEMY_DIFF_X / 2; - game_state->isPlayerTurn = true; - - game_state->windSpeed = scorched_tanks_random(0, MAX_WIND); - - for(int x = 0; x < SCREEN_WIDTH; x++) { - game_state->trajectory[x].x = 0; - game_state->trajectory[x].y = 0; - } - - scorched_tanks_generate_ground(game_state); -} - -void scorched_tanks_calculate_trajectory(Game* game_state) { - if(game_state->isShooting) { - game_state->bulletVector.x += ((double)game_state->windSpeed - MAX_WIND / 2) / 40; - game_state->bulletVector.y += GRAVITY_FORCE; - - game_state->bulletPosition.x += game_state->bulletVector.x; - game_state->bulletPosition.y += game_state->bulletVector.y; - - int totalDistanceToEnemy = 100; - - if(game_state->isPlayerTurn) { - double distanceToEnemyX = game_state->enemy.locationX - game_state->bulletPosition.x; - double distanceToEnemyY = game_state->ground[game_state->enemy.locationX].y - - TANK_COLLIDER_SIZE - game_state->bulletPosition.y; - totalDistanceToEnemy = - sqrt(distanceToEnemyX * distanceToEnemyX + distanceToEnemyY * distanceToEnemyY); - } else { - double distanceToEnemyX = game_state->player.locationX - game_state->bulletPosition.x; - double distanceToEnemyY = game_state->ground[game_state->player.locationX].y - - TANK_COLLIDER_SIZE - game_state->bulletPosition.y; - totalDistanceToEnemy = - sqrt(distanceToEnemyX * distanceToEnemyX + distanceToEnemyY * distanceToEnemyY); - } - - if(totalDistanceToEnemy <= TANK_COLLIDER_SIZE) { - game_state->isShooting = false; - scorched_tanks_init_game(game_state); - game_state->isPlayerTurn = !game_state->isPlayerTurn; - return; - } - - if(game_state->bulletPosition.x > SCREEN_WIDTH || - game_state->bulletPosition.y > - game_state->ground[(int)round(game_state->bulletPosition.x)].y) { - game_state->isShooting = false; - game_state->bulletPosition.x = 0; - game_state->bulletPosition.y = 0; - game_state->windSpeed = scorched_tanks_random(0, MAX_WIND); - game_state->isPlayerTurn = !game_state->isPlayerTurn; - return; - } - - if(game_state->bulletPosition.y > 0) { - game_state->trajectory[game_state->trajectoryAnimationStep].x = - round(game_state->bulletPosition.x); - game_state->trajectory[game_state->trajectoryAnimationStep].y = - round(game_state->bulletPosition.y); - game_state->trajectoryAnimationStep++; - } - } -} - -static void scorched_tanks_draw_tank( - Canvas* const canvas, - unsigned char x, - unsigned char y, - bool isPlayer) { - unsigned char lineIndex = 0; - - if(isPlayer) { - // Draw tank base - canvas_draw_line(canvas, x - 3, y - lineIndex, x + 3, y - lineIndex++); - canvas_draw_line(canvas, x - 4, y - lineIndex, x + 4, y - lineIndex++); - canvas_draw_line(canvas, x - 4, y - lineIndex, x + 4, y - lineIndex++); - - // draw turret - canvas_draw_line(canvas, x - 2, y - lineIndex, x + 1, y - lineIndex++); - canvas_draw_line(canvas, x - 2, y - lineIndex, x, y - lineIndex++); - } else { - // Draw tank base - canvas_draw_line(canvas, x - 3, y - lineIndex, x + 3, y - lineIndex++); - canvas_draw_line(canvas, x - 4, y - lineIndex, x + 4, y - lineIndex++); - canvas_draw_line(canvas, x - 4, y - lineIndex, x + 4, y - lineIndex++); - - // draw turret - canvas_draw_line(canvas, x - 1, y - lineIndex, x + 2, y - lineIndex++); - canvas_draw_line(canvas, x, y - lineIndex, x + 2, y - lineIndex++); - } -} - -static void scorched_tanks_render_callback(Canvas* const canvas, void* ctx) { - const Game* game_state = acquire_mutex((ValueMutex*)ctx, 25); - - if(game_state == NULL) { - return; - } - - canvas_draw_frame(canvas, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - - canvas_set_color(canvas, ColorBlack); - - if(game_state->isShooting) { - canvas_draw_dot(canvas, game_state->bulletPosition.x, game_state->bulletPosition.y); - } - - for(int a = 1; a < SCREEN_WIDTH; a++) { - canvas_draw_line( - canvas, - game_state->ground[a - 1].x, - game_state->ground[a - 1].y, - game_state->ground[a].x, - game_state->ground[a].y); - - if(game_state->trajectory[a].y != 0) { - canvas_draw_dot(canvas, game_state->trajectory[a].x, game_state->trajectory[a].y); - } - } - - scorched_tanks_draw_tank( - canvas, - game_state->enemy.locationX, - game_state->ground[game_state->enemy.locationX].y - TANK_COLLIDER_SIZE, - true); - - scorched_tanks_draw_tank( - canvas, - game_state->player.locationX, - game_state->ground[game_state->player.locationX].y - TANK_COLLIDER_SIZE, - false); - - int aimX1 = 0; - int aimY1 = 0; - int aimX2 = 0; - int aimY2 = 0; - - if(game_state->isPlayerTurn) { - aimX1 = game_state->player.locationX; - aimY1 = game_state->ground[game_state->player.locationX].y - TANK_COLLIDER_SIZE; - - double sinFromAngle = scorched_tanks_sin[game_state->player.aimAngle]; - double cosFromAngle = scorched_tanks_cos[game_state->player.aimAngle]; - aimX2 = aimX1 + TANK_BARREL_LENGTH * cosFromAngle; - aimY2 = aimY1 + TANK_BARREL_LENGTH * sinFromAngle; - - aimX1 += 1; - aimX2 += 1; - } else { - aimX1 = game_state->enemy.locationX; - aimY1 = game_state->ground[game_state->enemy.locationX].y - TANK_COLLIDER_SIZE; - - double sinFromAngle = scorched_tanks_sin[game_state->enemy.aimAngle]; - double cosFromAngle = scorched_tanks_cos[game_state->enemy.aimAngle]; - aimX2 = aimX1 + TANK_BARREL_LENGTH * cosFromAngle; - aimY2 = aimY1 + TANK_BARREL_LENGTH * sinFromAngle; - - aimX2 = aimX1 - (aimX2 - aimX1); - - aimX1 -= 1; - aimX2 -= 1; - } - - canvas_draw_line(canvas, aimX1, aimY1 - 3, aimX2, aimY2 - 3); - - canvas_set_font(canvas, FontSecondary); - - char buffer2[12]; - snprintf(buffer2, sizeof(buffer2), "wind: %i", game_state->windSpeed - MAX_WIND / 2); - canvas_draw_str(canvas, 55, 10, buffer2); - - if(game_state->isPlayerTurn) { - canvas_draw_str(canvas, 93, 10, "player1"); - - char buffer[12]; - snprintf(buffer, sizeof(buffer), "a: %u", game_state->player.aimAngle); - canvas_draw_str(canvas, 2, 10, buffer); - - snprintf(buffer, sizeof(buffer), "p: %u", game_state->player.firePower); - canvas_draw_str(canvas, 27, 10, buffer); - } else { - canvas_draw_str(canvas, 93, 10, "player2"); - - char buffer[12]; - snprintf(buffer, sizeof(buffer), "a: %u", game_state->enemy.aimAngle); - canvas_draw_str(canvas, 2, 10, buffer); - - snprintf(buffer, sizeof(buffer), "p: %u", game_state->enemy.firePower); - canvas_draw_str(canvas, 27, 10, buffer); - } - - release_mutex((ValueMutex*)ctx, game_state); -} - -static void scorched_tanks_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) { - furi_assert(event_queue); - - ScorchedTanksEvent event = {.type = EventTypeKey, .input = *input_event}; - furi_message_queue_put(event_queue, &event, FuriWaitForever); -} - -static void scorched_tanks_update_timer_callback(FuriMessageQueue* event_queue) { - furi_assert(event_queue); - - ScorchedTanksEvent event = {.type = EventTypeTick}; - furi_message_queue_put(event_queue, &event, 0); -} - -static void scorched_tanks_increase_power(Game* game_state) { - if(game_state->player.firePower < MAX_FIRE_POWER && !game_state->isShooting) { - if(game_state->isPlayerTurn && game_state->player.firePower < MAX_FIRE_POWER) { - game_state->player.firePower++; - } - - if(!game_state->isPlayerTurn && game_state->enemy.firePower < MAX_FIRE_POWER) { - game_state->enemy.firePower++; - } - } -} - -static void scorched_tanks_decrease_power(Game* game_state) { - if(game_state->player.firePower > MIN_FIRE_POWER && !game_state->isShooting) { - if(game_state->isPlayerTurn && game_state->player.firePower > MIN_FIRE_POWER) { - game_state->player.firePower--; - } - - if(!game_state->isPlayerTurn && game_state->enemy.firePower > MIN_FIRE_POWER) { - game_state->enemy.firePower--; - } - } -} - -static void scorched_tanks_aim_up(Game* game_state) { - if(!game_state->isShooting) { - if(game_state->isPlayerTurn && game_state->player.aimAngle < 90) { - game_state->player.aimAngle++; - } - - if(!game_state->isPlayerTurn && game_state->enemy.aimAngle < 90) { - game_state->enemy.aimAngle++; - } - } -} - -static void scorched_tanks_aim_down(Game* game_state) { - if(game_state->player.aimAngle > 0 && !game_state->isShooting) { - if(game_state->isPlayerTurn) { - game_state->player.aimAngle--; - } else { - game_state->enemy.aimAngle--; - } - } -} - -const NotificationSequence sequence_long_vibro = { - &message_vibro_on, - &message_delay_500, - &message_vibro_off, - NULL, -}; - -static void scorched_tanks_fire(Game* game_state) { - if(!game_state->isShooting) { - if(game_state->isPlayerTurn) { - double sinFromAngle = scorched_tanks_sin[game_state->player.aimAngle]; - double cosFromAngle = scorched_tanks_cos[game_state->player.aimAngle]; - unsigned char aimX1 = game_state->player.locationX; - unsigned char aimY1 = - game_state->ground[game_state->player.locationX].y - TANK_COLLIDER_SIZE; - int aimX2 = aimX1 + TANK_BARREL_LENGTH * cosFromAngle; - int aimY2 = aimY1 + TANK_BARREL_LENGTH * sinFromAngle; - game_state->bulletPosition.x = aimX2; - game_state->bulletPosition.y = aimY2; - game_state->bulletVector.x = scorched_tanks_cos[game_state->player.aimAngle] * - ((double)game_state->player.firePower / 10); - game_state->bulletVector.y = scorched_tanks_sin[game_state->player.aimAngle] * - ((double)game_state->player.firePower / 10); - } else { - double sinFromAngle = scorched_tanks_sin[game_state->enemy.aimAngle]; - double cosFromAngle = scorched_tanks_cos[game_state->enemy.aimAngle]; - unsigned char aimX1 = game_state->enemy.locationX; - unsigned char aimY1 = - game_state->ground[game_state->enemy.locationX].y - TANK_COLLIDER_SIZE; - int aimX2 = aimX1 + TANK_BARREL_LENGTH * cosFromAngle; - int aimY2 = aimY1 + TANK_BARREL_LENGTH * sinFromAngle; - aimX2 = aimX1 - (aimX2 - aimX1); - - game_state->bulletPosition.x = aimX2; - game_state->bulletPosition.y = aimY2; - game_state->bulletVector.x = -scorched_tanks_cos[game_state->enemy.aimAngle] * - ((double)game_state->enemy.firePower / 10); - game_state->bulletVector.y = scorched_tanks_sin[game_state->enemy.aimAngle] * - ((double)game_state->enemy.firePower / 10); - } - - game_state->trajectoryAnimationStep = 0; - - for(int x = 0; x < SCREEN_WIDTH; x++) { - game_state->trajectory[x].x = 0; - game_state->trajectory[x].y = 0; - } - - game_state->isShooting = true; - - NotificationApp* notification = furi_record_open("notification"); - notification_message(notification, &sequence_long_vibro); - notification_message(notification, &sequence_blink_white_100); - furi_record_close("notification"); - } -} - -int32_t scorched_tanks_game_app(void* p) { - UNUSED(p); - srand(DWT->CYCCNT); - - FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(ScorchedTanksEvent)); - - Game* game_state = malloc(sizeof(Game)); - scorched_tanks_init_game(game_state); - - ValueMutex state_mutex; - if(!init_mutex(&state_mutex, game_state, sizeof(ScorchedTanksEvent))) { - FURI_LOG_E("ScorchedTanks", "cannot create mutex\r\n"); - free(game_state); - return 255; - } - - ViewPort* view_port = view_port_alloc(); - view_port_draw_callback_set(view_port, scorched_tanks_render_callback, &state_mutex); - view_port_input_callback_set(view_port, scorched_tanks_input_callback, event_queue); - - FuriTimer* timer = - furi_timer_alloc(scorched_tanks_update_timer_callback, FuriTimerTypePeriodic, event_queue); - furi_timer_start(timer, 2000); - - // Open GUI and register view_port - Gui* gui = furi_record_open(RECORD_GUI); - gui_add_view_port(gui, view_port, GuiLayerFullscreen); - - ScorchedTanksEvent event; - for(bool processing = true; processing;) { - FuriStatus event_status = furi_message_queue_get(event_queue, &event, 50); - - if(event.type == EventTypeKey) { // && game->isPlayerTurn - if(event.input.type == InputTypeRepeat || event.input.type == InputTypeShort) { - switch(event.input.key) { - case InputKeyUp: - scorched_tanks_aim_up(game_state); - break; - case InputKeyDown: - scorched_tanks_aim_down(game_state); - break; - case InputKeyRight: - scorched_tanks_increase_power(game_state); - break; - case InputKeyLeft: - scorched_tanks_decrease_power(game_state); - break; - case InputKeyOk: - scorched_tanks_fire(game_state); - break; - case InputKeyBack: - processing = false; - break; - default: - break; - } - } - } else if(event.type == EventTypeTick) { - scorched_tanks_calculate_trajectory(game_state); - } - - view_port_update(view_port); - release_mutex(&state_mutex, game_state); - } - - furi_timer_free(timer); - view_port_enabled_set(view_port, false); - gui_remove_view_port(gui, view_port); - furi_record_close(RECORD_GUI); - view_port_free(view_port); - furi_message_queue_free(event_queue); - delete_mutex(&state_mutex); - free(game_state); - - return 0; -} diff --git a/applications/plugins/scorched_tanks/scorched_tanks_v1.gif b/applications/plugins/scorched_tanks/scorched_tanks_v1.gif deleted file mode 100644 index 45b2ce117..000000000 Binary files a/applications/plugins/scorched_tanks/scorched_tanks_v1.gif and /dev/null differ diff --git a/applications/plugins/usbkeyboard/views/usb_hid_keyboard.c b/applications/plugins/usbkeyboard/views/usb_hid_keyboard.c index 18b278685..f8e61e4c3 100644 --- a/applications/plugins/usbkeyboard/views/usb_hid_keyboard.c +++ b/applications/plugins/usbkeyboard/views/usb_hid_keyboard.c @@ -43,7 +43,7 @@ typedef struct { #define KEY_WIDTH 9 #define KEY_HEIGHT 12 #define KEY_PADDING 1 -#define ROW_COUNT 6 +#define ROW_COUNT 7 #define COLUMN_COUNT 12 // 0 width items are not drawn, but there value is used diff --git a/applications/services/desktop/scenes/desktop_scene_lock_menu.c b/applications/services/desktop/scenes/desktop_scene_lock_menu.c index 6f3d14749..d5582bf76 100644 --- a/applications/services/desktop/scenes/desktop_scene_lock_menu.c +++ b/applications/services/desktop/scenes/desktop_scene_lock_menu.c @@ -11,7 +11,6 @@ #include "desktop_scene_i.h" #include "desktop_scene.h" #include "../helpers/pin_lock.h" -#include #define TAG "DesktopSceneLock" @@ -69,33 +68,12 @@ bool desktop_scene_lock_menu_on_event(void* context, SceneManagerEvent event) { } consumed = true; break; - case DesktopLockMenuEventPinLockShutdown: - if(desktop->settings.pin_code.length > 0) { - desktop_pin_lock(&desktop->settings); - desktop_lock(desktop); - } else { - LoaderStatus status = - loader_start(desktop->loader, "Desktop", DESKTOP_SETTINGS_RUN_PIN_SETUP_ARG); - if(status == LoaderStatusOk) { - scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 1); - } else { - FURI_LOG_E(TAG, "Unable to start desktop settings"); - } - } - consumed = true; - Power* power = furi_record_open(RECORD_POWER); - furi_delay_ms(666); - power_off(power); - furi_record_close(RECORD_POWER); - break; - case DesktopLockMenuEventExit: - scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 0); - case DesktopLockMenuEventDummyModeOn: + case DesktopLockMenuEventSFWModeOn: desktop_set_sfw_mode_state(desktop, true); scene_manager_search_and_switch_to_previous_scene( desktop->scene_manager, DesktopSceneMain); break; - case DesktopLockMenuEventDummyModeOff: + case DesktopLockMenuEventSFWModeOff: desktop_set_sfw_mode_state(desktop, false); scene_manager_search_and_switch_to_previous_scene( desktop->scene_manager, DesktopSceneMain); @@ -111,4 +89,4 @@ bool desktop_scene_lock_menu_on_event(void* context, SceneManagerEvent event) { void desktop_scene_lock_menu_on_exit(void* context) { UNUSED(context); -} +} \ No newline at end of file diff --git a/applications/services/desktop/views/desktop_events.h b/applications/services/desktop/views/desktop_events.h index 3c9cfab8f..82ca43c4c 100644 --- a/applications/services/desktop/views/desktop_events.h +++ b/applications/services/desktop/views/desktop_events.h @@ -43,8 +43,8 @@ typedef enum { DesktopLockMenuEventPinLock, DesktopLockMenuEventPinLockShutdown, DesktopLockMenuEventExit, - DesktopLockMenuEventDummyModeOn, - DesktopLockMenuEventDummyModeOff, + DesktopLockMenuEventSFWModeOn, + DesktopLockMenuEventSFWModeOff, DesktopAnimationEventCheckAnimation, DesktopAnimationEventNewIdleAnimation, diff --git a/applications/services/desktop/views/desktop_view_lock_menu.c b/applications/services/desktop/views/desktop_view_lock_menu.c index 60083e499..77eedcb8c 100644 --- a/applications/services/desktop/views/desktop_view_lock_menu.c +++ b/applications/services/desktop/views/desktop_view_lock_menu.c @@ -9,19 +9,11 @@ #define LOCK_MENU_ITEMS_NB 5 -static void desktop_view_lock_menu_sfwmode_changed(bool isThisGameMode) { - DesktopSettingsApp* app = malloc(sizeof(DesktopSettingsApp)); - DESKTOP_SETTINGS_LOAD(&app->settings); - app->settings.is_sfwmode = isThisGameMode; - DESKTOP_SETTINGS_SAVE(&app->settings); -} - typedef enum { DesktopLockMenuIndexLock, DesktopLockMenuIndexPinLock, DesktopLockMenuIndexPinLockShutdown, - // DesktopLockMenuIndexGameMode, - DesktopLockMenuIndexDummy, + DesktopLockMenuIndexSFW, DesktopLockMenuIndexTotalCount } DesktopLockMenuIndex; @@ -83,9 +75,7 @@ void desktop_lock_menu_draw_callback(Canvas* canvas, void* model) { } else { str = "Set PIN + Off"; } - // } else if(i == DesktopLockMenuIndexGameMode) { - // str = "Games Mode"; - } else if(i == DesktopLockMenuIndexDummy) { + } else if(i == DesktopLockMenuIndexSFW) { if(m->sfw_mode) { str = "NSFW Mode"; } else { @@ -155,12 +145,12 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) { // desktop_view_lock_menu_sfwmode_changed(1); // DOLPHIN_DEED(getRandomDeed()); // lock_menu->callback(DesktopLockMenuEventExit, lock_menu->context); - } else if(idx == DesktopLockMenuIndexDummy) { + } else if(idx == DesktopLockMenuIndexSFW) { // DOLPHIN_DEED(getRandomDeed()); if((sfw_mode == false) && (event->type == InputTypeShort)) { - lock_menu->callback(DesktopLockMenuEventDummyModeOn, lock_menu->context); + lock_menu->callback(DesktopLockMenuEventSFWModeOn, lock_menu->context); } else if((sfw_mode == true) && (event->type == InputTypeShort)) { - lock_menu->callback(DesktopLockMenuEventDummyModeOff, lock_menu->context); + lock_menu->callback(DesktopLockMenuEventSFWModeOff, lock_menu->context); } } consumed = true; diff --git a/applications/services/dolphin/helpers/dolphin_state.c b/applications/services/dolphin/helpers/dolphin_state.c index 806259b69..eb34e87ea 100644 --- a/applications/services/dolphin/helpers/dolphin_state.c +++ b/applications/services/dolphin/helpers/dolphin_state.c @@ -81,7 +81,7 @@ uint64_t dolphin_state_timestamp() { return furi_hal_rtc_datetime_to_timestamp(&datetime); } -bool dolphin_state_is_levelup(uint32_t icounter) { +bool dolphin_state_is_levelup(int icounter) { for (int i = 0; i<30; ++i) { if ((icounter == level_array[i])) { return true; @@ -90,7 +90,7 @@ bool dolphin_state_is_levelup(uint32_t icounter) { return false; } -uint8_t dolphin_get_level(uint32_t icounter) { +uint8_t dolphin_get_level(int icounter) { for (int i = 0; i < 29; ++i) { if (icounter <= level_array[i]) { return i + 1; @@ -99,7 +99,7 @@ for (int i = 0; i < 29; ++i) { return 30; } -uint32_t dolphin_state_xp_above_last_levelup(uint32_t icounter) { +uint32_t dolphin_state_xp_above_last_levelup(int icounter) { if(level_array[0] > icounter) { for(int i = 1; i < 29; ++i) { if(icounter <= level_array[i]) { @@ -110,7 +110,7 @@ uint32_t dolphin_state_xp_above_last_levelup(uint32_t icounter) { return icounter; } -uint32_t dolphin_state_xp_to_levelup(uint32_t icounter) { +uint32_t dolphin_state_xp_to_levelup(int icounter) { for(int i = 0; i < 29; ++i) { if(icounter <= level_array[i]) { return level_array[i] - icounter; diff --git a/applications/services/dolphin/helpers/dolphin_state.h b/applications/services/dolphin/helpers/dolphin_state.h index 3e02fb872..edd7878e9 100644 --- a/applications/services/dolphin/helpers/dolphin_state.h +++ b/applications/services/dolphin/helpers/dolphin_state.h @@ -37,12 +37,12 @@ void dolphin_state_on_deed(DolphinState* dolphin_state, DolphinDeed deed); void dolphin_state_butthurted(DolphinState* dolphin_state); -uint32_t dolphin_state_xp_to_levelup(uint32_t icounter); +uint32_t dolphin_state_xp_to_levelup(int icounter); -uint32_t dolphin_state_xp_above_last_levelup(uint32_t icounter); +uint32_t dolphin_state_xp_above_last_levelup(int icounter); -bool dolphin_state_is_levelup(uint32_t icounter); +bool dolphin_state_is_levelup(int icounter); void dolphin_state_increase_level(DolphinState* dolphin_state); -uint8_t dolphin_get_level(uint32_t icounter); +uint8_t dolphin_get_level(int icounter); diff --git a/applications/services/gui/modules/file_browser_worker.c b/applications/services/gui/modules/file_browser_worker.c index 9f99617a1..eadc7f219 100644 --- a/applications/services/gui/modules/file_browser_worker.c +++ b/applications/services/gui/modules/file_browser_worker.c @@ -386,7 +386,6 @@ BrowserWorker* file_browser_worker_alloc( browser->filter_extension = furi_string_alloc_set(filter_ext); browser->skip_assets = skip_assets; browser->hide_dot_files = hide_dot_files; - browser->path_start = furi_string_alloc_set(path); browser->path_current = furi_string_alloc_set(path); browser->path_next = furi_string_alloc_set(path); @@ -494,4 +493,4 @@ void file_browser_worker_load(BrowserWorker* browser, uint32_t offset, uint32_t browser->load_offset = offset; browser->load_count = count; furi_thread_flags_set(furi_thread_get_id(browser->thread), WorkerEvtLoad); -} +} \ No newline at end of file diff --git a/applications/services/gui/modules/file_browser_worker.h b/applications/services/gui/modules/file_browser_worker.h index 3b4be6aa7..3b1373c14 100644 --- a/applications/services/gui/modules/file_browser_worker.h +++ b/applications/services/gui/modules/file_browser_worker.h @@ -67,4 +67,4 @@ void file_browser_worker_load(BrowserWorker* browser, uint32_t offset, uint32_t #ifdef __cplusplus } -#endif +#endif \ No newline at end of file diff --git a/applications/services/infraredsrv/infrared_cli.c b/applications/services/infraredsrv/infrared_cli.c index 5f5e2d4bb..b584919ea 100644 --- a/applications/services/infraredsrv/infrared_cli.c +++ b/applications/services/infraredsrv/infrared_cli.c @@ -455,7 +455,7 @@ static void } while(false); furi_string_free(remote_path); - infrared_brute_force_reset(brute_force); + //infrared_brute_force_reset(brute_force); infrared_brute_force_free(brute_force); } diff --git a/applications/services/loader/loader.c b/applications/services/loader/loader.c index e648342e1..8636137b7 100644 --- a/applications/services/loader/loader.c +++ b/applications/services/loader/loader.c @@ -48,18 +48,13 @@ static void loader_menu_callback(void* _ctx, uint32_t index) { furi_assert(application->app); furi_assert(application->name); - furi_assert(application->link); - if(strcmp(application->link, "NULL") != 0) { - LoaderStatus status = loader_start(NULL, "Applications", application->link); - } else { - if(!loader_lock(loader_instance)) { - FURI_LOG_E(TAG, "Loader is locked"); - return; - } - - loader_start_application(application, NULL); + if(!loader_lock(loader_instance)) { + FURI_LOG_E(TAG, "Loader is locked"); + return; } + + loader_start_application(application, NULL); } static void loader_submenu_callback(void* context, uint32_t index) { diff --git a/applications/settings/dolphin_passport/passport.c b/applications/settings/dolphin_passport/passport.c index ea7f823c9..36d97da47 100644 --- a/applications/settings/dolphin_passport/passport.c +++ b/applications/settings/dolphin_passport/passport.c @@ -12,18 +12,15 @@ #define MOODS_TOTAL 3 #define BUTTHURT_MAX 3 -static const Icon* const portrait_happy[BUTTHURT_MAX] = { - &I_flipper}; +static const Icon* const portrait_happy[BUTTHURT_MAX] = {&I_flipper}; // &I_passport_happy1_46x49, // &I_passport_happy2_46x49, // &I_passport_happy3_46x49}; -static const Icon* const portrait_ok[BUTTHURT_MAX] = { - &I_flipper}; +static const Icon* const portrait_ok[BUTTHURT_MAX] = {&I_flipper}; // &I_passport_okay1_46x49, // &I_passport_okay2_46x49, // &I_passport_okay3_46x49}; -static const Icon* const portrait_bad[BUTTHURT_MAX] = { - &I_flipper}; +static const Icon* const portrait_bad[BUTTHURT_MAX] = {&I_flipper}; // &I_passport_bad1_46x49, // &I_passport_bad2_46x49, // &I_passport_bad3_46x49}; @@ -43,37 +40,39 @@ static void render_callback(Canvas* canvas, void* ctx) { DolphinStats* stats = ctx; DesktopSettings* settings = malloc(sizeof(DesktopSettings)); - DESKTOP_SETTINGS_LOAD(settings) + DESKTOP_SETTINGS_LOAD(settings); char level_str[20]; char xp_str[12]; char mood_str[32]; uint8_t mood = 0; - if(Settings->sfw_mode) ( - if(stats->butthurt <= 4) { - mood = 0; - snprintf(mood_str, 20, "Mood: Happy"); - } else if(stats->butthurt <= 9) { - mood = 1; - snprintf(mood_str, 20, "Mood: Okay"); - } else { - mood = 2; - snprintf(mood_str, 20, "Mood: Angry"); - } - ) else ( - if(stats->butthurt <= 4) { - mood = 0; - snprintf(mood_str, 20, "Status: Wet"); - } else if(stats->butthurt <= 9) { - mood = 1; - snprintf(mood_str, 20, "Status: Horny"); - } else { - mood = 2; - snprintf(mood_str, 20, "Status: Desperate"); - } + if(settings->sfw_mode) + { + if(stats->butthurt <= 4) { + mood = 0; + snprintf(mood_str, 20, "Mood: Happy"); + } else if(stats->butthurt <= 9) { + mood = 1; + snprintf(mood_str, 20, "Mood: Okay"); + } else { + mood = 2; + snprintf(mood_str, 20, "Mood: Angry"); + }} + else + { + if(stats->butthurt <= 4) { + mood = 0; + snprintf(mood_str, 20, "Status: Wet"); + } else if(stats->butthurt <= 9) { + mood = 1; + snprintf(mood_str, 20, "Status: Horny"); + } else { + mood = 2; + snprintf(mood_str, 20, "Status: Desperate"); + } - ) + }; uint32_t xp_progress = 0; uint32_t xp_to_levelup = dolphin_state_xp_to_levelup(stats->icounter); uint32_t xp_above_last_levelup = dolphin_state_xp_above_last_levelup(stats->icounter); @@ -109,7 +108,6 @@ static void render_callback(Canvas* canvas, void* ctx) { canvas_set_color(canvas, ColorWhite); canvas_draw_box(canvas, 123 - xp_progress, 45, xp_progress + 1, 5); canvas_set_color(canvas, ColorBlack); - free(settings); } diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv index 1ef4999b9..02e56b233 100644 --- a/firmware/targets/f7/api_symbols.csv +++ b/firmware/targets/f7/api_symbols.csv @@ -1,5 +1,5 @@ entry,status,name,type,params -Version,+,11.4,, +Version,v,14.2,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/cli/cli.h,, Header,+,applications/services/cli/cli_vcp.h,, @@ -846,7 +846,7 @@ Function,+,file_browser_set_callback,void,"FileBrowser*, FileBrowserCallback, vo Function,+,file_browser_set_item_callback,void,"FileBrowser*, FileBrowserLoadItemCallback, void*" Function,+,file_browser_start,void,"FileBrowser*, FuriString*" Function,+,file_browser_stop,void,FileBrowser* -Function,+,file_browser_worker_alloc,BrowserWorker*,"FuriString*, const char*, const char*, _Bool, _Bool" +Function,?,file_browser_worker_alloc,BrowserWorker*,"FuriString*, const char*, const char*, _Bool, _Bool" Function,+,file_browser_worker_folder_enter,void,"BrowserWorker*, FuriString*, int32_t" Function,+,file_browser_worker_folder_exit,void,BrowserWorker* Function,+,file_browser_worker_folder_refresh,void,"BrowserWorker*, int32_t" @@ -854,7 +854,7 @@ Function,+,file_browser_worker_free,void,BrowserWorker* Function,+,file_browser_worker_is_in_start_folder,_Bool,BrowserWorker* Function,+,file_browser_worker_load,void,"BrowserWorker*, uint32_t, uint32_t" Function,+,file_browser_worker_set_callback_context,void,"BrowserWorker*, void*" -Function,+,file_browser_worker_set_config,void,"BrowserWorker*, FuriString*, const char*, _Bool, _Bool" +Function,?,file_browser_worker_set_config,void,"BrowserWorker*, FuriString*, const char*, _Bool, _Bool" Function,+,file_browser_worker_set_folder_callback,void,"BrowserWorker*, BrowserWorkerFolderOpenCallback" Function,+,file_browser_worker_set_item_callback,void,"BrowserWorker*, BrowserWorkerListItemCallback" Function,+,file_browser_worker_set_list_callback,void,"BrowserWorker*, BrowserWorkerListLoadCallback" diff --git a/site_scons/cc.scons b/site_scons/cc.scons index 5c7df2575..95888dc95 100644 --- a/site_scons/cc.scons +++ b/site_scons/cc.scons @@ -21,14 +21,11 @@ ENV.AppendUnique( # "-MMD", # "-MP", "-Wall", - # "-Wextra", - # "-Werror", + "-Wextra", + "-Werror", "-Wno-address-of-packed-member", - "-Wimplicit-function-declaration", - "-Wbuiltin-declaration-mismatch", "-Wredundant-decls", "-Wdouble-promotion", - "-Wchar-subscripts", "-fdata-sections", "-ffunction-sections", "-fsingle-precision-constant", @@ -36,11 +33,6 @@ ENV.AppendUnique( # Generates .su files with stack usage information # "-fstack-usage", "-g", - "-Wno-unused-parameter", - "-Wno-type-limits", - "-Wno-unused-variable", - # "-Wno-stringop-overread", - # "-Wno-stringop-overflow", ], CPPDEFINES=[ "_GNU_SOURCE", @@ -52,4 +44,4 @@ ENV.AppendUnique( "-mlittle-endian", "-mthumb", ], -) +) \ No newline at end of file