Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2024-11-23 21:13:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

some fixes

Browse source
This commit is contained in:
MX 2022-09-07 17:48:24 +03:00
parent 251b747b00
commit 4588f38ae9
No known key found for this signature in database
GPG key ID: 6C4C311DFD4B4AB5
4 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
applications/meta/application.fam
View file

@ -78,5 +78,6 @@ App(
"wifi_scanner",
"multi_converter",
"flipfrid",
"subbrute",
],
)

2
applications/subbrute/application.fam
View file

@ -6,5 +6,5 @@ App(
cdefines=["APP_SUB_BRUTE"],
requires=["gui","dialogs"],
stack_size=2 * 1024,
order=70,
order=11,
)

39
applications/subbrute/scene/subbrute_scene_run_attack.c
View file

@ -39,8 +39,7 @@ void subbrute_emit(SubBruteState* context) {
}
furi_hal_subghz_stop_async_tx();
furi_hal_subghz_sleep();
furi_hal_power_suppress_charge_exit();
furi_hal_subghz_idle();
}
void prepare_emit(SubBruteState* context) {
@ -58,22 +57,19 @@ void prepare_emit(SubBruteState* context) {
furi_hal_subghz_load_preset(str_to_preset(context->preset));
context->frequency = furi_hal_subghz_set_frequency_and_path(context->frequency);
furi_hal_power_suppress_charge_enter();
}
void clear_emit(SubBruteState* context) {
furi_hal_subghz_stop_async_tx();
furi_hal_subghz_sleep();
furi_hal_power_suppress_charge_exit();
if(context->attack == SubBruteAttackLoadFile) {
subghz_transmitter_free(context->transmitter);
}
subghz_transmitter_free(context->transmitter);
is_running = false;
}
/*
void subbrute_send_raw_packet(SubBruteState* context) {
string_reset(context->candidate);
@ -117,11 +113,9 @@ void subbrute_send_raw_packet(SubBruteState* context) {
string_get_cstr(context->preset),
string_get_cstr(context->candidate));
prepare_emit(context);
subbrute_emit(context);
clear_emit(context);
}
*/
void subbrute_send_packet_parsed(SubBruteState* context) {
if(context->attack == SubBruteAttackLoadFile) {
snprintf(subbrute_payload_byte, 4, "%02X ", (uint8_t)context->payload);
@ -157,17 +151,15 @@ void subbrute_send_packet_parsed(SubBruteState* context) {
string_get_cstr(context->candidate),
context->te);
prepare_emit(context);
subbrute_emit(context);
clear_emit(context);
}
void subbrute_send_packet(SubBruteState* context) {
if(string_cmp_str(context->protocol, "RAW") == 0) {
subbrute_send_raw_packet(context);
} else {
subbrute_send_packet_parsed(context);
}
///if(string_cmp_str(context->protocol, "RAW") == 0) {
// subbrute_send_raw_packet(context);
//} else {
subbrute_send_packet_parsed(context);
//}
string_clear(context->flipper_format_string);
}
@ -190,13 +182,14 @@ void subbrute_scene_run_attack_on_enter(SubBruteState* context) {
context->environment = subghz_environment_alloc();
context->transmitter =
subghz_transmitter_alloc_init(context->environment, string_get_cstr(context->protocol));
prepare_emit(context);
}
void subbrute_scene_run_attack_on_exit(SubBruteState* context) {
if(is_running) {
is_running = false;
clear_emit(context);
}
clear_emit(context);
}
void subbrute_scene_run_attack_on_tick(SubBruteState* context) {
@ -230,21 +223,22 @@ void subbrute_scene_run_attack_on_event(SubBruteEvent event, SubBruteState* cont
if(event.input_type == InputTypeShort) {
switch(event.key) {
case InputKeyDown:
case InputKeyUp:
break;
case InputKeyLeft:
if(!context->is_attacking && context->payload > 0x00) {
context->payload--;
subbrute_send_packet(context);
notification_message(context->notify, &sequence_blink_blue_10);
}
break;
case InputKeyUp:
case InputKeyRight:
if(!context->is_attacking && context->payload < max_value) {
context->payload++;
subbrute_send_packet(context);
notification_message(context->notify, &sequence_blink_blue_10);
}
break;
case InputKeyLeft:
case InputKeyRight:
case InputKeyOk:
if(!context->is_attacking) {
context->is_attacking = true;
@ -282,8 +276,9 @@ void subbrute_scene_run_attack_on_draw(Canvas* canvas, SubBruteState* context) {
canvas_set_font(canvas, FontPrimary);
canvas_draw_str_aligned(canvas, 64, 8, AlignCenter, AlignTop, "Fire in the hole!");
char msg_index[22];
snprintf(msg_index, sizeof(msg_index), "%04d / %04d", (int)context->payload, (int)max_value);
char msg_index[26];
snprintf(
msg_index, sizeof(msg_index), "< %04d / %04d >", (int)context->payload, (int)max_value);
canvas_draw_str_aligned(canvas, 64, 24, AlignCenter, AlignTop, msg_index);

14
applications/subbrute/subbrute.c
View file

@ -79,8 +79,11 @@ SubBruteState* subbrute_alloc() {
void subbrute_free(SubBruteState* subbrute) {
//Dialog
furi_record_close(RECORD_DIALOGS);
notification_message(subbrute->notify, &sequence_blink_stop);
furi_record_close(RECORD_NOTIFICATION);
string_clear(subbrute->preset);
string_clear(subbrute->candidate);
@ -91,6 +94,10 @@ void subbrute_free(SubBruteState* subbrute) {
string_clear(subbrute->candidate);
string_clear(subbrute->flipper_format_string);
flipper_format_free(subbrute->flipper_format);
subghz_environment_free(subbrute->environment);
subghz_receiver_free(subbrute->receiver);
// The rest
free(subbrute);
}
@ -109,9 +116,12 @@ int32_t subbrute_start(void* p) {
if(!init_mutex(&subbrute_state_mutex, subbrute_state, sizeof(SubBruteState))) {
FURI_LOG_E(TAG, "cannot create mutex\r\n");
furi_message_queue_free(event_queue);
free(subbrute_state);
subbrute_free(subbrute_state);
return 255;
}
furi_hal_power_suppress_charge_enter();
// Configure view port
FURI_LOG_I(TAG, "Initializing viewport");
ViewPort* view_port = view_port_alloc();
@ -220,6 +230,8 @@ int32_t subbrute_start(void* p) {
furi_timer_stop(timer);
furi_timer_free(timer);
furi_hal_power_suppress_charge_exit();
FURI_LOG_I(TAG, "Cleaning up");
gui_remove_view_port(gui, view_port);
view_port_free(view_port);