Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-14 11:28:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

SubGhz: refactoring make subghz_radio.h look like in OFW

Browse Source
This commit is contained in:
gid9798
2023-05-09 18:24:38 +03:00
parent 8ae2cb1d32
commit 9b3654c1f0
2 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
applications/main/subghz/subghz_radio.c
View File

@@ -89,16 +89,6 @@ bool subghz_txrx_is_load_database(SubGhzTxRx* txrx) {
return txrx->load_database; return txrx->load_database;
} }
void subghz_txrx_set_debug_pin_state(SubGhzTxRx* txrx, bool state) {
furi_assert(txrx);
txrx->debug_pin_state = state;
}
bool subghz_txrx_get_debug_pin_state(SubGhzTxRx* txrx) {
furi_assert(txrx);
return txrx->debug_pin_state;
}
void subghz_set_preset( void subghz_set_preset(
SubGhzTxRx* txrx, SubGhzTxRx* txrx,
const char* preset_name, const char* preset_name,
@@ -112,28 +102,6 @@ void subghz_set_preset(
txrx->preset->data_size = preset_data_size; txrx->preset->data_size = preset_data_size;
} }
void subghz_get_frequency_modulation(
SubGhzTxRx* txrx,
FuriString* frequency,
FuriString* modulation,
bool long_name) {
furi_assert(txrx);
if(frequency != NULL) {
furi_string_printf(
frequency,
"%03ld.%02ld",
txrx->preset->frequency / 1000000 % 1000,
txrx->preset->frequency / 10000 % 100);
}
if(modulation != NULL) {
if(long_name) {
furi_string_printf(modulation, "%s", furi_string_get_cstr(txrx->preset->name));
} else {
furi_string_printf(modulation, "%.2s", furi_string_get_cstr(txrx->preset->name));
}
}
}
const char* subghz_get_name_preset(SubGhzTxRx* txrx, const char* preset) { const char* subghz_get_name_preset(SubGhzTxRx* txrx, const char* preset) {
UNUSED(txrx); UNUSED(txrx);
const char* preset_name = NULL; const char* preset_name = NULL;
@@ -158,6 +126,28 @@ SubGhzRadioPreset subghz_get_preset(SubGhzTxRx* txrx) {
return *txrx->preset; return *txrx->preset;
} }
void subghz_get_frequency_modulation(
SubGhzTxRx* txrx,
FuriString* frequency,
FuriString* modulation,
bool long_name) {
furi_assert(txrx);
if(frequency != NULL) {
furi_string_printf(
frequency,
"%03ld.%02ld",
txrx->preset->frequency / 1000000 % 1000,
txrx->preset->frequency / 10000 % 100);
}
if(modulation != NULL) {
if(long_name) {
furi_string_printf(modulation, "%s", furi_string_get_cstr(txrx->preset->name));
} else {
furi_string_printf(modulation, "%.2s", furi_string_get_cstr(txrx->preset->name));
}
}
}
static void subghz_begin(SubGhzTxRx* txrx, uint8_t* preset_data) { static void subghz_begin(SubGhzTxRx* txrx, uint8_t* preset_data) {
furi_assert(txrx); furi_assert(txrx);
furi_hal_subghz_reset(); furi_hal_subghz_reset();
@@ -582,6 +572,16 @@ void subghz_txrx_set_raw_file_encoder_worker_set_callback_end(
context); context);
} }
void subghz_txrx_set_debug_pin_state(SubGhzTxRx* txrx, bool state) {
furi_assert(txrx);
txrx->debug_pin_state = state;
}
bool subghz_txrx_get_debug_pin_state(SubGhzTxRx* txrx) {
furi_assert(txrx);
return txrx->debug_pin_state;
}
SubGhzReceiver* subghz_txrx_get_receiver(SubGhzTxRx* txrx) { SubGhzReceiver* subghz_txrx_get_receiver(SubGhzTxRx* txrx) {
furi_assert(txrx); furi_assert(txrx);
return txrx->receiver; return txrx->receiver;

7
applications/main/subghz/subghz_radio.h
View File

@@ -17,9 +17,6 @@ SubGhzTxRx* subghz_txrx_alloc();
void subghz_txrx_free(SubGhzTxRx* txrx); void subghz_txrx_free(SubGhzTxRx* txrx);
bool subghz_txrx_is_load_database(SubGhzTxRx* txrx); bool subghz_txrx_is_load_database(SubGhzTxRx* txrx);
void subghz_txrx_set_debug_pin_state(SubGhzTxRx* txrx, bool state);
bool subghz_txrx_get_debug_pin_state(SubGhzTxRx* txrx);
void subghz_set_preset( void subghz_set_preset(
SubGhzTxRx* txrx, SubGhzTxRx* txrx,
const char* preset_name, const char* preset_name,
@@ -36,7 +33,6 @@ void subghz_get_frequency_modulation(
FuriString* modulation, FuriString* modulation,
bool long_name); bool long_name);
bool subghz_tx_start(SubGhzTxRx* txrx, FlipperFormat* flipper_format); bool subghz_tx_start(SubGhzTxRx* txrx, FlipperFormat* flipper_format);
//void subghz_rx_end(SubGhzTxRx* txrx); //depricated
void subghz_rx_start(SubGhzTxRx* txrx); void subghz_rx_start(SubGhzTxRx* txrx);
void subghz_txrx_stop(SubGhzTxRx* txrx); void subghz_txrx_stop(SubGhzTxRx* txrx);
void subghz_sleep(SubGhzTxRx* txrx); void subghz_sleep(SubGhzTxRx* txrx);
@@ -76,6 +72,9 @@ void subghz_txrx_set_raw_file_encoder_worker_set_callback_end(
SubGhzProtocolEncoderRAWCallbackEnd callback, SubGhzProtocolEncoderRAWCallbackEnd callback,
void* context); void* context);
void subghz_txrx_set_debug_pin_state(SubGhzTxRx* txrx, bool state);
bool subghz_txrx_get_debug_pin_state(SubGhzTxRx* txrx);
SubGhzReceiver* subghz_txrx_get_receiver(SubGhzTxRx* txrx); // TODO use only in DecodeRaw SubGhzReceiver* subghz_txrx_get_receiver(SubGhzTxRx* txrx); // TODO use only in DecodeRaw
//#############Create new Key############## //#############Create new Key##############