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

fix nfc list crash, fix magellen gui, fix transmitter gui

Browse Source
This commit is contained in:
MX
2022-09-20 23:13:15 +03:00
parent b2589698ff
commit 96ad7f3cef
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/main/nfc/scenes/nfc_scene_mf_classic_keys_list.c
View File

@@ -17,10 +17,13 @@ void nfc_scene_mf_classic_keys_list_on_enter(void* context) {
if(dict) { if(dict) {
mf_classic_dict_rewind(dict); mf_classic_dict_rewind(dict);
while(mf_classic_dict_get_next_key_str(dict, temp_key)) { while(mf_classic_dict_get_next_key_str(dict, temp_key)) {
if(index > 200) {
break;
}
char* current_key = (char*)malloc(sizeof(char) * 13); char* current_key = (char*)malloc(sizeof(char) * 13);
strncpy(current_key, string_get_cstr(temp_key), 12); strncpy(current_key, string_get_cstr(temp_key), 12);
MfClassicUserKeys_push_back(nfc->mfc_key_strs, current_key); MfClassicUserKeys_push_back(nfc->mfc_key_strs, current_key);
FURI_LOG_D("ListKeys", "Key %d: %s", index, current_key); FURI_LOG_T("ListKeys", "Key %d: %s", index, current_key);
submenu_add_item( submenu_add_item(
submenu, submenu,
current_key, current_key,

7
applications/main/subghz/views/transmitter.c
View File

@@ -45,7 +45,7 @@ void subghz_view_transmitter_add_data_to_show(
} }
static void subghz_view_transmitter_button_right(Canvas* canvas, const char* str) { static void subghz_view_transmitter_button_right(Canvas* canvas, const char* str) {
const uint8_t button_height = 13; const uint8_t button_height = 12;
const uint8_t vertical_offset = 3; const uint8_t vertical_offset = 3;
const uint8_t horizontal_offset = 1; const uint8_t horizontal_offset = 1;
const uint8_t string_width = canvas_string_width(canvas, str); const uint8_t string_width = canvas_string_width(canvas, str);
@@ -69,7 +69,10 @@ static void subghz_view_transmitter_button_right(Canvas* canvas, const char* str
canvas_invert_color(canvas); canvas_invert_color(canvas);
canvas_draw_icon( canvas_draw_icon(
canvas, x + horizontal_offset, y - button_height + vertical_offset, &I_ButtonCenter_7x7); canvas,
x + horizontal_offset,
y - button_height + vertical_offset - 1,
&I_ButtonCenter_7x7);
canvas_draw_str( canvas_draw_str(
canvas, x + horizontal_offset + icon_width_with_offset, y - vertical_offset, str); canvas, x + horizontal_offset + icon_width_with_offset, y - vertical_offset, str);
canvas_invert_color(canvas); canvas_invert_color(canvas);

2
lib/subghz/protocols/magellen.c
View File

@@ -381,7 +381,7 @@ static void subghz_protocol_magellen_get_event_serialize(uint8_t event, string_t
"%s%s%s%s%s%s%s%s", "%s%s%s%s%s%s%s%s",
((event >> 4) & 0x1 ? (event & 0x1 ? " Open" : " Close") : ((event >> 4) & 0x1 ? (event & 0x1 ? " Open" : " Close") :
(event & 0x1 ? " Motion" : " Ok")), (event & 0x1 ? " Motion" : " Ok")),
((event >> 1) & 0x1 ? ", Tamper On (Alarm)" : ""), ((event >> 1) & 0x1 ? ", Tamper On\n(Alarm)" : ""),
((event >> 2) & 0x1 ? ", ?" : ""), ((event >> 2) & 0x1 ? ", ?" : ""),
((event >> 3) & 0x1 ? ", Power On" : ""), ((event >> 3) & 0x1 ? ", Power On" : ""),
((event >> 4) & 0x1 ? ", MT:Wireless_Reed" : ""), ((event >> 4) & 0x1 ? ", MT:Wireless_Reed" : ""),