mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-14 19:08:35 -07:00
Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
@@ -24,4 +24,4 @@ ADD_SCENE(subghz, frequency_analyzer, FrequencyAnalyzer)
|
||||
ADD_SCENE(subghz, read_raw, ReadRAW)
|
||||
ADD_SCENE(subghz, more_raw, MoreRAW)
|
||||
ADD_SCENE(subghz, delete_raw, DeleteRAW)
|
||||
ADD_SCENE(subghz, need_saving, NeedSaving)
|
||||
ADD_SCENE(subghz, need_saving, NeedSaving)
|
||||
|
||||
@@ -191,5 +191,5 @@ bool subghz_scene_receiver_on_event(void* context, SceneManagerEvent event) {
|
||||
}
|
||||
|
||||
void subghz_scene_receiver_on_exit(void* context) {
|
||||
// SubGhz* subghz = context;
|
||||
UNUSED(context);
|
||||
}
|
||||
|
||||
@@ -61,6 +61,7 @@ uint8_t subghz_scene_receiver_config_hopper_value_index(
|
||||
uint8_t values_count,
|
||||
void* context) {
|
||||
furi_assert(context);
|
||||
UNUSED(values_count);
|
||||
SubGhz* subghz = context;
|
||||
|
||||
if(value == values[0]) {
|
||||
@@ -188,7 +189,8 @@ void subghz_scene_receiver_config_on_enter(void* context) {
|
||||
}
|
||||
|
||||
bool subghz_scene_receiver_config_on_event(void* context, SceneManagerEvent event) {
|
||||
//SubGhz* subghz = context;
|
||||
UNUSED(context);
|
||||
UNUSED(event);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -16,10 +16,11 @@ void subghz_scene_saved_on_enter(void* context) {
|
||||
}
|
||||
|
||||
bool subghz_scene_saved_on_event(void* context, SceneManagerEvent event) {
|
||||
// SubGhz* subghz = context;
|
||||
UNUSED(context);
|
||||
UNUSED(event);
|
||||
return false;
|
||||
}
|
||||
|
||||
void subghz_scene_saved_on_exit(void* context) {
|
||||
// SubGhz* subghz = context;
|
||||
UNUSED(context);
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ void subghz_scene_show_only_rx_on_enter(void* context) {
|
||||
view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdPopup);
|
||||
}
|
||||
|
||||
const bool subghz_scene_show_only_rx_on_event(void* context, SceneManagerEvent event) {
|
||||
bool subghz_scene_show_only_rx_on_event(void* context, SceneManagerEvent event) {
|
||||
SubGhz* subghz = context;
|
||||
if(event.type == SceneManagerEventTypeCustom) {
|
||||
if(event.event == SubGhzCustomEventSceneShowOnlyRX) {
|
||||
|
||||
@@ -26,5 +26,5 @@ bool subghz_scene_test_carrier_on_event(void* context, SceneManagerEvent event)
|
||||
}
|
||||
|
||||
void subghz_scene_test_carrier_on_exit(void* context) {
|
||||
// SubGhz* subghz = context;
|
||||
UNUSED(context);
|
||||
}
|
||||
|
||||
@@ -26,5 +26,5 @@ bool subghz_scene_test_packet_on_event(void* context, SceneManagerEvent event) {
|
||||
}
|
||||
|
||||
void subghz_scene_test_packet_on_exit(void* context) {
|
||||
// SubGhz* subghz = context;
|
||||
UNUSED(context);
|
||||
}
|
||||
|
||||
@@ -26,5 +26,5 @@ bool subghz_scene_test_static_on_event(void* context, SceneManagerEvent event) {
|
||||
}
|
||||
|
||||
void subghz_scene_test_static_on_exit(void* context) {
|
||||
// SubGhz* subghz = context;
|
||||
UNUSED(context);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user