mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-04-24 03:29:57 -07:00
SubGhz: fix naming part 2 and 3
This commit is contained in:
@@ -23,17 +23,17 @@ bool subghz_scene_transmitter_update_data_show(void* context) {
|
||||
FuriString* modulation_str = furi_string_alloc();
|
||||
|
||||
if(subghz_protocol_decoder_base_deserialize(
|
||||
decoder, subghz_txtx_get_fff_data(subghz->txrx)) == SubGhzProtocolStatusOk) {
|
||||
decoder, subghz_txrx_get_fff_data(subghz->txrx)) == SubGhzProtocolStatusOk) {
|
||||
subghz_protocol_decoder_base_get_string(decoder, key_str);
|
||||
|
||||
subghz_txrx_get_frequency_modulation(
|
||||
subghz_txrx_get_frequency_and_modulation(
|
||||
subghz->txrx, frequency_str, modulation_str, false);
|
||||
subghz_view_transmitter_add_data_to_show(
|
||||
subghz->subghz_transmitter,
|
||||
furi_string_get_cstr(key_str),
|
||||
furi_string_get_cstr(frequency_str),
|
||||
furi_string_get_cstr(modulation_str),
|
||||
subghz_txrx_protocol_is_send(subghz->txrx, false));
|
||||
subghz_txrx_protocol_is_transmittable(subghz->txrx, false));
|
||||
ret = true;
|
||||
}
|
||||
furi_string_free(frequency_str);
|
||||
@@ -67,7 +67,7 @@ bool subghz_scene_transmitter_on_event(void* context, SceneManagerEvent event) {
|
||||
if(event.event == SubGhzCustomEventViewTransmitterSendStart) {
|
||||
subghz->state_notifications = SubGhzNotificationStateIDLE;
|
||||
|
||||
if(subghz_tx_start(subghz, subghz_txtx_get_fff_data(subghz->txrx))) {
|
||||
if(subghz_tx_start(subghz, subghz_txrx_get_fff_data(subghz->txrx))) {
|
||||
subghz->state_notifications = SubGhzNotificationStateTx;
|
||||
subghz_scene_transmitter_update_data_show(subghz);
|
||||
DOLPHIN_DEED(DolphinDeedSubGhzSend);
|
||||
@@ -83,7 +83,7 @@ bool subghz_scene_transmitter_on_event(void* context, SceneManagerEvent event) {
|
||||
// Calling restore!
|
||||
subghz_txrx_stop(subghz->txrx);
|
||||
|
||||
if(!subghz_tx_start(subghz, subghz_txtx_get_fff_data(subghz->txrx))) {
|
||||
if(!subghz_tx_start(subghz, subghz_txrx_get_fff_data(subghz->txrx))) {
|
||||
scene_manager_next_scene(
|
||||
subghz->scene_manager, SubGhzSceneShowOnlyRx); //TODO Is this necessary?
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user