Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

[FL-1811] FuriHal: move core2 startup to hal init stage, prevent working with flash controller till core2 startup finish. #704

Merged
merged 1 commit into from
Sep 15, 2021
Merged

[FL-1811] FuriHal: move core2 startup to hal init stage, prevent working with flash controller till core2 startup finish. #704

merged 1 commit into from
Sep 15, 2021

Conversation

skotopes
Copy link
Member

What's new

  • FuriHal: move core2 startup to hal init stage
  • FuriHal: prevent working with flash controller till core2 startup finish.

Verification

  • Compile and upload
  • No more crashes on startup

Checklist (do not modify)

  • PR has description of feature/bug or link to Confluence/Jira task
  • Description contains actions to verify feature/bugfix
  • I've built this code, uploaded it to the device and verified feature/bugfix

@skotopes skotopes requested a review from DrZlo13 as a code owner September 15, 2021 14:34
@github-actions
Copy link

Click here to flash the 684213c2 version of this branch via WebUSB.

@skotopes skotopes merged commit 72ca760 into dev Sep 15, 2021
@skotopes skotopes deleted the aku_1811_flash_crash branch September 15, 2021 14:40
skotopes added a commit that referenced this pull request Sep 15, 2021
@skotopes
[FL-1811] FuriHal: move core2 startup to hal init stage, prevent work…
3db456d 
…ing with flash controller till core2 startup finish. #704
skotopes added a commit that referenced this pull request Sep 28, 2021
@Skorpionm @skotopes
[FL-1815, FL-1851, FL-1856] SubGhz: preparation for certification, ad…
a8981d3 
…d deleting stored signals and rename file in SubGHz app (#714)

* [FL-1811] FuriHal: move core2 startup to hal init stage, prevent working with flash controller till core2 startup finish. #704
* SubGhz: fix GO0 low on last hop transmission,  decreased DutyCycle in tests
* SubGhz: test_static fix max 5 sec in transmission mode, DutyCycle <23%
* [FL-1815] SubGhz: prohibiting transmission if it is not within the permitted range for the given region
* SubGhz: fix F7 furi-hal-subghz
* SubGhz: fix logic working tests
* SubGhz: fix princeton encoder for test
* SubGhz: add log princeton encoder
* [FL-1856] Subghz: fix output a double error if the file cannot be opened
* [FL-1851] SubGhz: add deleting Stored Signals in SubGHz App
* SubGhz: add rename file SubGhz app
* SubGhz: update stats message in princeton
* SubGhz: correct spelling
* SubGhz: fix FM config,  add hardware signal processing less than 16 μs,  add added filter for processing short signals
* SubGhz: add Scher-Khan MAGICAR Dinamic protocol
* SubGhz: sync fury targets

Co-authored-by: あく <[email protected]>
DakotaMcCutch added a commit to DakotaMcCutch/flipperzero-firmware that referenced this pull request Jul 7, 2023
@DakotaMcCutch
Squashed commit of the following:
a4d3638 
commit 6fb8276
Author: Dakota McCutcheon <[email protected]>
Date:   Fri Jul 7 11:49:10 2023 -0400

    Modules

commit 9aec813
Author: Dakota McCutcheon <[email protected]>
Date:   Fri Jul 7 11:48:06 2023 -0400

    Modules

commit c18e5f3
Merge: 9586067 3991db4
Author: Dakota McCutcheon <[email protected]>
Date:   Fri Jul 7 11:38:43 2023 -0400

    Merge branch 'release' of https://github.com/DakotaMcCutch/flipperzero-firmware into release

commit 9586067
Merge: 72ad22b 406cb8b
Author: Dakota McCutcheon <[email protected]>
Date:   Fri Jul 7 11:33:12 2023 -0400

    Merge branch 'release' of https://github.com/DakotaMcCutch/flipperzero-firmware into release

commit 3991db4
Merge: 27a8f29 279a33d
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Jul 6 21:01:41 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 279a33d
Merge: 948dafc e6b0494
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Jul 6 02:01:48 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 948dafc
Merge: 7081d76 e7bd547
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Jul 2 04:43:52 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 27a8f29
Merge: 406cb8b 7081d76
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jun 16 16:28:58 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 7081d76
Merge: 60baf2a 5334a0a
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Jun 15 21:27:44 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 60baf2a
Merge: 1ac1f0b b6dbf25
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Jun 14 20:50:13 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 1ac1f0b
Merge: dc3d565 4900e8b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jun 9 22:22:59 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 406cb8b
Merge: e4830a6 dc3d565
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Jun 3 06:21:05 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit dc3d565
Merge: 2d8f262 d9a9fa0
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Jun 3 06:03:02 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit e4830a6
Merge: 16b9764 2d8f262
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Jun 3 01:14:42 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 2d8f262
Merge: 96d97af 1d7966f
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Jun 1 21:50:05 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 96d97af
Merge: 9cedac9 8d2ea14
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue May 30 01:48:41 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 16b9764
Merge: b7f406d 9cedac9
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed May 17 18:28:55 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 9cedac9
Merge: 508dbe4 9dedcd0
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon May 15 20:55:58 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 508dbe4
Merge: 849aa0f aa8a369
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu May 11 19:13:36 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit b7f406d
Merge: 376319c 849aa0f
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Apr 28 00:46:14 2023 +0900

    Merge branch 'release-candidate' into release

commit 849aa0f
Merge: df78ba8 408edb3
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Apr 27 23:01:55 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit df78ba8
Merge: 31e47e9 0ec8fc4
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Apr 26 15:39:56 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 31e47e9
Merge: 085c800 1ef70c0
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Apr 24 16:39:53 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 085c800
Merge: 728320b 4d015a1
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Apr 20 22:10:24 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 376319c
Merge: c41fe8e 728320b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Apr 12 23:13:23 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 728320b
Merge: b556776 33e8bae
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Apr 12 15:12:01 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit b556776
Merge: 9b9dce3 6cc5f30
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Apr 7 11:05:52 2023 +0800

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit c41fe8e
Merge: b698126 9b9dce3
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Mar 28 14:13:19 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 9b9dce3
Merge: e52e30c 27341fc
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Mar 27 16:42:32 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit e52e30c
Merge: f141a67 9a14699
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Mar 23 05:27:22 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit b698126
Merge: 61744b8 f141a67
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Mar 13 16:04:36 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit f141a67
Merge: dec00fe 4bd3dca
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Mar 10 20:15:19 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit dec00fe
Merge: 119c7fe 0190a16
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Mar 10 18:26:49 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 61744b8
Merge: a38a62f 119c7fe
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Feb 28 00:59:33 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 119c7fe
Merge: e9984f8 9ae58f5
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Feb 27 23:59:52 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit e9984f8
Merge: e2e4dcc 478390d
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Feb 27 15:25:21 2023 +0900

    Merge branch 'dev' into release-candidate

commit a38a62f
Merge: 13a0a92 e2e4dcc
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Feb 14 18:53:04 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit e2e4dcc
Merge: ea5fe0e bc06d40
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Feb 14 00:44:31 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit ea5fe0e
Merge: 8a08fd5 82c730b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Feb 9 14:45:49 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 8a08fd5
Merge: 48eb15c 4265057
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Feb 9 14:10:01 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 13a0a92
Merge: 8ee66c3 48eb15c
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Feb 2 21:22:44 2023 +0700

    Merge branch 'release-candidate' into release

commit 48eb15c
Merge: e18056b 01a9854
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Jan 30 16:57:20 2023 +0700

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 8ee66c3
Merge: b60ba76 e18056b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Jan 9 02:02:31 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit e18056b
Merge: 5670397 2c450bd
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Jan 8 20:19:22 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit b60ba76
Merge: 09f3dc7 5670397
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Dec 24 00:34:50 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 5670397
Merge: 6ff3f82 b097095
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Dec 23 22:47:02 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 6ff3f82
Merge: 8bc7723 dff73df
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Dec 23 19:37:55 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 8bc7723
Merge: 0d7f305 c34ae66
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Dec 21 00:08:55 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 09f3dc7
Merge: 579e3b5 0d7f305
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Dec 10 04:43:41 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 0d7f305
Merge: c7bf3d3 b85f533
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Dec 10 04:32:10 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit c7bf3d3
Merge: a74bcba df808be
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Dec 8 18:32:17 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 579e3b5
Merge: 3c1d59f a74bcba
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Dec 2 23:19:51 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit a74bcba
Author: gornekich <[email protected]>
Date:   Fri Dec 2 16:41:34 2022 +0400

    NFC: fix NTAG203 info scene flipperdevices#2078

commit 3c1d59f
Merge: 303c266 ec21806
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Dec 1 05:17:10 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit ec21806
Merge: f3904dc 2a6a3a1
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Nov 30 20:42:10 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 303c266
Merge: 8d0faae f3904dc
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Nov 14 21:01:50 2022 +0900

    Merge branch 'release-candidate' into release

commit f3904dc
Merge: 04c780f 41de5f3
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Nov 14 17:12:42 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 04c780f
Merge: a50fb2a 721ab71
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Nov 11 02:54:41 2022 +0900

    Merge branch 'dev' into release-candidate

commit 8d0faae
Merge: 3ab17e5 a50fb2a
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Nov 1 23:20:27 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit a50fb2a
Merge: fd0dd34 104a199
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Nov 1 19:28:10 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit fd0dd34
Merge: 33a7478 85d3411
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Oct 29 04:00:13 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 3ab17e5
Merge: 747e81f 33a7478
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Oct 19 20:32:45 2022 +0900

    Merge branch 'release-candidate' into release

commit 33a7478
Author: hedger <[email protected]>
Date:   Tue Oct 18 16:13:28 2022 +0400

    scripts: fixed c2 bundle format (flipperdevices#1889)

    * scripts: fixed c2 bundle format
    * scripts: copro.py: small refactoring

    Co-authored-by: あく <[email protected]>

commit 747e81f
Merge: 5c52bb7 cfde635
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Oct 18 01:19:05 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit cfde635
Merge: e403493 f06930e
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Oct 15 03:27:47 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 5c52bb7
Merge: 3481252 e403493
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Oct 3 00:45:53 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit e403493
Merge: a0f6a23 0f9ea92
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Sep 30 22:06:09 2022 +0900

    Merge branch 'dev' into release-candidate

commit a0f6a23
Merge: 14a1809 76d38e8
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Sep 29 20:02:13 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 3481252
Merge: 55b4632 14a1809
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Sep 24 01:17:00 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 14a1809
Merge: bb9b52a 3846852
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Sep 23 02:53:12 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit bb9b52a
Merge: 7e86f63 e70121e
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Sep 22 01:57:30 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 7e86f63
Merge: 09148b2 3360f81
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Sep 20 14:44:52 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 55b4632
Merge: ae9038d 09148b2
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Sep 7 00:06:42 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 09148b2
Merge: 3d9efa9 b7a6d18
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Sep 5 22:47:13 2022 +0900

    Merge branch 'dev' into release-candidate

commit 3d9efa9
Merge: 8fb679e 8d8481b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Sep 5 20:45:58 2022 +0900

    Merge branch 'dev' into release-candidate

commit ae9038d
Merge: bf236f5 8fb679e
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Aug 25 19:26:42 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 8fb679e
Merge: af891bd ce7b943
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Aug 25 01:26:34 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit af891bd
Merge: f6d6a62 7c54fcf
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Aug 24 02:58:31 2022 +0900

    Merge branch 'dev' into release-candidate

commit f6d6a62
Merge: 2fc2486 b0daa60
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Aug 24 01:21:50 2022 +0900

    Merge branch 'dev' into release-candidate

commit bf236f5
Merge: 7a67203 2fc2486
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Aug 16 21:39:00 2022 +0900

    Merge branch 'release-candidate' into release

commit 2fc2486
Merge: be0aa53 b3d7583
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Aug 16 00:54:27 2022 +0900

    Merge branch 'dev' into release-candidate

commit 7a67203
Merge: 0c592ff be0aa53
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Aug 13 18:21:46 2022 +0900

    Merge branch 'release-candidate' into release

commit be0aa53
Merge: df6b812 e1ffb4a
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Aug 13 18:12:26 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit df6b812
Merge: f785ce1 1655366
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Aug 12 22:50:53 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit f785ce1
Merge: 8bcd766 e0b184c
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Aug 12 01:11:41 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 0c592ff
Merge: 3e5d499 8bcd766
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Aug 3 08:50:08 2022 +0900

    Merge branch 'release-candidate' into release

commit 8bcd766
Merge: 86c9b00 93a4b9c
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Aug 2 23:12:13 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 86c9b00
Merge: e28446d c40e881
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Jul 28 21:36:31 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit e28446d
Merge: 52434f7 c777206
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Jul 27 02:29:17 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 52434f7
Merge: 577a4ba 9c59bcd
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Jul 27 00:45:52 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 3e5d499
Merge: fc15d5c 577a4ba
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Jul 13 18:49:21 2022 +0900

    Merge branch 'release-candidate' into release

commit 577a4ba
Merge: 996b15e f707aa9
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Jul 12 23:57:39 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 996b15e
Merge: 1edc74a 222394d
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Jul 10 21:53:42 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit fc15d5c
Merge: e82001a 1edc74a
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Jun 28 23:47:38 2022 +0900

    Merge branch 'release-candidate' into release

commit 1edc74a
Merge: c5fd214 8b988e2
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Jun 28 22:06:48 2022 +0900

    Merge branch 'dev' into release-candidate

commit c5fd214
Merge: e682e02 6d38740
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Jun 26 21:18:09 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit e82001a
Merge: 94bb1ad e682e02
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Jun 15 20:00:39 2022 +0900

    Merge branch 'release-candidate' into release

commit e682e02
Merge: ae95d75 adffe20
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Jun 14 12:08:22 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit ae95d75
Merge: 84cc381 cc861dd
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Jun 13 11:45:08 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 84cc381
Merge: be4dec7 761de00
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jun 10 11:15:08 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 94bb1ad
Merge: cb6cf95 be4dec7
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jun 3 23:03:06 2022 +0900

    Merge branch 'release-candidate' into release

commit be4dec7
Merge: 287defd 8b54436
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jun 3 16:49:35 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 287defd
Merge: f82484d 66dbb68
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Jun 1 04:44:44 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit cb6cf95
Merge: d3c0618 f82484d
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu May 12 17:45:25 2022 +0300

    Merge branch 'release-candidate' into release

commit f82484d
Merge: e64de44 b72a094
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu May 12 17:00:05 2022 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit e64de44
Merge: b501d47 85a129b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed May 11 19:42:05 2022 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit d3c0618
Merge: d21e5bd b501d47
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu May 5 00:41:18 2022 +0300

    Merge branch 'release-candidate' into release

commit b501d47
Merge: 1ad81aa 7017fa4
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Apr 29 17:27:23 2022 +0300

    Merge branch 'dev' into release-candidate

commit d21e5bd
Merge: d294b5e 1ad81aa
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Apr 25 15:50:08 2022 +0300

    Merge branch 'release-candidate' into release

commit 1ad81aa
Merge: 5435679 b28d408
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Apr 24 01:12:36 2022 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 5435679
Merge: bc77681 0ff9f43
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Apr 21 19:26:45 2022 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit d294b5e
Merge: 215466e bc77681
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Apr 18 16:21:59 2022 +0300

    Merge branch 'release-candidate' into release

commit bc77681
Merge: 460f573 000ebb8
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Apr 15 21:00:34 2022 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 460f573
Merge: 625eb0a 9b65433
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Apr 14 20:46:46 2022 +0300

    Merge branch 'dev' into release-candidate

commit 215466e
Merge: 5f582ab 625eb0a
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Apr 8 20:17:00 2022 +0300

    Merge branch 'release-candidate' into release

commit 625eb0a
Merge: 5c58faa 435205d
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Apr 7 18:48:44 2022 +0300

    Merge branch 'dev' into release-candidate

commit 5f582ab
Merge: 28d9b21 5c58faa
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Apr 1 16:41:50 2022 +0300

    Merge branch 'release-candidate' into release

commit 5c58faa
Merge: 0d35596 0bf2702
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Mar 31 17:58:25 2022 +0300

    Merge branch 'dev' into release-candidate

commit 28d9b21
Merge: 631e532 0d35596
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Mar 29 15:30:57 2022 +0300

    Merge branch 'release-candidate' into release

commit 0d35596
Merge: b29c0d3 d15a950
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Mar 28 17:31:20 2022 +0300

    Merge branch 'dev' into release-candidate

commit 631e532
Merge: f2a8485 b29c0d3
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Mar 25 21:19:30 2022 +0300

    Merge branch 'release-candidate' into release

commit b29c0d3
Merge: e74aa2d 7c4b0f5
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Mar 25 19:08:49 2022 +0300

    Merge branch 'dev' into release-candidate

commit e74aa2d
Merge: e1ff6da 76f524d
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Mar 25 14:11:17 2022 +0300

    Merge branch 'dev' into release-candidate

commit e1ff6da
Merge: c02d8be 38e92cf
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Mar 24 18:45:41 2022 +0300

    Merge branch 'dev' into release-candidate

commit c02d8be
Merge: dc6da82 eafeefb
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Mar 24 16:59:28 2022 +0300

    Merge branch 'dev' into release-candidate

commit f2a8485
Merge: 3f164ef dc6da82
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Mar 23 12:19:26 2022 +0300

    Merge branch 'release-candidate' into release

commit dc6da82
Merge: afa46b0 b86a400
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Mar 17 18:55:11 2022 +0700

    Merge branch 'dev' into release-candidate

commit 3f164ef
Merge: e698759 afa46b0
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Mar 3 20:33:15 2022 +0700

    Merge branch 'release-candidate' into release

commit afa46b0
Merge: 57689a1 966b400
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Feb 24 15:45:28 2022 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit e698759
Merge: f8c8e63 57689a1
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Feb 19 02:47:11 2022 +0300

    Merge branch 'release-candidate' into release

commit 57689a1
Merge: d4aeee6 2422419
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Feb 16 20:53:12 2022 +0300

    Merge branch 'dev' into release-candidate

commit f8c8e63
Merge: bb81e86 d4aeee6
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Feb 14 17:37:24 2022 +0300

    Merge branch 'release-candidate' into release

commit d4aeee6
Merge: 661b4b1 be50099
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Feb 14 13:30:17 2022 +0300

    Merge branch 'dev' into release-candidate

commit 661b4b1
Merge: 3cdcd64 2c61698
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Feb 10 22:11:05 2022 +0300

    Merge branch 'dev' into release-candidate

commit bb81e86
Merge: fffacfb 3cdcd64
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Feb 7 14:44:23 2022 +0300

    Merge branch 'release-candidate' into release

commit 3cdcd64
Merge: 1d5ca45 8cfd0ea
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Feb 4 00:31:46 2022 +0300

    Merge branch 'dev' into release-candidate

commit fffacfb
Merge: 3e04b73 1d5ca45
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Feb 1 16:07:34 2022 +0300

    Merge branch 'release-candidate' into release

commit 1d5ca45
Merge: 9835379 0acea5b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Feb 1 10:44:21 2022 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 9835379
Merge: 830daa8 2b2a798
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Jan 29 14:40:14 2022 +0300

    Merge branch 'dev' into release-candidate

commit 3e04b73
Merge: 8042f94 830daa8
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jan 21 17:12:55 2022 +0300

    Merge branch 'release-candidate' into release

commit 830daa8
Merge: 543402f 32c92a8
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Jan 16 18:43:41 2022 +0300

    Merge branch 'dev' into release-candidate

commit 543402f
Merge: 24e7bda 8f8aba2
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jan 14 17:10:12 2022 +0300

    Merge branch 'dev' into release-candidate

commit 24e7bda
Merge: bb650c4 17d0d19
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jan 14 14:08:42 2022 +0300

    Merge branch 'dev' into release-candidate

commit 8042f94
Merge: a426762 bb650c4
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Dec 28 18:02:40 2021 +0300

    Merge branch 'release-candidate' into release

commit bb650c4
Merge: 208ea6f 7cea359
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Dec 24 18:01:54 2021 +0300

    Merge branch 'dev' into release-candidate

commit 208ea6f
Merge: 2ee2e8f 0c7a38b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Dec 23 21:17:20 2021 +0300

    Merge branch 'dev' into release-candidate

commit a426762
Merge: 06ad321 2ee2e8f
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Dec 21 00:08:22 2021 +0300

    Merge branch 'release-candidate' into release

commit 2ee2e8f
Merge: cc285ab 93871f9
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Dec 17 16:41:21 2021 +0300

    Merge branch 'dev' into release-candidate

commit cc285ab
Merge: 5a0f7e2 36089c7
Author: DrZlo13 <[email protected]>
Date:   Thu Dec 16 05:24:32 2021 +1000

    Merge branch 'dev' into release-candidate

commit 06ad321
Merge: 1060f7b 5a0f7e2
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Dec 15 17:17:33 2021 +0300

    Merge branch 'release-candidate' into release

commit 5a0f7e2
Merge: cf6a1a7 58ce937
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Dec 12 14:33:17 2021 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit cf6a1a7
Merge: 3a70d3b f5b2ed6
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Dec 9 14:06:47 2021 +0300

    Merge branch 'dev' into release-candidate

commit 3a70d3b
Merge: 5352e4e 9f28338
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Dec 8 18:03:54 2021 +0300

    Merge branch 'dev' into release-candidate

commit 1060f7b
Merge: 14777a7 5352e4e
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Dec 1 13:43:37 2021 +0300

    Merge branch 'release-candidate' into release

commit 5352e4e
Author: Albert Kharisov <[email protected]>
Date:   Mon Nov 29 16:51:15 2021 +0400

    Fix butthurt and battery (flipperdevices#850)

    * Fix butthurt and battery

commit b0b2039
Merge: a5fa342 7c0943e
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Nov 26 17:20:35 2021 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 14777a7
Merge: 90eb608 a5fa342
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Nov 25 00:08:19 2021 +0300

    Merge remote-tracking branch 'origin/release-candidate' into release

commit a5fa342
Merge: be02738 efded63
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Nov 21 18:22:17 2021 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 90eb608
Merge: eb74bcd be02738
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Nov 16 20:26:37 2021 +0300

    Merge branch 'release-candidate' into release

commit be02738
Merge: dad1b06 7f814b5
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Nov 15 23:38:06 2021 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit dad1b06
Merge: cb227da b2356c7
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Nov 14 18:31:48 2021 +0300

    Merge branch 'dev' into release-candidate

commit cb227da
Merge: f3603e3 f8d3cc2
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Nov 4 22:44:46 2021 +0300

    Merge branch 'dev' into release-candidate

commit f3603e3
Merge: 7b730dd 3f93a0a
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Oct 28 17:24:03 2021 +0300

    Merge branch 'dev' into release-candidate

commit eb74bcd
Merge: ce74a35 7b730dd
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Oct 28 12:57:49 2021 +0300

    Merge branch 'release-candidate' into release

commit 7b730dd
Merge: 55692ee 88cee46
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Oct 25 03:41:13 2021 +0300

    Merge branch 'dev' into release-candidate

commit ce74a35
Merge: 20deb64 55692ee
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Oct 21 21:19:16 2021 +0300

    Merge branch 'release-candidate' into release

commit 55692ee
Merge: cca004a 6342860
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Oct 13 22:38:50 2021 +0300

    Merge branch 'dev' into release-candidate

commit 20deb64
Merge: 6c60c96 cca004a
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Oct 4 05:28:46 2021 +0300

    Merge branch 'release-candidate' into release

commit cca004a
Merge: b3f1db8 2eafae6
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Sep 29 17:21:03 2021 +0300

    Merge branch 'dev' into release-candidate

commit 6c60c96
Merge: fd29e19 b3f1db8
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Sep 28 12:54:44 2021 +0300

    Merge branch 'release-candidate' into release

commit b3f1db8
Merge: badf87f 322bdf0
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Sep 17 12:21:33 2021 +0300

    Merge branch 'dev' into release-candidate

commit badf87f
Merge: dc62232 f05153e
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Sep 16 19:13:52 2021 +0300

    Merge branch 'dev' into release-candidate

commit dc62232
Merge: 3db456d 4f233ff
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Sep 15 20:31:28 2021 +0300

    Merge branch 'dev' into release-candidate

commit fd29e19
Merge: 44d7b5b 3db456d
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Sep 15 20:27:06 2021 +0300

    Merge branch 'release-candidate' into release

commit 3db456d
Author: あく <[email protected]>
Date:   Wed Sep 15 17:40:09 2021 +0300

    [FL-1811] FuriHal: move core2 startup to hal init stage, prevent working with flash controller till core2 startup finish. flipperdevices#704

commit 44d7b5b
Merge: 97e0a30 5443bed
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Sep 10 03:59:09 2021 +0300

    Merge branch 'release-candidate' into release

commit 97e0a30
Merge: 3773428 e173364
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Sep 3 01:45:03 2021 +0300

    Merge branch 'release-candidate' into release

commit 3773428
Merge: b629ae1 54278b9
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Aug 29 16:14:45 2021 +0300

    Merge branch 'release-candidate' into release

commit b629ae1
Merge: 073c87f 129031e
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Aug 17 19:35:03 2021 +0300

    Merge branch 'release-candidate' into release

commit 073c87f
Merge: 0bc3828 ba399ab
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Aug 12 00:18:56 2021 +0300

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 0bc3828
Author: あく <[email protected]>
Date:   Tue Jul 27 14:47:45 2021 +0300

    [FL-1590] SubGhz: fix incorrect limits on frequency that were causing crashes flipperdevices#607
DakotaMcCutch added a commit to DakotaMcCutch/flipperzero-firmware that referenced this pull request Jul 13, 2023
@DakotaMcCutch
Squashed commit of the following:
d1efd9b 
commit c29941a
Merge: 3991db4 06b8b9b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Jul 12 18:24:01 2023 +0400

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 06b8b9b
Author: Skorpionm <[email protected]>
Date:   Wed Jul 12 13:41:46 2023 +0400

    SubGhz: fix check connect cc1101_ext (flipperdevices#2857)

    * SubGhz: fix check connect cc1101_ext
    * SubGhz: fix syntax
    * SubGhz: enable interface pin pullups
    * SubGhz: fix syntax
    * SubGhz: fix CLI check connect CC1101_ext
    * SubGhz: fix CLI display of the selected device

    Co-authored-by: あく <[email protected]>

commit 3991db4
Merge: 27a8f29 279a33d
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Jul 6 21:01:41 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 279a33d
Merge: 948dafc e6b0494
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Jul 6 02:01:48 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 948dafc
Merge: 7081d76 e7bd547
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Jul 2 04:43:52 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 27a8f29
Merge: 406cb8b 7081d76
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jun 16 16:28:58 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 7081d76
Merge: 60baf2a 5334a0a
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Jun 15 21:27:44 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 60baf2a
Merge: 1ac1f0b b6dbf25
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Jun 14 20:50:13 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 1ac1f0b
Merge: dc3d565 4900e8b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jun 9 22:22:59 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 406cb8b
Merge: e4830a6 dc3d565
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Jun 3 06:21:05 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit dc3d565
Merge: 2d8f262 d9a9fa0
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Jun 3 06:03:02 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit e4830a6
Merge: 16b9764 2d8f262
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Jun 3 01:14:42 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 2d8f262
Merge: 96d97af 1d7966f
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Jun 1 21:50:05 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 96d97af
Merge: 9cedac9 8d2ea14
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue May 30 01:48:41 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 16b9764
Merge: b7f406d 9cedac9
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed May 17 18:28:55 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 9cedac9
Merge: 508dbe4 9dedcd0
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon May 15 20:55:58 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 508dbe4
Merge: 849aa0f aa8a369
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu May 11 19:13:36 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit b7f406d
Merge: 376319c 849aa0f
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Apr 28 00:46:14 2023 +0900

    Merge branch 'release-candidate' into release

commit 849aa0f
Merge: df78ba8 408edb3
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Apr 27 23:01:55 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit df78ba8
Merge: 31e47e9 0ec8fc4
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Apr 26 15:39:56 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 31e47e9
Merge: 085c800 1ef70c0
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Apr 24 16:39:53 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 085c800
Merge: 728320b 4d015a1
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Apr 20 22:10:24 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 376319c
Merge: c41fe8e 728320b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Apr 12 23:13:23 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 728320b
Merge: b556776 33e8bae
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Apr 12 15:12:01 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit b556776
Merge: 9b9dce3 6cc5f30
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Apr 7 11:05:52 2023 +0800

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit c41fe8e
Merge: b698126 9b9dce3
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Mar 28 14:13:19 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 9b9dce3
Merge: e52e30c 27341fc
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Mar 27 16:42:32 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit e52e30c
Merge: f141a67 9a14699
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Mar 23 05:27:22 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit b698126
Merge: 61744b8 f141a67
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Mar 13 16:04:36 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit f141a67
Merge: dec00fe 4bd3dca
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Mar 10 20:15:19 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit dec00fe
Merge: 119c7fe 0190a16
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Mar 10 18:26:49 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 61744b8
Merge: a38a62f 119c7fe
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Feb 28 00:59:33 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 119c7fe
Merge: e9984f8 9ae58f5
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Feb 27 23:59:52 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit e9984f8
Merge: e2e4dcc 478390d
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Feb 27 15:25:21 2023 +0900

    Merge branch 'dev' into release-candidate

commit a38a62f
Merge: 13a0a92 e2e4dcc
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Feb 14 18:53:04 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit e2e4dcc
Merge: ea5fe0e bc06d40
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Feb 14 00:44:31 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit ea5fe0e
Merge: 8a08fd5 82c730b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Feb 9 14:45:49 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 8a08fd5
Merge: 48eb15c 4265057
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Feb 9 14:10:01 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 13a0a92
Merge: 8ee66c3 48eb15c
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Feb 2 21:22:44 2023 +0700

    Merge branch 'release-candidate' into release

commit 48eb15c
Merge: e18056b 01a9854
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Jan 30 16:57:20 2023 +0700

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 8ee66c3
Merge: b60ba76 e18056b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Jan 9 02:02:31 2023 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit e18056b
Merge: 5670397 2c450bd
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Jan 8 20:19:22 2023 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit b60ba76
Merge: 09f3dc7 5670397
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Dec 24 00:34:50 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 5670397
Merge: 6ff3f82 b097095
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Dec 23 22:47:02 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 6ff3f82
Merge: 8bc7723 dff73df
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Dec 23 19:37:55 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 8bc7723
Merge: 0d7f305 c34ae66
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Dec 21 00:08:55 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 09f3dc7
Merge: 579e3b5 0d7f305
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Dec 10 04:43:41 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 0d7f305
Merge: c7bf3d3 b85f533
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Dec 10 04:32:10 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit c7bf3d3
Merge: a74bcba df808be
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Dec 8 18:32:17 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 579e3b5
Merge: 3c1d59f a74bcba
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Dec 2 23:19:51 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit a74bcba
Author: gornekich <[email protected]>
Date:   Fri Dec 2 16:41:34 2022 +0400

    NFC: fix NTAG203 info scene flipperdevices#2078

commit 3c1d59f
Merge: 303c266 ec21806
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Dec 1 05:17:10 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit ec21806
Merge: f3904dc 2a6a3a1
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Nov 30 20:42:10 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 303c266
Merge: 8d0faae f3904dc
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Nov 14 21:01:50 2022 +0900

    Merge branch 'release-candidate' into release

commit f3904dc
Merge: 04c780f 41de5f3
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Nov 14 17:12:42 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 04c780f
Merge: a50fb2a 721ab71
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Nov 11 02:54:41 2022 +0900

    Merge branch 'dev' into release-candidate

commit 8d0faae
Merge: 3ab17e5 a50fb2a
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Nov 1 23:20:27 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit a50fb2a
Merge: fd0dd34 104a199
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Nov 1 19:28:10 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit fd0dd34
Merge: 33a7478 85d3411
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Oct 29 04:00:13 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 3ab17e5
Merge: 747e81f 33a7478
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Oct 19 20:32:45 2022 +0900

    Merge branch 'release-candidate' into release

commit 33a7478
Author: hedger <[email protected]>
Date:   Tue Oct 18 16:13:28 2022 +0400

    scripts: fixed c2 bundle format (flipperdevices#1889)

    * scripts: fixed c2 bundle format
    * scripts: copro.py: small refactoring

    Co-authored-by: あく <[email protected]>

commit 747e81f
Merge: 5c52bb7 cfde635
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Oct 18 01:19:05 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit cfde635
Merge: e403493 f06930e
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Oct 15 03:27:47 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 5c52bb7
Merge: 3481252 e403493
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Oct 3 00:45:53 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit e403493
Merge: a0f6a23 0f9ea92
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Sep 30 22:06:09 2022 +0900

    Merge branch 'dev' into release-candidate

commit a0f6a23
Merge: 14a1809 76d38e8
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Sep 29 20:02:13 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 3481252
Merge: 55b4632 14a1809
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Sep 24 01:17:00 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 14a1809
Merge: bb9b52a 3846852
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Sep 23 02:53:12 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit bb9b52a
Merge: 7e86f63 e70121e
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Sep 22 01:57:30 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 7e86f63
Merge: 09148b2 3360f81
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Sep 20 14:44:52 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 55b4632
Merge: ae9038d 09148b2
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Sep 7 00:06:42 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 09148b2
Merge: 3d9efa9 b7a6d18
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Sep 5 22:47:13 2022 +0900

    Merge branch 'dev' into release-candidate

commit 3d9efa9
Merge: 8fb679e 8d8481b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Sep 5 20:45:58 2022 +0900

    Merge branch 'dev' into release-candidate

commit ae9038d
Merge: bf236f5 8fb679e
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Aug 25 19:26:42 2022 +0900

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 8fb679e
Merge: af891bd ce7b943
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Aug 25 01:26:34 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit af891bd
Merge: f6d6a62 7c54fcf
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Aug 24 02:58:31 2022 +0900

    Merge branch 'dev' into release-candidate

commit f6d6a62
Merge: 2fc2486 b0daa60
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Aug 24 01:21:50 2022 +0900

    Merge branch 'dev' into release-candidate

commit bf236f5
Merge: 7a67203 2fc2486
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Aug 16 21:39:00 2022 +0900

    Merge branch 'release-candidate' into release

commit 2fc2486
Merge: be0aa53 b3d7583
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Aug 16 00:54:27 2022 +0900

    Merge branch 'dev' into release-candidate

commit 7a67203
Merge: 0c592ff be0aa53
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Aug 13 18:21:46 2022 +0900

    Merge branch 'release-candidate' into release

commit be0aa53
Merge: df6b812 e1ffb4a
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Aug 13 18:12:26 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit df6b812
Merge: f785ce1 1655366
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Aug 12 22:50:53 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit f785ce1
Merge: 8bcd766 e0b184c
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Aug 12 01:11:41 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 0c592ff
Merge: 3e5d499 8bcd766
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Aug 3 08:50:08 2022 +0900

    Merge branch 'release-candidate' into release

commit 8bcd766
Merge: 86c9b00 93a4b9c
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Aug 2 23:12:13 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 86c9b00
Merge: e28446d c40e881
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Jul 28 21:36:31 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit e28446d
Merge: 52434f7 c777206
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Jul 27 02:29:17 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 52434f7
Merge: 577a4ba 9c59bcd
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Jul 27 00:45:52 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 3e5d499
Merge: fc15d5c 577a4ba
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Jul 13 18:49:21 2022 +0900

    Merge branch 'release-candidate' into release

commit 577a4ba
Merge: 996b15e f707aa9
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Jul 12 23:57:39 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 996b15e
Merge: 1edc74a 222394d
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Jul 10 21:53:42 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit fc15d5c
Merge: e82001a 1edc74a
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Jun 28 23:47:38 2022 +0900

    Merge branch 'release-candidate' into release

commit 1edc74a
Merge: c5fd214 8b988e2
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Jun 28 22:06:48 2022 +0900

    Merge branch 'dev' into release-candidate

commit c5fd214
Merge: e682e02 6d38740
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Jun 26 21:18:09 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit e82001a
Merge: 94bb1ad e682e02
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Jun 15 20:00:39 2022 +0900

    Merge branch 'release-candidate' into release

commit e682e02
Merge: ae95d75 adffe20
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Jun 14 12:08:22 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit ae95d75
Merge: 84cc381 cc861dd
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Jun 13 11:45:08 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 84cc381
Merge: be4dec7 761de00
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jun 10 11:15:08 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 94bb1ad
Merge: cb6cf95 be4dec7
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jun 3 23:03:06 2022 +0900

    Merge branch 'release-candidate' into release

commit be4dec7
Merge: 287defd 8b54436
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jun 3 16:49:35 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 287defd
Merge: f82484d 66dbb68
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Jun 1 04:44:44 2022 +0900

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit cb6cf95
Merge: d3c0618 f82484d
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu May 12 17:45:25 2022 +0300

    Merge branch 'release-candidate' into release

commit f82484d
Merge: e64de44 b72a094
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu May 12 17:00:05 2022 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit e64de44
Merge: b501d47 85a129b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed May 11 19:42:05 2022 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit d3c0618
Merge: d21e5bd b501d47
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu May 5 00:41:18 2022 +0300

    Merge branch 'release-candidate' into release

commit b501d47
Merge: 1ad81aa 7017fa4
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Apr 29 17:27:23 2022 +0300

    Merge branch 'dev' into release-candidate

commit d21e5bd
Merge: d294b5e 1ad81aa
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Apr 25 15:50:08 2022 +0300

    Merge branch 'release-candidate' into release

commit 1ad81aa
Merge: 5435679 b28d408
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Apr 24 01:12:36 2022 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 5435679
Merge: bc77681 0ff9f43
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Apr 21 19:26:45 2022 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit d294b5e
Merge: 215466e bc77681
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Apr 18 16:21:59 2022 +0300

    Merge branch 'release-candidate' into release

commit bc77681
Merge: 460f573 000ebb8
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Apr 15 21:00:34 2022 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 460f573
Merge: 625eb0a 9b65433
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Apr 14 20:46:46 2022 +0300

    Merge branch 'dev' into release-candidate

commit 215466e
Merge: 5f582ab 625eb0a
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Apr 8 20:17:00 2022 +0300

    Merge branch 'release-candidate' into release

commit 625eb0a
Merge: 5c58faa 435205d
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Apr 7 18:48:44 2022 +0300

    Merge branch 'dev' into release-candidate

commit 5f582ab
Merge: 28d9b21 5c58faa
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Apr 1 16:41:50 2022 +0300

    Merge branch 'release-candidate' into release

commit 5c58faa
Merge: 0d35596 0bf2702
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Mar 31 17:58:25 2022 +0300

    Merge branch 'dev' into release-candidate

commit 28d9b21
Merge: 631e532 0d35596
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Mar 29 15:30:57 2022 +0300

    Merge branch 'release-candidate' into release

commit 0d35596
Merge: b29c0d3 d15a950
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Mar 28 17:31:20 2022 +0300

    Merge branch 'dev' into release-candidate

commit 631e532
Merge: f2a8485 b29c0d3
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Mar 25 21:19:30 2022 +0300

    Merge branch 'release-candidate' into release

commit b29c0d3
Merge: e74aa2d 7c4b0f5
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Mar 25 19:08:49 2022 +0300

    Merge branch 'dev' into release-candidate

commit e74aa2d
Merge: e1ff6da 76f524d
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Mar 25 14:11:17 2022 +0300

    Merge branch 'dev' into release-candidate

commit e1ff6da
Merge: c02d8be 38e92cf
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Mar 24 18:45:41 2022 +0300

    Merge branch 'dev' into release-candidate

commit c02d8be
Merge: dc6da82 eafeefb
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Mar 24 16:59:28 2022 +0300

    Merge branch 'dev' into release-candidate

commit f2a8485
Merge: 3f164ef dc6da82
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Mar 23 12:19:26 2022 +0300

    Merge branch 'release-candidate' into release

commit dc6da82
Merge: afa46b0 b86a400
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Mar 17 18:55:11 2022 +0700

    Merge branch 'dev' into release-candidate

commit 3f164ef
Merge: e698759 afa46b0
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Mar 3 20:33:15 2022 +0700

    Merge branch 'release-candidate' into release

commit afa46b0
Merge: 57689a1 966b400
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Feb 24 15:45:28 2022 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit e698759
Merge: f8c8e63 57689a1
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Feb 19 02:47:11 2022 +0300

    Merge branch 'release-candidate' into release

commit 57689a1
Merge: d4aeee6 2422419
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Feb 16 20:53:12 2022 +0300

    Merge branch 'dev' into release-candidate

commit f8c8e63
Merge: bb81e86 d4aeee6
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Feb 14 17:37:24 2022 +0300

    Merge branch 'release-candidate' into release

commit d4aeee6
Merge: 661b4b1 be50099
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Feb 14 13:30:17 2022 +0300

    Merge branch 'dev' into release-candidate

commit 661b4b1
Merge: 3cdcd64 2c61698
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Feb 10 22:11:05 2022 +0300

    Merge branch 'dev' into release-candidate

commit bb81e86
Merge: fffacfb 3cdcd64
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Feb 7 14:44:23 2022 +0300

    Merge branch 'release-candidate' into release

commit 3cdcd64
Merge: 1d5ca45 8cfd0ea
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Feb 4 00:31:46 2022 +0300

    Merge branch 'dev' into release-candidate

commit fffacfb
Merge: 3e04b73 1d5ca45
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Feb 1 16:07:34 2022 +0300

    Merge branch 'release-candidate' into release

commit 1d5ca45
Merge: 9835379 0acea5b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Feb 1 10:44:21 2022 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 9835379
Merge: 830daa8 2b2a798
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sat Jan 29 14:40:14 2022 +0300

    Merge branch 'dev' into release-candidate

commit 3e04b73
Merge: 8042f94 830daa8
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jan 21 17:12:55 2022 +0300

    Merge branch 'release-candidate' into release

commit 830daa8
Merge: 543402f 32c92a8
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Jan 16 18:43:41 2022 +0300

    Merge branch 'dev' into release-candidate

commit 543402f
Merge: 24e7bda 8f8aba2
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jan 14 17:10:12 2022 +0300

    Merge branch 'dev' into release-candidate

commit 24e7bda
Merge: bb650c4 17d0d19
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Jan 14 14:08:42 2022 +0300

    Merge branch 'dev' into release-candidate

commit 8042f94
Merge: a426762 bb650c4
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Dec 28 18:02:40 2021 +0300

    Merge branch 'release-candidate' into release

commit bb650c4
Merge: 208ea6f 7cea359
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Dec 24 18:01:54 2021 +0300

    Merge branch 'dev' into release-candidate

commit 208ea6f
Merge: 2ee2e8f 0c7a38b
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Dec 23 21:17:20 2021 +0300

    Merge branch 'dev' into release-candidate

commit a426762
Merge: 06ad321 2ee2e8f
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Dec 21 00:08:22 2021 +0300

    Merge branch 'release-candidate' into release

commit 2ee2e8f
Merge: cc285ab 93871f9
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Dec 17 16:41:21 2021 +0300

    Merge branch 'dev' into release-candidate

commit cc285ab
Merge: 5a0f7e2 36089c7
Author: DrZlo13 <[email protected]>
Date:   Thu Dec 16 05:24:32 2021 +1000

    Merge branch 'dev' into release-candidate

commit 06ad321
Merge: 1060f7b 5a0f7e2
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Dec 15 17:17:33 2021 +0300

    Merge branch 'release-candidate' into release

commit 5a0f7e2
Merge: cf6a1a7 58ce937
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Dec 12 14:33:17 2021 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit cf6a1a7
Merge: 3a70d3b f5b2ed6
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Dec 9 14:06:47 2021 +0300

    Merge branch 'dev' into release-candidate

commit 3a70d3b
Merge: 5352e4e 9f28338
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Dec 8 18:03:54 2021 +0300

    Merge branch 'dev' into release-candidate

commit 1060f7b
Merge: 14777a7 5352e4e
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Dec 1 13:43:37 2021 +0300

    Merge branch 'release-candidate' into release

commit 5352e4e
Author: Albert Kharisov <[email protected]>
Date:   Mon Nov 29 16:51:15 2021 +0400

    Fix butthurt and battery (flipperdevices#850)

    * Fix butthurt and battery

commit b0b2039
Merge: a5fa342 7c0943e
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Nov 26 17:20:35 2021 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 14777a7
Merge: 90eb608 a5fa342
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Nov 25 00:08:19 2021 +0300

    Merge remote-tracking branch 'origin/release-candidate' into release

commit a5fa342
Merge: be02738 efded63
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Nov 21 18:22:17 2021 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit 90eb608
Merge: eb74bcd be02738
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Nov 16 20:26:37 2021 +0300

    Merge branch 'release-candidate' into release

commit be02738
Merge: dad1b06 7f814b5
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Nov 15 23:38:06 2021 +0300

    Merge remote-tracking branch 'origin/dev' into release-candidate

commit dad1b06
Merge: cb227da b2356c7
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Nov 14 18:31:48 2021 +0300

    Merge branch 'dev' into release-candidate

commit cb227da
Merge: f3603e3 f8d3cc2
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Nov 4 22:44:46 2021 +0300

    Merge branch 'dev' into release-candidate

commit f3603e3
Merge: 7b730dd 3f93a0a
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Oct 28 17:24:03 2021 +0300

    Merge branch 'dev' into release-candidate

commit eb74bcd
Merge: ce74a35 7b730dd
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Oct 28 12:57:49 2021 +0300

    Merge branch 'release-candidate' into release

commit 7b730dd
Merge: 55692ee 88cee46
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Oct 25 03:41:13 2021 +0300

    Merge branch 'dev' into release-candidate

commit ce74a35
Merge: 20deb64 55692ee
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Oct 21 21:19:16 2021 +0300

    Merge branch 'release-candidate' into release

commit 55692ee
Merge: cca004a 6342860
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Oct 13 22:38:50 2021 +0300

    Merge branch 'dev' into release-candidate

commit 20deb64
Merge: 6c60c96 cca004a
Author: Aleksandr Kutuzov <[email protected]>
Date:   Mon Oct 4 05:28:46 2021 +0300

    Merge branch 'release-candidate' into release

commit cca004a
Merge: b3f1db8 2eafae6
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Sep 29 17:21:03 2021 +0300

    Merge branch 'dev' into release-candidate

commit 6c60c96
Merge: fd29e19 b3f1db8
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Sep 28 12:54:44 2021 +0300

    Merge branch 'release-candidate' into release

commit b3f1db8
Merge: badf87f 322bdf0
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Sep 17 12:21:33 2021 +0300

    Merge branch 'dev' into release-candidate

commit badf87f
Merge: dc62232 f05153e
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Sep 16 19:13:52 2021 +0300

    Merge branch 'dev' into release-candidate

commit dc62232
Merge: 3db456d 4f233ff
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Sep 15 20:31:28 2021 +0300

    Merge branch 'dev' into release-candidate

commit fd29e19
Merge: 44d7b5b 3db456d
Author: Aleksandr Kutuzov <[email protected]>
Date:   Wed Sep 15 20:27:06 2021 +0300

    Merge branch 'release-candidate' into release

commit 3db456d
Author: あく <[email protected]>
Date:   Wed Sep 15 17:40:09 2021 +0300

    [FL-1811] FuriHal: move core2 startup to hal init stage, prevent working with flash controller till core2 startup finish. flipperdevices#704

commit 44d7b5b
Merge: 97e0a30 5443bed
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Sep 10 03:59:09 2021 +0300

    Merge branch 'release-candidate' into release

commit 97e0a30
Merge: 3773428 e173364
Author: Aleksandr Kutuzov <[email protected]>
Date:   Fri Sep 3 01:45:03 2021 +0300

    Merge branch 'release-candidate' into release

commit 3773428
Merge: b629ae1 54278b9
Author: Aleksandr Kutuzov <[email protected]>
Date:   Sun Aug 29 16:14:45 2021 +0300

    Merge branch 'release-candidate' into release

commit b629ae1
Merge: 073c87f 129031e
Author: Aleksandr Kutuzov <[email protected]>
Date:   Tue Aug 17 19:35:03 2021 +0300

    Merge branch 'release-candidate' into release

commit 073c87f
Merge: 0bc3828 ba399ab
Author: Aleksandr Kutuzov <[email protected]>
Date:   Thu Aug 12 00:18:56 2021 +0300

    Merge remote-tracking branch 'origin/release-candidate' into release

commit 0bc3828
Author: あく <[email protected]>
Date:   Tue Jul 27 14:47:45 2021 +0300

    [FL-1590] SubGhz: fix incorrect limits on frequency that were causing crashes flipperdevices#607
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DrZlo13 DrZlo13 DrZlo13 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@skotopes @DrZlo13