Skip to content

Commit db02dfb

Browse files
committed
Merge branch 'dev' into unleashed
2 parents 5f2c03b + adffe20 commit db02dfb

File tree

3 files changed

+228
-198
lines changed

3 files changed

+228
-198
lines changed

.github/CODEOWNERS

+87-59
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,91 @@
11
# Who owns all the fish by default
2+
* @skotopes @DrZlo13 @hedger
23

3-
* @skotopes @DrZlo13
4-
5-
# Applications
6-
applications/** @skotopes @DrZlo13
7-
applications/accessor/** @skotopes @DrZlo13
8-
applications/loader/** @skotopes @DrZlo13 @gornekich
9-
applications/bt/** @skotopes @DrZlo13
10-
applications/cli/** @skotopes @DrZlo13
11-
applications/dolphin/** @skotopes @DrZlo13
12-
applications/gpio-tester/** @skotopes @DrZlo13
13-
applications/gui/** @skotopes @DrZlo13
14-
applications/gui-test/** @skotopes @DrZlo13
15-
applications/ibutton/** @skotopes @DrZlo13
16-
applications/input/** @skotopes @DrZlo13
17-
applications/infrared/** @skotopes @DrZlo13
18-
applications/lf-rfid/** @skotopes @DrZlo13
19-
applications/menu/** @skotopes @DrZlo13
20-
applications/music-player/** @skotopes @DrZlo13
21-
applications/nfc/** @skotopes @DrZlo13 @gornekich
22-
applications/power/** @skotopes @DrZlo13
23-
applications/sd-card-test/** @skotopes @DrZlo13
24-
applications/sd-filesystem/** @skotopes @DrZlo13
25-
applications/subghz/** @skotopes @DrZlo13
26-
applications/template/** @skotopes @DrZlo13
27-
applications/tests/** @skotopes @DrZlo13
28-
applications/updater/** @skotopes @DrZlo13 @hedger
29-
30-
# Assets and asset generator
31-
assets/** @skotopes @DrZlo13
32-
33-
# Bootloader
34-
bootloader/** @skotopes @DrZlo13
35-
36-
# Core, HAL and applocation loader
37-
core/** @skotopes @DrZlo13
38-
39-
# Debug tools
40-
debug/** @skotopes @DrZlo13
41-
42-
# Firmware
43-
firmware/** @skotopes @DrZlo13
4+
# Apps
5+
/applications/about/ @skotopes @DrZlo13 @hedger
6+
/applications/accessor/ @skotopes @DrZlo13 @hedger
7+
/applications/archive/ @skotopes @DrZlo13 @hedger @nminaylov
8+
/applications/bad_usb/ @skotopes @DrZlo13 @hedger @nminaylov
9+
/applications/bt/ @skotopes @DrZlo13 @hedger @gornekich
10+
/applications/cli/ @skotopes @DrZlo13 @hedger @nminaylov
11+
/applications/crypto/ @skotopes @DrZlo13 @hedger @nminaylov
12+
/applications/debug_tools/ @skotopes @DrZlo13 @hedger
13+
/applications/desktop/ @skotopes @DrZlo13 @hedger @nminaylov
14+
/applications/dialogs/ @skotopes @DrZlo13 @hedger
15+
/applications/dolphin/ @skotopes @DrZlo13 @hedger
16+
/applications/gpio/ @skotopes @DrZlo13 @hedger @nminaylov
17+
/applications/gui/ @skotopes @DrZlo13 @hedger
18+
/applications/ibutton/ @skotopes @DrZlo13 @hedger @gsurkov
19+
/applications/infrared/ @skotopes @DrZlo13 @hedger @gsurkov
20+
/applications/infrared_monitor/ @skotopes @DrZlo13 @hedger @gsurkov
21+
/applications/input/ @skotopes @DrZlo13 @hedger
22+
/applications/lfrfid/ @skotopes @DrZlo13 @hedger
23+
/applications/lfrfid_debug/ @skotopes @DrZlo13 @hedger
24+
/applications/loader/ @skotopes @DrZlo13 @hedger
25+
/applications/music_player/ @skotopes @DrZlo13 @hedger
26+
/applications/nfc/ @skotopes @DrZlo13 @hedger @gornekich
27+
/applications/notification/ @skotopes @DrZlo13 @hedger
28+
/applications/power/ @skotopes @DrZlo13 @hedger
29+
/applications/rpc/ @skotopes @DrZlo13 @hedger @nminaylov
30+
/applications/snake_game/ @skotopes @DrZlo13 @hedger
31+
/applications/storage/ @skotopes @DrZlo13 @hedger
32+
/applications/storage_settings/ @skotopes @DrZlo13 @hedger
33+
/applications/subghz/ @skotopes @DrZlo13 @hedger @Skorpionm
34+
/applications/system/ @skotopes @DrZlo13 @hedger
35+
/applications/u2f/ @skotopes @DrZlo13 @hedger @nminaylov
36+
/applications/unit_tests/ @skotopes @DrZlo13 @hedger
37+
/applications/updater/ @skotopes @DrZlo13 @hedger
38+
39+
# Assets
40+
/assets/ @skotopes @DrZlo13 @hedger
41+
42+
# Furi Core
43+
/core/ @skotopes @DrZlo13 @hedger
44+
45+
# Debug tools and plugins
46+
/debug/ @skotopes @DrZlo13 @hedger
47+
48+
# Docker
49+
/docker/ @skotopes @DrZlo13 @hedger @aprosvetova
50+
/docker-compose.yml @skotopes @DrZlo13 @hedger @aprosvetova
51+
52+
# Documentation
53+
/documentation/ @skotopes @DrZlo13 @hedger @aprosvetova
54+
55+
# Firmware targets
56+
/firmware/ @skotopes @DrZlo13 @hedger
4457

4558
# Lib
46-
lib/app-template/** @skotopes @DrZlo13
47-
lib/callback-connector/** @skotopes @DrZlo13
48-
lib/common-api/** @skotopes @DrZlo13
49-
lib/cyfral/** @skotopes @DrZlo13
50-
lib/drivers/** @skotopes @DrZlo13 @gornekich
51-
lib/fatfs/** @skotopes @DrZlo13
52-
lib/fnv1a-hash/** @skotopes @DrZlo13
53-
lib/littlefs/** @skotopes @DrZlo13
54-
lib/mlib/** @skotopes @DrZlo13
55-
lib/onewire/** @skotopes @DrZlo13
56-
lib/qrcode/** @skotopes @DrZlo13
57-
lib/ST25RFAL002/** @skotopes @DrZlo13 @gornekich
58-
lib/STM32CubeWB/** @skotopes @DrZlo13
59-
lib/u8g2/** @skotopes @DrZlo13
60-
lib/version/** @skotopes @DrZlo13
61-
62-
# Make
63-
make/** @skotopes @DrZlo13
59+
/lib/FreeRTOS-Kernel/ @skotopes @DrZlo13 @hedger
60+
/lib/FreeRTOS-glue/ @skotopes @DrZlo13 @hedger
61+
/lib/ST25RFAL002/ @skotopes @DrZlo13 @hedger @gornekich
62+
/lib/STM32CubeWB/ @skotopes @DrZlo13 @hedger @gornekich
63+
/lib/app-scened-template/ @skotopes @DrZlo13 @hedger
64+
/lib/callback-connector/ @skotopes @DrZlo13 @hedger
65+
/lib/digital_signal/ @skotopes @DrZlo13 @hedger @gornekich
66+
/lib/drivers/ @skotopes @DrZlo13 @hedger
67+
/lib/fatfs/ @skotopes @DrZlo13 @hedger
68+
/lib/flipper_format/ @skotopes @DrZlo13 @hedger
69+
/lib/fnv1a-hash/ @skotopes @DrZlo13 @hedger
70+
/lib/heatshrink/ @skotopes @DrZlo13 @hedger
71+
/lib/infrared/ @skotopes @DrZlo13 @hedger @gsurkov
72+
/lib/libusb_stm32/ @skotopes @DrZlo13 @hedger @nminaylov
73+
/lib/littlefs/ @skotopes @DrZlo13 @hedger
74+
/lib/lfs_config.h @skotopes @DrZlo13 @hedger
75+
/lib/micro-ecc/ @skotopes @DrZlo13 @hedger @nminaylov
76+
/lib/microtar/ @skotopes @DrZlo13 @hedger
77+
/lib/mlib/ @skotopes @DrZlo13 @hedger
78+
/lib/nanopb/ @skotopes @DrZlo13 @hedger
79+
/lib/nfc_protocols/ @skotopes @DrZlo13 @hedger @gornekich
80+
/lib/one_wire/ @skotopes @DrZlo13 @hedger
81+
/lib/qrcode/ @skotopes @DrZlo13 @hedger
82+
/lib/subghz/ @skotopes @DrZlo13 @hedger @Skorpionm
83+
/lib/toolbox/ @skotopes @DrZlo13 @hedger
84+
/lib/u8g2/ @skotopes @DrZlo13 @hedger
85+
/lib/update_util/ @skotopes @DrZlo13 @hedger
86+
87+
# Make tools
88+
/make/ @skotopes @DrZlo13 @hedger @aprosvetova
89+
90+
# Helper scripts
91+
/scripts/ @skotopes @DrZlo13 @hedger

applications/subghz/scenes/subghz_scene_read_raw.c

-2
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,6 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) {
200200
}
201201
if((subghz->txrx->txrx_state == SubGhzTxRxStateIDLE) ||
202202
(subghz->txrx->txrx_state == SubGhzTxRxStateSleep)) {
203-
//ToDo FIX
204-
205203
if(!subghz_tx_start(subghz, subghz->txrx->fff_data)) {
206204
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowOnlyRx);
207205
} else {

0 commit comments

Comments
 (0)