From cf6dc9f8953c10a4a058d0ac9e33c2dafec625b1 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Wed, 1 Mar 2023 00:25:11 +0300 Subject: [PATCH 1/5] Fix timings for CAME protocol, Fix #280 --- lib/subghz/protocols/came.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/lib/subghz/protocols/came.c b/lib/subghz/protocols/came.c index bed26d7d2..00e2f49f2 100644 --- a/lib/subghz/protocols/came.c +++ b/lib/subghz/protocols/came.c @@ -117,13 +117,25 @@ static bool subghz_protocol_encoder_came_get_upload(SubGhzProtocolEncoderCame* i instance->encoder.size_upload = size_upload; } //Send header - instance->encoder.upload[index++] = level_duration_make( - false, - (((instance->generic.data_count_bit == CAME_24_COUNT_BIT) || - (instance->generic.data_count_bit == - subghz_protocol_came_const.min_count_bit_for_found)) ? - (uint32_t)subghz_protocol_came_const.te_short * 76 : - (uint32_t)subghz_protocol_came_const.te_short * 39)); + // CAME 24 Bit = 24320 us + if(instance->generic.data_count_bit == CAME_24_COUNT_BIT) { + instance->encoder.upload[index++] = + level_duration_make(false, (uint32_t)subghz_protocol_came_const.te_short * 76); + } else if( + (instance->generic.data_count_bit == subghz_protocol_came_const.min_count_bit_for_found) || + (instance->generic.data_count_bit == AIRFORCE_COUNT_BIT)) { + // CAME 12 Bit Original only! and Airforce protocol = 15040 us + instance->encoder.upload[index++] = + level_duration_make(false, (uint32_t)subghz_protocol_came_const.te_short * 47); + } else if(instance->generic.data_count_bit == PRASTEL_COUNT_BIT) { + // PRASTEL = 11520 us + instance->encoder.upload[index++] = + level_duration_make(false, (uint32_t)subghz_protocol_came_const.te_short * 36); + } else { + // Some wrong detected protocols, 5120 us + instance->encoder.upload[index++] = + level_duration_make(false, (uint32_t)subghz_protocol_came_const.te_short * 16); + } //Send start bit instance->encoder.upload[index++] = level_duration_make(true, (uint32_t)subghz_protocol_came_const.te_short); From cc52253e22602d707580989541ce6c841f154b41 Mon Sep 17 00:00:00 2001 From: Astra <93453568+Astrrra@users.noreply.github.com> Date: Mon, 27 Feb 2023 19:25:56 +0200 Subject: [PATCH 2/5] Exit to the main menu on pressing BACK --- applications/main/nfc/scenes/nfc_scene_read_card_success.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/applications/main/nfc/scenes/nfc_scene_read_card_success.c b/applications/main/nfc/scenes/nfc_scene_read_card_success.c index 9b2a2188e..ee80ee768 100644 --- a/applications/main/nfc/scenes/nfc_scene_read_card_success.c +++ b/applications/main/nfc/scenes/nfc_scene_read_card_success.c @@ -46,6 +46,9 @@ bool nfc_scene_read_card_success_on_event(void* context, SceneManagerEvent event if(event.event == GuiButtonTypeLeft) { consumed = scene_manager_previous_scene(nfc->scene_manager); } + } else if(event.type == SceneManagerEventTypeBack) { + consumed = + scene_manager_search_and_switch_to_previous_scene(nfc->scene_manager, NfcSceneStart); } return consumed; } From ab6b3f8ed3762b377d9f646551b6c607320442aa Mon Sep 17 00:00:00 2001 From: Georgii Surkov Date: Mon, 27 Feb 2023 20:30:11 +0300 Subject: [PATCH 3/5] Fix hangups when the user mashes the transmit button --- applications/main/infrared/infrared.c | 21 +++++++++++++-------- applications/main/infrared/infrared_i.h | 1 + 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/applications/main/infrared/infrared.c b/applications/main/infrared/infrared.c index 14729e0d8..a88306cc5 100644 --- a/applications/main/infrared/infrared.c +++ b/applications/main/infrared/infrared.c @@ -3,6 +3,8 @@ #include #include +#define INFRARED_TX_MIN_INTERVAL_MS 50U + static const NotificationSequence* infrared_notification_sequences[] = { &sequence_success, &sequence_set_only_green_255, @@ -308,10 +310,13 @@ bool infrared_rename_current_remote(Infrared* infrared, const char* name) { void infrared_tx_start_signal(Infrared* infrared, InfraredSignal* signal) { if(infrared->app_state.is_transmitting) { - FURI_LOG_D(INFRARED_LOG_TAG, "Transmitter is already active"); return; - } else { - infrared->app_state.is_transmitting = true; + } + + const uint32_t time_elapsed = furi_get_tick() - infrared->app_state.last_transmit_time; + + if(time_elapsed < INFRARED_TX_MIN_INTERVAL_MS) { + return; } if(infrared_signal_is_raw(signal)) { @@ -328,6 +333,8 @@ void infrared_tx_start_signal(Infrared* infrared, InfraredSignal* signal) { infrared_worker_tx_set_get_signal_callback( infrared->worker, infrared_worker_tx_get_signal_steady_callback, infrared); infrared_worker_tx_start(infrared->worker); + + infrared->app_state.is_transmitting = true; } void infrared_tx_start_button_index(Infrared* infrared, size_t button_index) { @@ -337,26 +344,24 @@ void infrared_tx_start_button_index(Infrared* infrared, size_t button_index) { InfraredSignal* signal = infrared_remote_button_get_signal(button); infrared_tx_start_signal(infrared, signal); - infrared_play_notification_message(infrared, InfraredNotificationMessageBlinkStartSend); } void infrared_tx_start_received(Infrared* infrared) { infrared_tx_start_signal(infrared, infrared->received_signal); - infrared_play_notification_message(infrared, InfraredNotificationMessageBlinkStartSend); } void infrared_tx_stop(Infrared* infrared) { if(!infrared->app_state.is_transmitting) { - FURI_LOG_D(INFRARED_LOG_TAG, "Transmitter is already stopped"); return; - } else { - infrared->app_state.is_transmitting = false; } infrared_worker_tx_stop(infrared->worker); infrared_worker_tx_set_get_signal_callback(infrared->worker, NULL, NULL); infrared_play_notification_message(infrared, InfraredNotificationMessageBlinkStop); + + infrared->app_state.is_transmitting = false; + infrared->app_state.last_transmit_time = furi_get_tick(); } void infrared_text_store_set(Infrared* infrared, uint32_t bank, const char* text, ...) { diff --git a/applications/main/infrared/infrared_i.h b/applications/main/infrared/infrared_i.h index 72800d994..55b70fc5e 100644 --- a/applications/main/infrared/infrared_i.h +++ b/applications/main/infrared/infrared_i.h @@ -70,6 +70,7 @@ typedef struct { InfraredEditTarget edit_target : 8; InfraredEditMode edit_mode : 8; int32_t current_button_index; + uint32_t last_transmit_time; } InfraredAppState; struct Infrared { From 1f6382e93debf8f3937114a5d282e1440ae80d51 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Wed, 1 Mar 2023 02:57:06 +0300 Subject: [PATCH 4/5] Update changelog and readme --- .drone.yml | 4 ++-- CHANGELOG.md | 8 ++++++-- ReadMe.md | 35 ++++++++++++++++------------------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.drone.yml b/.drone.yml index 67848b6d7..06881b1ab 100644 --- a/.drone.yml +++ b/.drone.yml @@ -198,7 +198,7 @@ steps: [-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md) - [-Download latest extra apps pack-](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps) + [-Download latest extra apps pack-](https://github.com/xMasterX/unleashed-extra-pack/archive/refs/heads/main.zip) [-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/${DRONE_TAG}/flipper-z-f7-update-${DRONE_TAG}.tgz&channel=release-cfw&version=${DRONE_TAG}) @@ -220,7 +220,7 @@ steps: commands: - wget "https://raw.githubusercontent.com/fieu/discord.sh/e1dc1a7595efad2cad8f072f0b3531c470f5b7c8/discord.sh" - chmod +x ./discord.sh - - ./discord.sh --text 'New Unleashed firmware released!\n\nVersion - '${DRONE_TAG}'\n\n[[Github - Changelog]](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')\n\n[-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)\n\n[-Download latest extra apps pack-](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps)\n\n[-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/'${DRONE_TAG}'/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}')\n\n[-Version without custom animations - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-'${DRONE_TAG}'n.tgz&channel=release-cfw&version='${DRONE_TAG}'n)\n\n[-Version with extra apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'e.tgz&channel=release-cfw&version='${DRONE_TAG}'e)' + - ./discord.sh --text 'New Unleashed firmware released!\n\nVersion - '${DRONE_TAG}'\n\n[[Github - Changelog]](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')\n\n[-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)\n\n[-Download latest extra apps pack-](https://github.com/xMasterX/unleashed-extra-pack/archive/refs/heads/main.zip)\n\n[-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/'${DRONE_TAG}'/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}')\n\n[-Version without custom animations - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-'${DRONE_TAG}'n.tgz&channel=release-cfw&version='${DRONE_TAG}'n)\n\n[-Version with extra apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'e.tgz&channel=release-cfw&version='${DRONE_TAG}'e)' - name: "Send extra pack build to telegram" image: appleboy/drone-telegram diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f965db05..27bf40e1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ### New changes -* Remove `apps` folder on your microSD before installing this release to avoid issues! +* If you have copied apps into `apps` folder - remove `apps` folder on your microSD before installing this release to avoid issues! +* SubGHz: Fixed timings for static CAME 12 bit and other types (fixed issue #280) +* SubGHz: Fix #370 and fix other protocol counter issues * SubGHz: **Custom buttons for Nice Flor S / Somfy Telis (+Programming mode)** - now you can use arrow buttons to send signal with different button code * SubGHz: Somfy Telis -> Add manually (create new remote, now with programming button (Prog / 0x8) you can write it into receiver) * SubGHz: BFT Mitto -> Add manually (create new remote, now with programming button (0xF) you can write it into receiver) @@ -7,6 +9,8 @@ * SubGHz: More precise settings for debug counter increase value * Plugins -> MouseJacker: Features, Fixes and improvements (by @MatthisC | PR #366) * Plugins -> HC-SR04: Improve accuracy by measuring microseconds (by @clashlab | PR #367) +* OFW PR: 2441 - Infrared: Fix hangups on repeated button press (by gsurkov) +* OFW PR: 2440 - Fix navigation on unsupported card types (by Astrrra) * OFW: BadUSB UI fixes * OFW: Plugins: move to designated categories -> **We moved some plugins to new categories too** * OFW: Drivers: remove excessive check in bq25896 and make PVS happy @@ -19,7 +23,7 @@ * OFW: SD Cache: moved to diskio layer, invalidation in case of error * OFW: Picopass: factory key support, minor code cleanup -#### [🎲 Download latest extra apps pack](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps) +#### [🎲 Download latest extra apps pack](https://github.com/xMasterX/unleashed-extra-pack/archive/refs/heads/main.zip) [-> How to install firmware](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md) diff --git a/ReadMe.md b/ReadMe.md index 5563bc390..24659d6b6 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -25,7 +25,7 @@ Our Discord Community:

-## Dev builds +## Dev builds (unstable) - https://dev.unleashedflip.com/ - https://t.me/kotnehleb ## Releases in Telegram @@ -35,7 +35,7 @@ Our Discord Community: * Sub-GHz regional TX restrictions removed * Sub-GHz frequency range can be extended in settings file (Warning: It can damage Flipper's hardware) * Many rolling code protocols now have the ability to save & send captured signals -* FAAC SLH (Spa) & BFT Mitto (secure with seed) manual creation +* FAAC SLH (Spa) & BFT Mitto (keeloq secure with seed) manual creation * Sub-GHz static code brute-force plugin * LFRFID Fuzzer plugin * Custom community plugins and games added + all known working apps can be downloaded in extra pack in every release @@ -43,13 +43,25 @@ Our Discord Community: * Picopass/iClass plugin included in releases * Recompiled IR TV Universal Remote for ALL buttons * Universal remote for Projectors, Fans, A/Cs and Audio(soundbars, etc.) -* BadUSB keyboard layouts * Customizable Flipper name +- BadUSB -> Keyboard layouts [(by rien > dummy-decoy)](https://github.com/dummy-decoy/flipperzero-firmware/tree/dummy_decoy/bad_usb_keyboard_layout) +- Sub-GHz -> External CC1101 module support - [(by quen0n)](https://github.com/DarkFlippers/unleashed-firmware/pull/307) +- Sub-GHz -> New frequency analyzer - [(by ClusterM)](https://github.com/DarkFlippers/unleashed-firmware/pull/43) +- Sub-GHz -> Save last used frequency [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77) +- Sub-GHz -> Press OK in frequency analyzer to use detected frequency in Read modes [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77) +- Sub-GHz -> Long press OK button in Sub-GHz Frequency analyzer to switch to Read menu [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/79) +- Lock device with pin(or regular lock if pin not set) by holding UP button on main screen [(by an4tur0r)](https://github.com/DarkFlippers/unleashed-firmware/pull/107) * Sub-GHz -> Press OK in frequency analyzer to use detected frequency in Read modes * Sub-GHz -> Long press OK button in Sub-GHz Frequency analyzer to switch to Read menu * Sub-GHz -> External CC1101 module support +* SubGHz -> **Hold right in received signal list to delete selected signal** +* SubGHz -> **Custom buttons for Keeloq / Alutech AT4N / Nice Flor S / Somfy Telis** - now you can use arrow buttons to send signal with different button code +* SubGHz -> BFT Mitto / Somfy Telis / Nice Flor S manual creation with programming new remote into receiver (use button 0xF for BFT Mitto, 0x8 (Prog) on Somfy Telis) +* SubGHz -> Debug mode counter increase settings (+1 -> +5, +10, default: +1) +* SubGHz -> Debug PIN output settings for protocol development +* Infrared -> Debug TX PIN output settings * Other small fixes and changes throughout -* See other changes in changelog and in readme below +* See other changes in readme below Also check the changelog in releases for latest updates! @@ -156,21 +168,6 @@ Games: - BlackJack [(by teeebor)](https://github.com/teeebor/flipper_games) - 2048 game [(by eugene-kirzhanov)](https://github.com/eugene-kirzhanov/flipper-zero-2048-game) -### Other changes - -- BadUSB -> Keyboard layouts [(by rien > dummy-decoy)](https://github.com/dummy-decoy/flipperzero-firmware/tree/dummy_decoy/bad_usb_keyboard_layout) -- Sub-GHz -> External CC1101 module support - [(by quen0n)](https://github.com/DarkFlippers/unleashed-firmware/pull/307) -- Sub-GHz -> New frequency analyzer - [(by ClusterM)](https://github.com/DarkFlippers/unleashed-firmware/pull/43) -- Sub-GHz -> Save last used frequency [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77) -- Sub-GHz -> Press OK in frequency analyzer to use detected frequency in Read modes [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77) -- Sub-GHz -> Long press OK button in Sub-GHz Frequency analyzer to switch to Read menu [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/79) -- Lock device with pin(or regular lock if pin not set) by holding UP button on main screen [(by an4tur0r)](https://github.com/DarkFlippers/unleashed-firmware/pull/107) -* SubGHz -> **Hold right in received signal list to delete selected signal** -* SubGHz -> **Custom buttons for Keeloq / Alutech AT4N / Nice Flor S / Somfy Telis** - now you can use arrow buttons to send signal with different button code -* SubGHz -> BFT Mitto / Somfy Telis / Nice Flor S manual creation with programming new remote into receiver (use button 0xF for BFT Mitto, 0x8 (Prog) on Somfy Telis) -* SubGHz -> Debug mode counter increase settings (+5, +10, default: +1) -* SubGHz -> Debug PIN output settings for protocol development -* Infrared -> Debug TX PIN output settings # Instructions ## [- How to install firmware](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md) From 3c9ccd2c50440a10fc6b56a2dbca848585fcf61a Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Wed, 1 Mar 2023 00:46:40 +0000 Subject: [PATCH 5/5] Left handed mode --- .../xtreme_app/scenes/xtreme_app_scene_misc.c | 14 ++++++++++++++ applications/services/gui/canvas.c | 9 +++++++++ applications/services/gui/gui.c | 19 +++++++++++++++++++ applications/services/xtreme/settings.c | 1 + applications/services/xtreme/settings.h | 1 + 5 files changed, 44 insertions(+) diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c index 22b5fb1b0..eec11c94a 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c @@ -3,6 +3,7 @@ enum VarItemListIndex { VarItemListIndexSortDirsFirst, VarItemListIndexDarkMode, + VarItemListIndexLeftHanded, VarItemListIndexChangeDeviceName, }; @@ -27,6 +28,14 @@ static void xtreme_app_scene_misc_dark_mode_changed(VariableItem* item) { app->save_settings = true; } +static void xtreme_app_scene_misc_left_handed_changed(VariableItem* item) { + XtremeApp* app = variable_item_get_context(item); + bool value = variable_item_get_current_value_index(item); + variable_item_set_current_value_text(item, value ? "ON" : "OFF"); + XTREME_SETTINGS()->left_handed = value; + app->save_settings = true; +} + void xtreme_app_scene_misc_on_enter(void* context) { XtremeApp* app = context; XtremeSettings* xtreme_settings = XTREME_SETTINGS(); @@ -43,6 +52,11 @@ void xtreme_app_scene_misc_on_enter(void* context) { variable_item_set_current_value_index(item, xtreme_settings->dark_mode); variable_item_set_current_value_text(item, xtreme_settings->dark_mode ? "ON" : "OFF"); + item = variable_item_list_add( + var_item_list, "Exp. Left Handed", 2, xtreme_app_scene_misc_left_handed_changed, app); + variable_item_set_current_value_index(item, xtreme_settings->left_handed); + variable_item_set_current_value_text(item, xtreme_settings->left_handed ? "ON" : "OFF"); + variable_item_list_add(var_item_list, "Change Device Name", 0, NULL, app); variable_item_list_set_enter_callback( diff --git a/applications/services/gui/canvas.c b/applications/services/gui/canvas.c index f2a5f359f..eadbd4834 100644 --- a/applications/services/gui/canvas.c +++ b/applications/services/gui/canvas.c @@ -27,6 +27,8 @@ Canvas* canvas_init() { // Wake up display u8g2_SetPowerSave(&canvas->fb, 0); + canvas_set_orientation(canvas, CanvasOrientationHorizontal); + // Clear buffer and send to device canvas_clear(canvas); canvas_commit(canvas); @@ -408,6 +410,13 @@ void canvas_set_bitmap_mode(Canvas* canvas, bool alpha) { void canvas_set_orientation(Canvas* canvas, CanvasOrientation orientation) { furi_assert(canvas); + if(XTREME_SETTINGS()->left_handed) { + if(orientation == CanvasOrientationHorizontal) { + orientation = CanvasOrientationHorizontalFlip; + } else if(orientation == CanvasOrientationHorizontalFlip) { + orientation = CanvasOrientationHorizontal; + } + } if(canvas->orientation != orientation) { switch(orientation) { case CanvasOrientationHorizontal: diff --git a/applications/services/gui/gui.c b/applications/services/gui/gui.c index 835bca2c8..8e3c432c5 100644 --- a/applications/services/gui/gui.c +++ b/applications/services/gui/gui.c @@ -326,6 +326,25 @@ static void gui_input(Gui* gui, InputEvent* input_event) { gui->ongoing_input_view_port = view_port; } + if(XTREME_SETTINGS()->left_handed) { + switch(input_event->key) { + case InputKeyUp: + input_event->key = InputKeyDown; + break; + case InputKeyDown: + input_event->key = InputKeyUp; + break; + case InputKeyLeft: + input_event->key = InputKeyRight; + break; + case InputKeyRight: + input_event->key = InputKeyLeft; + break; + default: + break; + } + } + if(view_port && view_port == gui->ongoing_input_view_port) { view_port_input(view_port, input_event); } else if(gui->ongoing_input_view_port && input_event->type == InputTypeRelease) { diff --git a/applications/services/xtreme/settings.c b/applications/services/xtreme/settings.c index cb9e1bb2b..8036c8d58 100644 --- a/applications/services/xtreme/settings.c +++ b/applications/services/xtreme/settings.c @@ -42,6 +42,7 @@ void XTREME_SETTINGS_LOAD() { xtreme_settings->butthurt_timer = 43200; // 12 H xtreme_settings->sort_dirs_first = true; // ON xtreme_settings->dark_mode = false; // OFF + xtreme_settings->left_handed = false; // OFF } } } diff --git a/applications/services/xtreme/settings.h b/applications/services/xtreme/settings.h index f1ddfd9a6..b870235ec 100644 --- a/applications/services/xtreme/settings.h +++ b/applications/services/xtreme/settings.h @@ -31,6 +31,7 @@ typedef struct { int32_t butthurt_timer; bool sort_dirs_first; bool dark_mode; + bool left_handed; } XtremeSettings; XtremeSettings* XTREME_SETTINGS();