infrared subghz merge fixes

This commit is contained in:
MX
2023-11-08 11:38:22 +04:00
parent 5921eb3d27
commit ebe95a92d1
11 changed files with 24 additions and 134 deletions

View File

@@ -1,4 +1,4 @@
#include "../infrared_i.h"
#include "../infrared_app_i.h"
#include <furi_hal_infrared.h>
uint8_t value_index_ir;
@@ -10,7 +10,7 @@ const char* const infrared_debug_cfg_variables_text[] = {
};
static void infrared_scene_debug_settings_changed(VariableItem* item) {
Infrared* infrared = variable_item_get_context(item);
InfraredApp* infrared = variable_item_get_context(item);
value_index_ir = variable_item_get_current_value_index(item);
UNUSED(infrared);
@@ -35,12 +35,12 @@ static void infrared_scene_debug_settings_power_changed(VariableItem* item) {
}
static void infrared_debug_settings_start_var_list_enter_callback(void* context, uint32_t index) {
Infrared* infrared = context;
InfraredApp* infrared = context;
view_dispatcher_send_custom_event(infrared->view_dispatcher, index);
}
void infrared_scene_debug_settings_on_enter(void* context) {
Infrared* infrared = context;
InfraredApp* infrared = context;
VariableItemList* variable_item_list = infrared->variable_item_list;
@@ -72,7 +72,7 @@ void infrared_scene_debug_settings_on_enter(void* context) {
}
bool infrared_scene_debug_settings_on_event(void* context, SceneManagerEvent event) {
Infrared* infrared = context;
InfraredApp* infrared = context;
UNUSED(infrared);
UNUSED(event);
@@ -80,6 +80,6 @@ bool infrared_scene_debug_settings_on_event(void* context, SceneManagerEvent eve
}
void infrared_scene_debug_settings_on_exit(void* context) {
Infrared* infrared = context;
InfraredApp* infrared = context;
variable_item_list_reset(infrared->variable_item_list);
}

View File

@@ -1,11 +1,11 @@
#include "../infrared_i.h"
#include "../infrared_app_i.h"
#include "common/infrared_scene_universal_common.h"
void infrared_scene_universal_fan_on_enter(void* context) {
infrared_scene_universal_common_on_enter(context);
Infrared* infrared = context;
InfraredApp* infrared = context;
ButtonPanel* button_panel = infrared->button_panel;
InfraredBruteForce* brute_force = infrared->brute_force;