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

run fbt format, add smol fix

Browse Source
This commit is contained in:
MX
2024-01-30 21:18:27 +03:00
parent d3dcc1d27d
commit ed3cd21f5c
5 changed files with 546 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/main/subghz/subghz_last_settings.c
View File

@@ -126,6 +126,7 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count
instance->timestamp_file_names = false; instance->timestamp_file_names = false;
instance->external_module_power_amp = false; instance->external_module_power_amp = false;
instance->enable_hopping = false; instance->enable_hopping = false;
instance->delete_old_signals = false;
instance->ignore_filter = 0x00; instance->ignore_filter = 0x00;
// See bin_raw_value in applications/main/subghz/scenes/subghz_scene_receiver_config.c // See bin_raw_value in applications/main/subghz/scenes/subghz_scene_receiver_config.c
instance->filter = SubGhzProtocolFlag_Decodable; instance->filter = SubGhzProtocolFlag_Decodable;

720
applications/system/hid_app/views/hid_ptt.c
View File

File diff suppressed because it is too large Load Diff

108
applications/system/hid_app/views/hid_ptt_menu.c
View File

@@ -58,11 +58,12 @@ typedef struct {
size_t list_position; size_t list_position;
size_t position; size_t position;
size_t window_position; size_t window_position;
PushToTalkMenuList *lists; PushToTalkMenuList* lists;
int lists_count; int lists_count;
} HidPushToTalkMenuModel; } HidPushToTalkMenuModel;
static void hid_ptt_menu_draw_list(Canvas* canvas, void* context, const PushToTalkMenuItemArray_t items) { static void
hid_ptt_menu_draw_list(Canvas* canvas, void* context, const PushToTalkMenuItemArray_t items) {
furi_assert(context); furi_assert(context);
HidPushToTalkMenuModel* model = context; HidPushToTalkMenuModel* model = context;
const uint8_t item_height = 16; const uint8_t item_height = 16;
@@ -71,7 +72,8 @@ static void hid_ptt_menu_draw_list(Canvas* canvas, void* context, const PushToTa
canvas_set_font(canvas, FontSecondary); canvas_set_font(canvas, FontSecondary);
size_t position = 0; size_t position = 0;
PushToTalkMenuItemArray_it_t it; PushToTalkMenuItemArray_it_t it;
for(PushToTalkMenuItemArray_it(it, items); !PushToTalkMenuItemArray_end_p(it); PushToTalkMenuItemArray_next(it)) { for(PushToTalkMenuItemArray_it(it, items); !PushToTalkMenuItemArray_end_p(it);
PushToTalkMenuItemArray_next(it)) {
const size_t item_position = position - model->window_position; const size_t item_position = position - model->window_position;
const size_t items_on_screen = 3; const size_t items_on_screen = 3;
uint8_t y_offset = 16; uint8_t y_offset = 16;
@@ -105,15 +107,14 @@ static void hid_ptt_menu_draw_list(Canvas* canvas, void* context, const PushToTa
position++; position++;
} }
elements_scrollbar_pos(canvas, 128 , 17, 46, model->position, PushToTalkMenuItemArray_size(items)); elements_scrollbar_pos(
canvas, 128, 17, 46, model->position, PushToTalkMenuItemArray_size(items));
} }
PushToTalkMenuList * hid_ptt_menu_get_list_at_index( PushToTalkMenuList* hid_ptt_menu_get_list_at_index(void* context, uint32_t index) {
void* context,
uint32_t index) {
furi_assert(context); furi_assert(context);
HidPushToTalkMenuModel* model = context; HidPushToTalkMenuModel* model = context;
for (int i = 0; i < model->lists_count; i++) { for(int i = 0; i < model->lists_count; i++) {
PushToTalkMenuList* list = &model->lists[i]; PushToTalkMenuList* list = &model->lists[i];
if(index == list->index) { if(index == list->index) {
return list; return list;
@@ -125,7 +126,7 @@ PushToTalkMenuList * hid_ptt_menu_get_list_at_index(
static void hid_ptt_menu_draw_callback(Canvas* canvas, void* context) { static void hid_ptt_menu_draw_callback(Canvas* canvas, void* context) {
furi_assert(context); furi_assert(context);
HidPushToTalkMenuModel* model = context; HidPushToTalkMenuModel* model = context;
if (model->lists_count == 0){ if(model->lists_count == 0) {
return; return;
} }
uint8_t item_width = canvas_width(canvas) - 5; uint8_t item_width = canvas_width(canvas) - 5;
@@ -139,32 +140,28 @@ static void hid_ptt_menu_draw_callback(Canvas* canvas, void* context) {
FuriString* disp_str; FuriString* disp_str;
disp_str = furi_string_alloc_set(list->label); disp_str = furi_string_alloc_set(list->label);
elements_string_fit_width(canvas, disp_str, item_width - (6 * 2)); elements_string_fit_width(canvas, disp_str, item_width - (6 * 2));
uint8_t x_pos = (canvas_width(canvas) - canvas_string_width(canvas,furi_string_get_cstr(disp_str))) / 2; uint8_t x_pos =
canvas_draw_str(canvas,x_pos,11,furi_string_get_cstr(disp_str)); (canvas_width(canvas) - canvas_string_width(canvas, furi_string_get_cstr(disp_str))) / 2;
canvas_draw_str(canvas, x_pos, 11, furi_string_get_cstr(disp_str));
furi_string_free(disp_str); furi_string_free(disp_str);
canvas_set_font(canvas, FontSecondary); canvas_set_font(canvas, FontSecondary);
hid_ptt_menu_draw_list( hid_ptt_menu_draw_list(canvas, context, list->items);
canvas,
context,
list->items
);
} }
void ptt_menu_add_list( void ptt_menu_add_list(HidPushToTalkMenu* hid_ptt_menu, const char* label, uint32_t index) {
HidPushToTalkMenu* hid_ptt_menu,
const char* label,
uint32_t index) {
furi_assert(label); furi_assert(label);
furi_assert(hid_ptt_menu); furi_assert(hid_ptt_menu);
with_view_model( with_view_model(
hid_ptt_menu->view, HidPushToTalkMenuModel * model, hid_ptt_menu->view,
HidPushToTalkMenuModel * model,
{ {
if (model->lists_count == 0) { if(model->lists_count == 0) {
model->lists = (PushToTalkMenuList *)malloc(sizeof(PushToTalkMenuList)); model->lists = (PushToTalkMenuList*)malloc(sizeof(PushToTalkMenuList));
} else { } else {
model->lists = (PushToTalkMenuList *)realloc(model->lists, (model->lists_count + 1) * sizeof(PushToTalkMenuList)); model->lists = (PushToTalkMenuList*)realloc(
model->lists, (model->lists_count + 1) * sizeof(PushToTalkMenuList));
} }
if (model->lists == NULL) { if(model->lists == NULL) {
FURI_LOG_E(TAG, "Memory reallocation failed (%i)", model->lists_count); FURI_LOG_E(TAG, "Memory reallocation failed (%i)", model->lists_count);
return; return;
} }
@@ -177,7 +174,6 @@ void ptt_menu_add_list(
true); true);
} }
void ptt_menu_add_item_to_list( void ptt_menu_add_item_to_list(
HidPushToTalkMenu* hid_ptt_menu, HidPushToTalkMenu* hid_ptt_menu,
uint32_t list_index, uint32_t list_index,
@@ -190,10 +186,11 @@ void ptt_menu_add_item_to_list(
furi_assert(hid_ptt_menu); furi_assert(hid_ptt_menu);
UNUSED(list_index); UNUSED(list_index);
with_view_model( with_view_model(
hid_ptt_menu->view, HidPushToTalkMenuModel * model, hid_ptt_menu->view,
HidPushToTalkMenuModel * model,
{ {
PushToTalkMenuList* list = hid_ptt_menu_get_list_at_index(model, list_index); PushToTalkMenuList* list = hid_ptt_menu_get_list_at_index(model, list_index);
if (list == NULL){ if(list == NULL) {
FURI_LOG_E(TAG, "Adding item %s to unknown index %li", label, list_index); FURI_LOG_E(TAG, "Adding item %s to unknown index %li", label, list_index);
return; return;
} }
@@ -206,16 +203,17 @@ void ptt_menu_add_item_to_list(
true); true);
} }
void ptt_menu_shift_list(HidPushToTalkMenu* hid_ptt_menu, int shift){ void ptt_menu_shift_list(HidPushToTalkMenu* hid_ptt_menu, int shift) {
size_t new_position = 0; size_t new_position = 0;
uint32_t index = 0; uint32_t index = 0;
with_view_model( with_view_model(
hid_ptt_menu->view, HidPushToTalkMenuModel * model, hid_ptt_menu->view,
HidPushToTalkMenuModel * model,
{ {
int new_list_position = (short) model->list_position + shift; int new_list_position = (short)model->list_position + shift;
if (new_list_position >= model->lists_count) { if(new_list_position >= model->lists_count) {
new_list_position = 0; new_list_position = 0;
} else if (new_list_position < 0) { } else if(new_list_position < 0) {
new_list_position = model->lists_count - 1; new_list_position = model->lists_count - 1;
} }
PushToTalkMenuList* list = &model->lists[model->list_position]; PushToTalkMenuList* list = &model->lists[model->list_position];
@@ -225,8 +223,9 @@ void ptt_menu_shift_list(HidPushToTalkMenu* hid_ptt_menu, int shift){
size_t position = 0; size_t position = 0;
// Find item index from current list // Find item index from current list
PushToTalkMenuItemArray_it_t it; PushToTalkMenuItemArray_it_t it;
for(PushToTalkMenuItemArray_it(it, list->items); !PushToTalkMenuItemArray_end_p(it); PushToTalkMenuItemArray_next(it)) { for(PushToTalkMenuItemArray_it(it, list->items); !PushToTalkMenuItemArray_end_p(it);
if (position == model->position){ PushToTalkMenuItemArray_next(it)) {
if(position == model->position) {
index = PushToTalkMenuItemArray_cref(it)->index; index = PushToTalkMenuItemArray_cref(it)->index;
break; break;
} }
@@ -235,8 +234,10 @@ void ptt_menu_shift_list(HidPushToTalkMenu* hid_ptt_menu, int shift){
// Try to find item with the same index in a new list // Try to find item with the same index in a new list
position = 0; position = 0;
bool item_exists_in_new_list = false; bool item_exists_in_new_list = false;
for(PushToTalkMenuItemArray_it(it, new_list->items); !PushToTalkMenuItemArray_end_p(it); PushToTalkMenuItemArray_next(it)) { for(PushToTalkMenuItemArray_it(it, new_list->items);
if (PushToTalkMenuItemArray_cref(it)->index == index) { !PushToTalkMenuItemArray_end_p(it);
PushToTalkMenuItemArray_next(it)) {
if(PushToTalkMenuItemArray_cref(it)->index == index) {
item_exists_in_new_list = true; item_exists_in_new_list = true;
new_position = position; new_position = position;
break; break;
@@ -246,20 +247,20 @@ void ptt_menu_shift_list(HidPushToTalkMenu* hid_ptt_menu, int shift){
// This list item is not presented in a new list, let's try to keep position as is. // This list item is not presented in a new list, let's try to keep position as is.
// If it's out of range for the new list set it to the end // If it's out of range for the new list set it to the end
if (!item_exists_in_new_list) { if(!item_exists_in_new_list) {
new_position = items_size - 1 < model->position ? items_size - 1 : model->position; new_position = items_size - 1 < model->position ? items_size - 1 : model->position;
} }
// Tune window position. As we have 3 items on screen, keep focus centered // Tune window position. As we have 3 items on screen, keep focus centered
const size_t items_on_screen = 3; const size_t items_on_screen = 3;
if (new_position >= items_size - 1) { if(new_position >= items_size - 1) {
if (items_size < items_on_screen + 1) { if(items_size < items_on_screen + 1) {
new_window_position = 0; new_window_position = 0;
} else { } else {
new_window_position = items_size - items_on_screen; new_window_position = items_size - items_on_screen;
} }
} else if (new_position < items_on_screen - 1) { } else if(new_position < items_on_screen - 1) {
new_window_position = 0; new_window_position = 0;
} else { } else {
new_window_position = new_position - 1; new_window_position = new_position - 1;
@@ -273,7 +274,8 @@ void ptt_menu_shift_list(HidPushToTalkMenu* hid_ptt_menu, int shift){
void ptt_menu_process_up(HidPushToTalkMenu* hid_ptt_menu) { void ptt_menu_process_up(HidPushToTalkMenu* hid_ptt_menu) {
with_view_model( with_view_model(
hid_ptt_menu->view, HidPushToTalkMenuModel * model, hid_ptt_menu->view,
HidPushToTalkMenuModel * model,
{ {
PushToTalkMenuList* list = &model->lists[model->list_position]; PushToTalkMenuList* list = &model->lists[model->list_position];
const size_t items_on_screen = 3; const size_t items_on_screen = 3;
@@ -296,7 +298,8 @@ void ptt_menu_process_up(HidPushToTalkMenu* hid_ptt_menu) {
void ptt_menu_process_down(HidPushToTalkMenu* hid_ptt_menu) { void ptt_menu_process_down(HidPushToTalkMenu* hid_ptt_menu) {
with_view_model( with_view_model(
hid_ptt_menu->view, HidPushToTalkMenuModel * model, hid_ptt_menu->view,
HidPushToTalkMenuModel * model,
{ {
PushToTalkMenuList* list = &model->lists[model->list_position]; PushToTalkMenuList* list = &model->lists[model->list_position];
const size_t items_on_screen = 3; const size_t items_on_screen = 3;
@@ -320,7 +323,8 @@ void ptt_menu_process_ok(HidPushToTalkMenu* hid_ptt_menu) {
PushToTalkMenuList* list = NULL; PushToTalkMenuList* list = NULL;
PushToTalkMenuItem* item = NULL; PushToTalkMenuItem* item = NULL;
with_view_model( with_view_model(
hid_ptt_menu->view, HidPushToTalkMenuModel * model, hid_ptt_menu->view,
HidPushToTalkMenuModel * model,
{ {
list = &model->lists[model->list_position]; list = &model->lists[model->list_position];
const size_t items_size = PushToTalkMenuItemArray_size(list->items); const size_t items_size = PushToTalkMenuItemArray_size(list->items);
@@ -390,24 +394,30 @@ HidPushToTalkMenu* hid_ptt_menu_alloc(Hid* hid) {
view_set_input_callback(hid_ptt_menu->view, hid_ptt_menu_input_callback); view_set_input_callback(hid_ptt_menu->view, hid_ptt_menu_input_callback);
with_view_model( with_view_model(
hid_ptt_menu->view, HidPushToTalkMenuModel * model, { hid_ptt_menu->view,
HidPushToTalkMenuModel * model,
{
model->lists_count = 0; model->lists_count = 0;
model->position = 0; model->position = 0;
model->window_position = 0; model->window_position = 0;
}, true); },
true);
return hid_ptt_menu; return hid_ptt_menu;
} }
void hid_ptt_menu_free(HidPushToTalkMenu* hid_ptt_menu) { void hid_ptt_menu_free(HidPushToTalkMenu* hid_ptt_menu) {
furi_assert(hid_ptt_menu); furi_assert(hid_ptt_menu);
with_view_model( with_view_model(
hid_ptt_menu->view, HidPushToTalkMenuModel * model, { hid_ptt_menu->view,
for (int i = 0; i < model->lists_count; i++) { HidPushToTalkMenuModel * model,
{
for(int i = 0; i < model->lists_count; i++) {
PushToTalkMenuItemArray_clear(model->lists[i].items); PushToTalkMenuItemArray_clear(model->lists[i].items);
furi_string_free(model->lists[i].label); furi_string_free(model->lists[i].label);
} }
free(model->lists); free(model->lists);
}, true); },
true);
view_free(hid_ptt_menu->view); view_free(hid_ptt_menu->view);
free(hid_ptt_menu); free(hid_ptt_menu);
} }

12
applications/system/hid_app/views/hid_ptt_menu.h
View File

@@ -5,7 +5,12 @@
typedef struct Hid Hid; typedef struct Hid Hid;
typedef struct HidPushToTalkMenu HidPushToTalkMenu; typedef struct HidPushToTalkMenu HidPushToTalkMenu;
typedef void (*PushToTalkMenuItemCallback)(void* context, uint32_t listIndex, FuriString* listLabel, uint32_t itemIndex, FuriString* itemLabel ); typedef void (*PushToTalkMenuItemCallback)(
void* context,
uint32_t listIndex,
FuriString* listLabel,
uint32_t itemIndex,
FuriString* itemLabel);
HidPushToTalkMenu* hid_ptt_menu_alloc(Hid* bt_hid); HidPushToTalkMenu* hid_ptt_menu_alloc(Hid* bt_hid);
@@ -21,7 +26,4 @@ void ptt_menu_add_item_to_list(
PushToTalkMenuItemCallback callback, PushToTalkMenuItemCallback callback,
void* callback_context); void* callback_context);
void ptt_menu_add_list( void ptt_menu_add_list(HidPushToTalkMenu* hid_ptt_menu, const char* label, uint32_t index);
HidPushToTalkMenu* hid_ptt_menu,
const char* label,
uint32_t index);