Commit graph

252 commits

Author SHA1 Message Date
MX
1fc67f76a2
Merge branch 'fz-dev' into dev 2022-12-08 08:58:39 +03:00
Skorpionm
6a470a464e
[FL-3002] SubGhz: add RPC error (#2097)
* [FL-3002] SubGhz: add RPC error
* RPC_APP: rpc_system_app_error_reset, automatic error reset when a new event is executed
* SubGhz: fix text error
* SubGhz: fix text error 2
* SubGhz: add error description
* Format sources

Co-authored-by: あく <alleteam@gmail.com>
2022-12-08 14:49:54 +09:00
Nikolay Minaylov
2daf39018b
[FL-3001] File browser base folder (#2091)
* File browser base folder
* Format sources
* FuriHal: bump api version

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-12-07 23:17:41 +09:00
MX
1ce591a6c5
Partially fix strange issue with subghz decode raw 2022-12-01 03:18:41 +03:00
MX
0b9d632363
Misc improvements 2022-11-30 20:03:55 +03:00
Maksim Derbasov
e121e6a287
Fix for spelling (#2051)
* Fix for spelling
* Review iteration

Co-authored-by: あく <alleteam@gmail.com>
2022-11-29 01:51:51 +09:00
MX
f086d5b7a3
Merge pull request #180 from TQMatvey/dev
SubGhz: Allow setting RSSI trigger to beggining
2022-11-24 03:25:41 +03:00
MX
757b218397
Revert SubGhz FA changes 2022-11-24 03:16:31 +03:00
TQMatvey
2a5d629318 SubGhz: Allow setting RSSI trigger to beggining 2022-11-24 06:52:44 +07:00
MX
daea8a963d
Apply subghz FA changes from OFW, update API symbols 2022-11-23 19:46:31 +03:00
MX
7829428455
Merge branch 'fz-dev' into dev 2022-11-23 19:21:50 +03:00
Skorpionm
9bb0dbaa3e
SubGhz: frequency analyzer. 2dbi desensitization, rssi averaging to reduce jitter, new rssi indicators in log_mode, GUI fix (#2020)
Co-authored-by: あく <alleteam@gmail.com>
2022-11-23 22:31:39 +09:00
Kyhwana Pardus
1c8451fad4
Fix typos in subghz_cli.c (#2030)
Fix up the "receive" typos

Co-authored-by: あく <alleteam@gmail.com>
2022-11-23 22:23:11 +09:00
Sergey Gavrilov
c511c67e71
Core: thread allocation shortcut (#2007)
* Core: thread alloc+set shortcut
* Apps: use thread allocation shortcut
* Mark some service threads as services
* Init BT as soon as possible

Co-authored-by: あく <alleteam@gmail.com>
2022-11-23 21:49:17 +09:00
MX
17cb7533cb
SubGHz: FA -> Save last trigger level 2022-11-17 00:37:35 +03:00
MX
1e183d5450
SubGHz: Add 440.175 Mhz 2022-11-16 14:26:48 +03:00
MX
02fe403b2b
SubGHz: Fix wrong error message in history 2022-11-12 16:58:35 +03:00
MX
950dee48a0
Merge branch 'fz-dev' into dev 2022-11-12 16:43:12 +03:00
MX
3c7a4eeaed
iButton: Fix header "Saved!" message stays on other screens (#2003)
* iButton: Fix header "Saved!" message stays on other screens
* SubGhz,iButton: proper popup reset

Co-authored-by: あく <alleteam@gmail.com>
2022-11-12 18:45:19 +09:00
MX
3cba34bbc8
SubGHz: Add frequencies 434.075, 434.390 2022-11-11 18:46:35 +03:00
MX
95df532612
Frequency analyzer: Add counter, GUI fixes, allow Ok button - see desc.
When signal is present (when frequency window shows black background)
2022-11-11 03:45:09 +03:00
MX
930b369812
Merge branch 'fz-dev' into dev 2022-11-10 21:38:03 +03:00
Skorpionm
721ab717d7
[FL-2961] SubGhz: properly handle storage loss (#1990)
Co-authored-by: あく <alleteam@gmail.com>
2022-11-11 02:14:44 +09:00
MX
625b1eb126
move -+ in freq analyzer, swap up & down button, more in desc
now its more intuitive and easier to select values in freq analyzer history
2022-11-10 12:30:01 +03:00
MX
684fdc632f
Merge branch 'fz-dev' into dev 2022-11-10 06:57:08 +03:00
あく
e8913f2e33
Code cleanup: srand, PVS warnings (#1974)
* Remove srand invocation

* PVS High priority fixes

* PVS High errors part 2

* Furi: heap tracing inheritance

* Furi add __builtin_unreachable to furi_thread_catch
2022-11-05 18:07:24 +03:00
MX
0ab400a27e
Merge branch 'fz-dev' into dev 2022-11-04 14:34:34 +03:00
Sergey Monchenko
3bd74b7f01
SubGhz: fix incorrect response in rpc mode. Code cleanup. (#1964)
* Code cleanup
* SubGhz: correct logic in RPC
* SubGhz: do not blink on app rpc fail

Co-authored-by: あく <alleteam@gmail.com>
2022-11-04 15:08:51 +09:00
Alexandre Díaz
60d125e72a
subghz: add analyzer frequency logs (#1914)
* subghz: add analyzer frequency logs
* SubGhz: switch to change on short press
* SubGhz: use full RSSI bar for history view

Co-authored-by: あく <alleteam@gmail.com>
2022-11-03 16:57:56 +09:00
MX
165d9972e7
SubGHz Fixes: BFT fix, other small fixes 2022-11-02 01:05:05 +03:00
MX
8333ebd401
new icons for subghz signals and infrared remotes
by @Svaarich
2022-10-28 19:41:56 +03:00
MX
2cfb5bdfc6
Merge branch 'fz-dev' into dev 2022-10-28 18:03:31 +03:00
Sergey Gavrilov
3434305630
[FL-2937] Remove resources from API to prevent frequent API version increase (#1935)
* Remove all icons from API
* Music player: icons
* Signal generator: icons
* Bt hid: icons
* Weather station: icons
* Picopass: icons
* File browser test: icons
* Example images: documentation
* Remove global assets header
* Fix picopass

Co-authored-by: あく <alleteam@gmail.com>
2022-10-28 23:08:50 +09:00
MX
9fae52166c
fixes and improvements 2022-10-28 16:05:17 +03:00
MX
4c0c70ff64
Merge branch 'fz-dev' into dev 2022-10-28 14:39:14 +03:00
Georgii Surkov
f11df49468
[FL-2828] Dolphin score update take 2 (#1929)
* Move DolphinDeedNfcRead
* Move DolphinDeedNfcReadSuccess
* Move DolphinDeedNfcSave
* Move DolphinDeedNfcDetectReader
* Move DolphinDeedNfcEmulate
* Count DolphinDeedNfcEmulate when launched from file browser
* Implement most of the score accounting for NFC
* Fully update Nfc icounter handling
* Move DolphinDeedSubGhzFrequencyAnalyzer
* Update the rest of icounter in SubGHz
* Adjust SubGHz icounter handling
* Adjust LFRFID icounter handling
* Adjust Infrared icounter handling
* Don't count renaming RFID tags as saving
* Don't count renaming SubGHz signals as saving
* Don't count renaming NFC tags as saving
* Adjust iButton icounter handling
* Minor code refactoring
* Correct formatting
* Account for emulating iButton keys from file manager/rpc

Co-authored-by: あく <alleteam@gmail.com>
2022-10-28 16:18:41 +09:00
MX
b20c01d68b
remove saving modulation due to strange bugs with custom modulations 2022-10-27 02:56:21 +03:00
MX
85900c50ff
add 330mhz 2022-10-27 01:26:04 +03:00
MX
a99d29c0f3
Merge branch 'fz-dev' into dev 2022-10-26 23:09:58 +03:00
Skorpionm
aff99a72e8
SubGhz: fix variable types and CC1101 GPIO initialization optimization (#1931)
* SubGhz: fix variable types
* SubGhz: CC1101 GPIO initialization optimization
* SubGhz: return back gpio init
* SubGhz: cleanup grammar in math and format doxygen comments

Co-authored-by: あく <alleteam@gmail.com>
2022-10-27 04:40:13 +09:00
MX
89e27d10a2
Merge branch 'fz-dev' into dev 2022-10-26 19:27:45 +03:00
Skorpionm
5c8df66b7c
[FL-2927] SubGhz: add RAW Read threshold rssi (#1911)
* SubGhz: add RAW Read threshold rssi
* SubGhz: update indicator RSSI
* SubGhz: fix record file

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-10-27 00:13:00 +09:00
MX
ed080ea5fc
fixed bug when mobile app was unable to send raw file
file name should not contain dots
2022-10-22 13:09:41 +03:00
DerSkythe
26dfa9b9a5 fix for update cursor 2022-10-20 00:18:40 +04:00
Der Skythe
62284209e6
Merge branch 'DarkFlippers:dev' into dev-master 2022-10-19 23:31:07 +04:00
DerSkythe
6d86629e9a minor changes 2022-10-19 23:31:04 +04:00
DerSkythe
0139891d64 Add cursor frame to selected preferred signal 2022-10-19 23:29:46 +04:00
Skorpionm
9a9abd59e9
[FL-2904, FL-2900, FL-2890] WS: add app WeatherStation (#1833)
* WeatherStation: start
* SubGhz: rename protocol magellen -> magellan
* WeatherStation: err Unresolved symbols: {'subghz_protocol_decoder_base_get_string'}
* WeatherStation: fix Unresolved symbols: {'subghz_protocol_decoder_base_get_string'}
* Subghz: add set protocol_items
* WeatherStation: adding your protocols
* WS: add Infactory protocol
* WS: add history
* WS: add setting
* WS: add lock
* WS: add hopper frequency
* WS: fix history
* WS fix string_t -> FuriString*
* WS: add images
* WS: history record update when receiving data from the sensor again
* WS: add receiver info, delete extra code
* WS: add protocol ThermoPRO_TX4
* [FL-2900] SubGhz: Move icons in Sub-GHz
* WS: add Notification
* [FL-2890] SubGhz: Rename *_user files in resources to _user.example
* WS: add about scene
* WS: removing redundant code
* WS: add  protocol Nexus-TH
* WS: add protocol GT_WT03
* WS: fix notification and rename "Weather Station" -> "Read Weather Station"
* SubGhz: partial unit tests fix
* SubGhz: fix unit_test
* SubGhz: remove dead code
* SubGhz: rename SubGhzPresetDefinition into SubGhzRadioPreset, cleanup subghz types.

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-10-20 02:27:26 +09:00
MX
a3c6d8bb4a
SubGhz: rename SubGhzPresetDefinition into SubGhzRadioPreset, cleanup subghz types. 2022-10-19 18:52:21 +03:00
derskythe
ab55ddbfb1 fix position and sort array taking latest to first 2022-10-19 19:29:48 +04:00
derskythe
4f6d27a214 Don't add to to array if value already exists 2022-10-19 13:12:47 +04:00
DerSkythe
f0e8da98ee Fix interface and add extra history field 2022-10-19 12:20:58 +04:00
DerSkythe
63eced449e Applied OFW version but not yet resized to correct view 2022-10-19 09:39:11 +04:00
MX
84d12da45a
add app WeatherStation
OFW PR 1833 by Skorpionm
2022-10-18 19:51:44 +03:00
MX
cb0d9ec591
add sec+ 1.0/2.0 433mhz in add manually, and run fbt fmt 2022-10-14 01:49:32 +03:00
MX
9941df48bb
run fbt format 2022-10-13 17:00:20 +03:00
MX
80735d4f51
Merge pull request #102 from derskythe/fix-read-in-readraw-crash
flipper_format_free after all and only if we failed with all plans
2022-10-12 05:17:37 +03:00
MX
b7bdc4c985
sorry, i added "Mod:", and did fbt format 2022-10-12 05:15:45 +03:00
MX
f429d14ab5
Merge branch 'dev' into subghz-improvements 2022-10-12 05:04:55 +03:00
MX
022315e93d
Improve keeloq, add JCM support, fix Nice Smilo, MHouse, and more
now manufacturer name is saved into file, and will not change randomly, 
added support for JCM
fixed Nice Smilo, MHouse
2022-10-12 04:18:29 +03:00
DerSkythe
702786078d in PNG waves down 2 px, MHZ in Read screen 2022-10-11 22:38:36 +04:00
DerSkythe
e78d73c35f fix PNG, move waves 2px down and code to correct values 2022-10-11 21:56:00 +04:00
DerSkythe
34406f0607 flipper_format_free after all and only if we failed with all plans 2022-10-11 21:09:41 +04:00
derskythe
06c0adfe98 Save in last settings FrequencyAnalyzer last feedback set 2022-10-11 18:45:46 +04:00
derskythe
b0d4146c76 Write full name of preset on Read/ReadRAW screen 2022-10-11 18:26:16 +04:00
MX
349a151330
fix memory leak 2022-10-11 03:29:59 +03:00
DerSkythe
52361b4adf Add split RAW files ability 2022-10-10 20:20:56 +04:00
Skorpionm
906124b091
[FL-2886] SubGhz: fix text overlap in read (#1853) 2022-10-10 13:43:15 +09:00
MX
877a9202fd
fix decode raw bugs (blank screen, broken files) 2022-10-09 19:45:39 +03:00
MX
acbe7a10e2
enable hopping with detect raw, and trying to fix crashes
feature still very unstable, use at your own risk!!!
2022-10-09 14:43:18 +03:00
MX
91d7a38ca6
update changelog and fix subghz issues 2022-10-09 04:24:51 +03:00
MX
45840a1146
rise and shine mr freeman... 2022-10-09 00:37:22 +03:00
MX
b0c9af9c06
Merge branch 'fz-dev' into dev 2022-10-08 23:11:16 +03:00
Sergey Gavrilov
31c0346adc
[FL-976] Removing lambdas (#1849)
* Removing lambdas...
* Wake the fk up, Gordon! We have a citadel to burn!
* Here comes the Nihilanth
* Lambda documentation

Co-authored-by: あく <alleteam@gmail.com>
2022-10-09 02:38:29 +09:00
MX
464c725a48
fix debug logs 2022-10-07 23:05:00 +03:00
MX
4cb585e4b9
fix subghz display bug 2022-10-07 21:34:01 +03:00
MX
b4b3c182c5
fixes for new printf and furistream 2022-10-07 18:32:58 +03:00
MX
bdd052937b
Merge branch 'fz-dev' into dev 2022-10-07 17:24:20 +03:00
Sergey Gavrilov
4000f0cac5
[FL-2870] Printf function attributes (#1841)
* Furi strings: printf attribute
* Logs: printf attribute
* Plugins: adapt
* Plugins: accommodate
* Unit tests: accommodate

Co-authored-by: あく <alleteam@gmail.com>
2022-10-07 22:35:15 +09:00
Sergey Gavrilov
38a82a1907
[FL-2839] Furi stream buffer (#1834)
* Core: stream buffer
* stream buffer: API and usage
* stream buffer: documentation
* stream buffer: more documentation
* Furi: fix spelling

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-10-07 21:27:11 +09:00
MX
81faca79ee
remove duplicate allocs from subghz history 2022-10-07 00:31:29 +03:00
MX
3802171009
Revert "Merge branch 'fz-dev' into dev"
This reverts commit 03ad1770f8.
2022-10-06 18:23:50 +03:00
MX
03ad1770f8
Merge branch 'fz-dev' into dev 2022-10-06 18:23:44 +03:00
Skorpionm
11681d8ee8
[FL-2866, FL-2865] SubGhz: add frequency analyzer history (#1810)
* SubGhz: frequency analyzer history
* SubGhz: add vibro
* SubGhz: turn on the display when receiving a signal
* SubGhz: add signal reception indicator
* SubGhz: fix indicator
* SubGhz: fix FA history

Co-authored-by: あく <alleteam@gmail.com>
2022-10-06 23:48:29 +09:00
Skorpionm
061f53cd3c
[FL-2849] SubGhz: read RAW auto generation of names (#1772)
* SubGhz: read RAW auto auto generation of names depending on the date of the entry
* SubGhz: name generation modification RAW-YYYYMMDD-HHMMSS
* SubGhz: replace m-string with FuriString

Co-authored-by: あく <alleteam@gmail.com>
2022-10-06 23:43:17 +09:00
MX
b61e41163b
fix subghz double click after delete, fix rename bug, fix unirf 2022-10-06 15:10:08 +03:00
MX
ac286dfed8
fix subghz bruteforcer, change subghz raw naming 2022-10-06 14:10:56 +03:00
MX
c60bfbf271
oh no 2022-10-05 21:27:13 +03:00
MX
0796263e81
Merge branch 'fz-dev' into dev 2022-10-05 19:27:46 +03:00
Sergey Gavrilov
4bf29827f8
M*LIB: non-inlined strings, FuriString primitive (#1795)
* Quicksave 1
* Header stage complete
* Source stage complete
* Lint & merge fixes
* Includes
* Documentation step 1
* FBT: output free size considering BT STACK
* Documentation step 2
* py lint
* Fix music player plugin
* unit test stage 1: string allocator, mem, getters, setters, appends, compare, search.
* unit test: string equality
* unit test: string replace
* unit test: string start_with, end_with
* unit test: string trim
* unit test: utf-8
* Rename
* Revert fw_size changes
* Simplify CLI backspace handling
* Simplify CLI character insert
* Merge fixes
* Furi: correct filenaming and spelling
* Bt: remove furi string include

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-10-06 00:15:23 +09:00
MX
b5d6d60535
New notification sequence for Frequency Analyser
PR #86 by @BastienB3
2022-10-04 21:05:09 +03:00
MX
06a7bda69b
block hopping and detect raw at same time
and fix freq analyzer feedback display backlight
2022-10-04 17:58:12 +03:00
MX
110dc48b96
Merge remote-tracking branch 'origin/dev' into dev 2022-10-03 18:42:52 +03:00
MX
37c666ddf5
Merge pull request #82 from TQMatvey/pr_temp
SubGhz: Enable backlight on new signal
2022-10-03 18:42:18 +03:00
MX
6ddca568b9
correct notification sequence 2022-10-03 18:41:37 +03:00
MX
8993db56b8
this was not part of previous change 2022-10-03 18:40:22 +03:00
MX
3c1efda1db
return carrier test included with non debug builds 2022-10-03 18:36:06 +03:00
MX
dce5af5c2e
hmm 2022-10-03 18:22:09 +03:00
MX
fbacdc5b7b
fix critical bug with subghz rpc 2022-10-03 18:21:18 +03:00
MX
8dba4f25ae
unused 2022-10-03 18:20:49 +03:00
derskythe
43ef4046ed Add stubs for split 2022-10-03 19:00:35 +04:00
derskythe
be42c390f2 Save on SD Card only RAW files 2022-10-02 16:57:32 +04:00
derskythe
cbda5d996f Fix uncommited merge 2022-10-02 16:50:03 +04:00
derskythe
de1ec97512 Merge remote-tracking branch 'refs/remotes/origin/fix-read-in-readraw-crash' into fix-read-in-readraw-crash 2022-10-02 16:20:18 +04:00
MX
8af749c965
enable saving detect raw state via define 2022-10-02 13:50:29 +03:00
MX
63fee41a1f
enable worker back 2022-10-02 09:51:27 +03:00
TQMatvey
f441fed68d SubGhz: Follow system backlight timer 2022-10-02 13:48:06 +07:00
TQMatvey
6e0eeed773 SubGhz: turn on display for new signal 2022-10-02 13:29:16 +07:00
MX
6bf306200e
make loading subghz file from favourites a bit faster 2022-10-02 08:50:41 +03:00
MX
e2faf31b45
debug in subghz only when compiled with DEBUG=1 2022-10-02 07:34:39 +03:00
MX
85eb740559
do not save detect raw on/off settings 2022-10-02 06:38:34 +03:00
MX
cea14ae9c5
fix dir creation bug, save files only for RAW
TODO: files are broken when they have more than 512 elements in one line
Split file to 512 element chunks as it done in regular Read RAW
2022-10-02 06:23:09 +03:00
derskythe
bbd3f9cf71 Fixed all bugs with saving directly to file, also fixed misspeled if/ifdef in all app 2022-10-02 03:18:30 +04:00
derskythe
230f09dddd enable delete temp files 2022-10-01 08:47:44 +04:00
derskythe
24e744f1d1 Added saving DetectRAW settings, trying to write files on SD instead of memory 2022-10-01 08:39:51 +04:00
derskythe
f543753873 Long press OK button in SubGHz Frequency analyzer switch to Read menu with selected frequency 2022-09-29 23:46:54 +04:00
MX
aa00606d22
remove unnecessary checks from brute plugin, subghz improvements
fix subghz gui in add manually, add BETT protocol in add manually
2022-09-28 07:50:09 +03:00
MX
b934c41ed0
close file 2022-09-28 06:51:13 +03:00
MX
0ebb3f060e
add a bit of changes 2022-09-28 06:46:45 +03:00
derskythe
8f2bd3be57 Update list of frequencies and change name of file of settings to not able to run in browser 2022-09-28 07:14:38 +04:00
MX
0c5f11f713
return fix 2022-09-28 06:02:23 +03:00
MX
746b732034
remove unused code 2022-09-28 05:49:21 +03:00
derskythe
406247c5d8 Ok button in frequency analyzer will set this frequency to receiver 2022-09-28 06:22:02 +04:00
derskythe
22a87d5707 struct doesn't correct written 2022-09-28 05:49:06 +04:00
derskythe
a3db6718c2 fix bug with invalid settings values in config 2022-09-28 04:31:29 +04:00
derskythe
0f0473bee6 fix bug with invalid settings values in config 2022-09-28 03:27:47 +04:00
derskythe
497be7ccb0 Last SubGHz settings is ready 2022-09-28 02:01:09 +04:00
Skorpionm
bc777b2eff
SubGhz: fix config menu (#1748)
* SubGhz: fix config menu
* SubGhz: fix gui Magellen protocol
* SubGhz: fix gui Transmit SubGhz
* SubGhz: keeloq, new gen manufacture code
* SubGhz: Update keeloq_mfcodes

Co-authored-by: あく <alleteam@gmail.com>
2022-09-25 23:34:52 +09:00
MX
41571ce9ad
SubGHz RAW - datetime in default names (+ format changed)
OFW PR 1772 by Skorpionm / printf text format changed by me
2022-09-24 22:15:06 +03:00
MX
96ad7f3cef
fix nfc list crash, fix magellen gui, fix transmitter gui 2022-09-20 23:13:15 +03:00
MX
4e17230290
fix subghz read issues 2022-09-18 01:48:10 +03:00
MX
aa99ac53c7
delete 2022-09-17 20:34:46 +03:00
MX
875f70196b
drop setting save feature 2022-09-17 20:33:26 +03:00
MX
8ce5fae626
fix config 2022-09-17 00:19:43 +03:00
MX
087bf41392
commented back 2022-09-16 22:47:52 +03:00
Der Skythe
c3e31663ef Minor changes 2022-09-16 23:08:45 +04:00
MX
ef5d0aa483
fix null pointer dereference 2022-09-16 21:48:03 +03:00
MX
66487abaee
disable some logs 2022-09-16 21:37:01 +03:00
MX
d2bb1ef4d3
fix receiver filter set-up 2022-09-16 21:30:53 +03:00
Der Skythe
d97a3ef161 fix: change SUBGHZ_HISTORY_MAX to 50 according off-firm 2022-09-16 21:35:26 +04:00
Der Skythe
d67d5da034 fix: SubGhz Read reset setting ReadRAW after using scene ReadRAW 2022-09-16 18:38:08 +04:00
MX
19d201085b
reduce max subghz history items to resolve memory issues 2022-09-16 01:23:29 +03:00
MX
fc9996377d
fix subghz read mode doesn’t work at all 2022-09-15 22:10:18 +03:00
MX
72de4af6db
change it back temporarily 2022-09-15 19:59:00 +03:00
MX
5bbb13c5c9
Merge branch 'fz-dev' into dev 2022-09-15 19:58:11 +03:00
Skorpionm
8b05bd1106
[FL-2814] SubGhz: fix display information in the file if the frequency is not available for transmission in the given region (#1724) 2022-09-16 00:42:44 +09:00
MX
8fd4225939
fix detect raw bug, fix came atomo 2022-09-15 06:45:19 +03:00
MX
98312860a6
resolve merge conflict 2022-09-15 05:09:27 +03:00
MX
9dbcd43e66
Merge branch 'fz-dev' into dev 2022-09-15 05:08:53 +03:00
MX
3fbaad1488
Merge branch 'fz-dev' into dev 2022-09-14 21:04:04 +03:00