Make all service memory structures OFW comaptible

This commit is contained in:
Willy-JL
2023-08-29 01:57:06 +02:00
parent d87d982b2b
commit d7aa3ea60f
15 changed files with 63 additions and 30 deletions
+2
View File
@@ -14,6 +14,7 @@
struct Menu {
View* view;
FuriTimer* scroll_timer;
};
@@ -32,6 +33,7 @@ ARRAY_DEF(MenuItemArray, MenuItem, M_POD_OPLIST);
typedef struct {
MenuItemArray_t items;
size_t position;
size_t scroll_counter;
size_t vertical_offset;
} MenuModel;
@@ -24,24 +24,24 @@ typedef struct {
const char* header;
char* text_buffer;
size_t text_buffer_size;
size_t minimum_length;
char extra_symbols[9];
bool clear_default_text;
bool cursor_select;
size_t cursor_pos;
TextInputCallback callback;
void* callback_context;
uint8_t selected_row;
uint8_t selected_column;
uint8_t selected_keyboard;
TextInputValidatorCallback validator_callback;
void* validator_callback_context;
FuriString* validator_text;
bool validator_message_visible;
size_t minimum_length;
char extra_symbols[9];
bool cursor_select;
size_t cursor_pos;
uint8_t selected_keyboard;
} TextInputModel;
static const uint8_t keyboard_origin_x = 1;
@@ -12,9 +12,10 @@ struct VariableItem {
FuriString* current_value_text;
uint8_t values_count;
VariableItemChangeCallback change_callback;
void* context;
bool locked;
FuriString* locked_message;
void* context;
};
ARRAY_DEF(VariableItemArray, VariableItem, M_POD_OPLIST);
@@ -23,15 +24,17 @@ struct VariableItemList {
View* view;
VariableItemListEnterCallback callback;
void* context;
FuriTimer* scroll_timer;
FuriTimer* locked_timer;
};
typedef struct {
VariableItemArray_t items;
FuriString* header;
uint8_t position;
uint8_t window_position;
FuriString* header;
size_t scroll_counter;
bool locked_message_visible;
} VariableItemListModel;