DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-12-19 11:21:39 +03:00
Code Issues Projects Releases Wiki Activity

Fix GUI issues

Browse Source 
Fix secplus v1 text too
This commit is contained in:
MX 2023-02-03 15:39:02 +03:00
parent 5458157924
commit bfbcce030c
No known key found for this signature in database
GPG Key ID: 7CCC66B7DBDD1C83
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
applications/main/subghz/views/subghz_read_raw.c
View File

@ -282,7 +282,24 @@ void subghz_read_raw_draw(Canvas* canvas, SubGhzReadRAWModel* model) {
canvas_set_font(canvas, FontSecondary); canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 0, 7, furi_string_get_cstr(model->frequency_str)); canvas_draw_str(canvas, 0, 7, furi_string_get_cstr(model->frequency_str));
canvas_draw_str(canvas, 35, 7, furi_string_get_cstr(model->preset_str)); canvas_draw_str(canvas, 35, 7, furi_string_get_cstr(model->preset_str));
canvas_draw_str(canvas, 70, 7, furi_hal_subghz_get_radio_type() ? "E" : "I");
switch(model->status) {
case SubGhzReadRAWStatusIDLE:
canvas_draw_str(canvas, 70, 7, furi_hal_subghz_get_radio_type() ? "E" : "I");
break;
case SubGhzReadRAWStatusLoadKeyIDLE:
case SubGhzReadRAWStatusTX:
case SubGhzReadRAWStatusTXRepeat:
case SubGhzReadRAWStatusLoadKeyTX:
case SubGhzReadRAWStatusLoadKeyTXRepeat:
case SubGhzReadRAWStatusStart:
canvas_draw_str(canvas, 77, 7, furi_hal_subghz_get_radio_type() ? "R: Ext" : "R: Int");
break;
default:
canvas_draw_str(canvas, 70, 7, furi_hal_subghz_get_radio_type() ? "E" : "I");
break;
}
canvas_draw_str_aligned( canvas_draw_str_aligned(
canvas, 126, 0, AlignRight, AlignTop, furi_string_get_cstr(model->sample_write)); canvas, 126, 0, AlignRight, AlignTop, furi_string_get_cstr(model->sample_write));

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

@ -85,10 +85,13 @@ void subghz_view_transmitter_draw(Canvas* canvas, SubGhzViewTransmitterModel* mo
canvas_set_color(canvas, ColorBlack); canvas_set_color(canvas, ColorBlack);
canvas_set_font(canvas, FontSecondary); canvas_set_font(canvas, FontSecondary);
elements_multiline_text(canvas, 0, 7, furi_string_get_cstr(model->key_str)); elements_multiline_text(canvas, 0, 7, furi_string_get_cstr(model->key_str));
canvas_draw_str(canvas, 72, 7, furi_string_get_cstr(model->frequency_str)); canvas_draw_str(canvas, 78, 7, furi_string_get_cstr(model->frequency_str));
canvas_draw_str(canvas, 107, 7, furi_string_get_cstr(model->preset_str)); canvas_draw_str(canvas, 113, 7, furi_string_get_cstr(model->preset_str));
canvas_draw_str(canvas, 123, 7, furi_hal_subghz_get_radio_type() ? "E" : "I");
if(model->show_button) subghz_view_transmitter_button_right(canvas, "Send"); if(model->show_button) {
canvas_draw_str(canvas, 58, 62, furi_hal_subghz_get_radio_type() ? "R: Ext" : "R: Int");
subghz_view_transmitter_button_right(canvas, "Send");
}
} }
bool subghz_view_transmitter_input(InputEvent* event, void* context) { bool subghz_view_transmitter_input(InputEvent* event, void* context) {

4
lib/subghz/protocols/secplus_v1.c
View File

@ -606,7 +606,7 @@ void subghz_protocol_decoder_secplus_v1_get_string(void* context, FuriString* ou
furi_string_cat_printf( furi_string_cat_printf(
output, output,
"Sn:0x%08lX\r\n" "Sn:0x%08lX\r\n"
"Cnt:0x%03lX\r\n" "Cnt:0x%03lX "
"Sw_id:0x%X\r\n", "Sw_id:0x%X\r\n",
instance->generic.serial, instance->generic.serial,
instance->generic.cnt, instance->generic.cnt,
@ -625,7 +625,7 @@ void subghz_protocol_decoder_secplus_v1_get_string(void* context, FuriString* ou
furi_string_cat_printf( furi_string_cat_printf(
output, output,
"Sn:0x%08lX\r\n" "Sn:0x%08lX\r\n"
"Cnt:0x%03lX\r\n" "Cnt:0x%03lX "
"Sw_id:0x%X\r\n", "Sw_id:0x%X\r\n",
instance->generic.serial, instance->generic.serial,
instance->generic.cnt, instance->generic.cnt,