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

subghz revert previous "fix" and do proper fix

Browse Source 
and thanks to Willy-JL !
This commit is contained in:
MX
2023-12-30 02:43:15 +03:00
parent e5ceef3422
commit b48103196f
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/main/subghz/scenes/subghz_scene_receiver.c
View File

@@ -180,7 +180,6 @@ void subghz_scene_receiver_on_enter(void* context) {
subghz->idx_menu_chosen = 0; subghz->idx_menu_chosen = 0;
} }
subghz_view_receiver_set_lock(subghz->subghz_receiver, subghz_is_locked(subghz));
subghz_view_receiver_set_mode(subghz->subghz_receiver, SubGhzViewReceiverModeLive); subghz_view_receiver_set_mode(subghz->subghz_receiver, SubGhzViewReceiverModeLive);
// Load history to receiver // Load history to receiver
@@ -224,6 +223,8 @@ void subghz_scene_receiver_on_enter(void* context) {
subghz_scene_receiver_update_statusbar(subghz); subghz_scene_receiver_update_statusbar(subghz);
subghz_view_receiver_set_lock(subghz->subghz_receiver, subghz_is_locked(subghz));
view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdReceiver); view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdReceiver);
} }

40
applications/main/subghz/views/receiver.c
View File

@@ -101,24 +101,6 @@ void subghz_receiver_rssi(SubGhzViewReceiver* instance, float rssi) {
true); true);
} }
static void subghz_view_receiver_timer_callback(void* context) {
furi_assert(context);
SubGhzViewReceiver* subghz_receiver = context;
with_view_model(
subghz_receiver->view,
SubGhzViewReceiverModel * model,
{ model->bar_show = SubGhzViewReceiverBarShowDefault; },
true);
if(subghz_receiver->lock_count < UNLOCK_CNT) {
subghz_receiver->callback(
SubGhzCustomEventViewReceiverOffDisplay, subghz_receiver->context);
} else {
subghz_receiver->lock = false;
subghz_receiver->callback(SubGhzCustomEventViewReceiverUnlock, subghz_receiver->context);
}
subghz_receiver->lock_count = 0;
}
void subghz_view_receiver_set_lock(SubGhzViewReceiver* subghz_receiver, bool lock) { void subghz_view_receiver_set_lock(SubGhzViewReceiver* subghz_receiver, bool lock) {
furi_assert(subghz_receiver); furi_assert(subghz_receiver);
subghz_receiver->lock_count = 0; subghz_receiver->lock_count = 0;
@@ -130,7 +112,6 @@ void subghz_view_receiver_set_lock(SubGhzViewReceiver* subghz_receiver, bool loc
{ model->bar_show = SubGhzViewReceiverBarShowLock; }, { model->bar_show = SubGhzViewReceiverBarShowLock; },
true); true);
furi_timer_start(subghz_receiver->timer, 1000); furi_timer_start(subghz_receiver->timer, 1000);
subghz_view_receiver_timer_callback(subghz_receiver);
} else { } else {
with_view_model( with_view_model(
subghz_receiver->view, subghz_receiver->view,
@@ -443,6 +424,21 @@ void subghz_view_receiver_draw(Canvas* canvas, SubGhzViewReceiverModel* model) {
} }
} }
static void subghz_view_receiver_timer_callback(void* context) {
furi_assert(context);
SubGhzViewReceiver* subghz_receiver = context;
with_view_model(
subghz_receiver->view,
SubGhzViewReceiverModel * model,
{ model->bar_show = SubGhzViewReceiverBarShowDefault; },
true);
if(subghz_receiver->lock_count < UNLOCK_CNT) {
subghz_receiver->callback(
SubGhzCustomEventViewReceiverOffDisplay, subghz_receiver->context);
}
subghz_receiver->lock_count = 0;
}
bool subghz_view_receiver_input(InputEvent* event, void* context) { bool subghz_view_receiver_input(InputEvent* event, void* context) {
furi_assert(context); furi_assert(context);
SubGhzViewReceiver* subghz_receiver = context; SubGhzViewReceiver* subghz_receiver = context;
@@ -460,14 +456,14 @@ bool subghz_view_receiver_input(InputEvent* event, void* context) {
subghz_receiver->lock_count++; subghz_receiver->lock_count++;
} }
if(subghz_receiver->lock_count >= UNLOCK_CNT) { if(subghz_receiver->lock_count >= UNLOCK_CNT) {
// subghz_receiver->callback( subghz_receiver->callback(
// SubGhzCustomEventViewReceiverUnlock, subghz_receiver->context); SubGhzCustomEventViewReceiverUnlock, subghz_receiver->context);
with_view_model( with_view_model(
subghz_receiver->view, subghz_receiver->view,
SubGhzViewReceiverModel * model, SubGhzViewReceiverModel * model,
{ model->bar_show = SubGhzViewReceiverBarShowUnlock; }, { model->bar_show = SubGhzViewReceiverBarShowUnlock; },
true); true);
//subghz_receiver->lock = false; subghz_receiver->lock = false;
furi_timer_start(subghz_receiver->timer, 650); furi_timer_start(subghz_receiver->timer, 650);
} }