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.

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

[FL-3375] SubGhz: add CC1101 module external #2747

Merged
merged 34 commits into from
Jun 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
aeecfa3
SubGhz: add CC1101 Ext driver
Skorpionm Jun 8, 2023
0ffc571
SubGhz: move TIM2 -> TIM17 use cc1101_ext
Skorpionm Jun 8, 2023
cb82336
FuriHal: SPI move channel DMA 3,4 -> 6.7
Skorpionm Jun 9, 2023
0a34e99
Documentation: fix font
Skorpionm Jun 9, 2023
d5e8a3b
SubGhz: add work with SubGhz devices by link to device
Skorpionm Jun 10, 2023
a45cae5
SubGhz: add support switching external/internal cc1101 "subghz chat"
Skorpionm Jun 10, 2023
fa081ec
SubGhz: add support switching external/internal cc1101 "subghz tx" an…
Skorpionm Jun 10, 2023
2286917
SubGhz: add "Radio Settings" scene
Skorpionm Jun 13, 2023
e40d04e
Merge branch 'dev' into skorp/cc1101_ext
skotopes Jun 14, 2023
7f6fac4
SubGhz: add icon
Skorpionm Jun 14, 2023
db0123e
SubGhz: add supported CC1101 external module in SubGhz app
Skorpionm Jun 14, 2023
d2ae6bd
SubGhz: fix check frequency supported radio device
Skorpionm Jun 15, 2023
5f4a5c4
SubGhz: fix clang-formatted
Skorpionm Jun 15, 2023
ad19abc
Sughz: move dirver CC1101_Ext to lib , compile cmd ./fbt launch_app A…
Skorpionm Jun 15, 2023
7d975a6
SubGhz: fix CLI
Skorpionm Jun 16, 2023
14829fe
SubGhz: fix PVS
Skorpionm Jun 16, 2023
8fdb154
SubGhz: delete comments
Skorpionm Jun 16, 2023
de82c24
SubGhz: fix unit_test
Skorpionm Jun 16, 2023
34c1a05
Merge remote-tracking branch 'origin/dev' into skorp/cc1101_ext
skotopes Jun 28, 2023
953ffae
Merge branch 'dev' into skorp/cc1101_ext
skotopes Jun 28, 2023
1b4d798
Format sources
skotopes Jun 28, 2023
7fc9bd9
Update api symbols and drivers targets
skotopes Jun 28, 2023
a3ec037
Drivers: find proper place for target option
skotopes Jun 28, 2023
9a4c947
SubGhz: external device connected method naming
skotopes Jun 28, 2023
f82bce4
Format sources
skotopes Jun 28, 2023
9038d7d
SubGhz: fix module selection menu, when external is not connected
Skorpionm Jun 30, 2023
5e614b7
SubGhz: fix furi_assert(device);
Skorpionm Jun 30, 2023
b037511
SubGhz: fix split h and c
Skorpionm Jun 30, 2023
1237743
SubGhz: furi_hal_subghz remove preset load function by name
Skorpionm Jun 30, 2023
3a2418b
SubGhz: deleted comments
Skorpionm Jun 30, 2023
401401c
Merge remote-tracking branch 'origin/dev' into skorp/cc1101_ext
skotopes Jun 30, 2023
8d5a95e
Format Sources
skotopes Jun 30, 2023
0908c5e
SubGhz: add some consts and fix unit tests
skotopes Jun 30, 2023
ba1cf1b
Sync API Symbols
skotopes Jun 30, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions applications/debug/unit_tests/subghz/subghz_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include <lib/subghz/subghz_file_encoder_worker.h>
#include <lib/subghz/protocols/protocol_items.h>
#include <flipper_format/flipper_format_i.h>
#include <lib/subghz/devices/devices.h>
#include <lib/subghz/devices/cc1101_configs.h>

#define TAG "SubGhz TEST"
#define KEYSTORE_DIR_NAME EXT_PATH("subghz/assets/keeloq_mfcodes")
Expand Down Expand Up @@ -49,12 +51,15 @@ static void subghz_test_init(void) {
subghz_environment_set_protocol_registry(
environment_handler, (void*)&subghz_protocol_registry);

subghz_devices_init();

receiver_handler = subghz_receiver_alloc_init(environment_handler);
subghz_receiver_set_filter(receiver_handler, SubGhzProtocolFlag_Decodable);
subghz_receiver_set_rx_callback(receiver_handler, subghz_test_rx_callback, NULL);
}

static void subghz_test_deinit(void) {
subghz_devices_deinit();
subghz_receiver_free(receiver_handler);
subghz_environment_free(environment_handler);
}
Expand All @@ -68,7 +73,7 @@ static bool subghz_decoder_test(const char* path, const char* name_decoder) {

if(decoder) {
file_worker_encoder_handler = subghz_file_encoder_worker_alloc();
if(subghz_file_encoder_worker_start(file_worker_encoder_handler, path)) {
if(subghz_file_encoder_worker_start(file_worker_encoder_handler, path, NULL)) {
// the worker needs a file in order to open and read part of the file
furi_delay_ms(100);

Expand Down Expand Up @@ -108,7 +113,7 @@ static bool subghz_decode_random_test(const char* path) {
uint32_t test_start = furi_get_tick();

file_worker_encoder_handler = subghz_file_encoder_worker_alloc();
if(subghz_file_encoder_worker_start(file_worker_encoder_handler, path)) {
if(subghz_file_encoder_worker_start(file_worker_encoder_handler, path, NULL)) {
// the worker needs a file in order to open and read part of the file
furi_delay_ms(100);

Expand Down Expand Up @@ -318,7 +323,7 @@ bool subghz_hal_async_tx_test_run(SubGhzHalAsyncTxTestType type) {
SubGhzHalAsyncTxTest test = {0};
test.type = type;
furi_hal_subghz_reset();
furi_hal_subghz_load_preset(FuriHalSubGhzPresetOok650Async);
furi_hal_subghz_load_custom_preset(subghz_device_cc1101_preset_ook_650khz_async_regs);
furi_hal_subghz_set_frequency_and_path(433920000);

if(!furi_hal_subghz_start_async_tx(subghz_hal_async_tx_test_yield, &test)) {
Expand Down
6 changes: 6 additions & 0 deletions applications/drivers/application.fam
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Placeholder
App(
appid="drivers",
name="Drivers device",
apptype=FlipperAppType.METAPACKAGE,
)
8 changes: 8 additions & 0 deletions applications/drivers/subghz/application.fam
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
App(
appid="radio_device_cc1101_ext",
apptype=FlipperAppType.PLUGIN,
targets=["f7"],
entry_point="subghz_device_cc1101_ext_ep",
requires=["subghz"],
fap_libs=["hwdrivers"],
)
Loading