Skip to content

Commit

Permalink
Squashed 'applications/external/' changes from 9f74b3362f..caf103e898
Browse files Browse the repository at this point in the history
caf103e898 BleSpam: FIx hang on hold ok while running attack
6da945bac1 Revert "Removed lovespouse"
3f586b7b29 Merge pull request #3 from AbeNaws/dev
8a911b7ceb Remove orgasmotron
e4bbe9975a Merge branch 'Next-Flip:dev' into dev
0adca2879b Removed lovespouse

git-subtree-dir: applications/external
git-subtree-split: caf103e89808a682d24b38d5b0b764d62df76cd5
  • Loading branch information
RogueMaster committed Mar 2, 2024
1 parent 7870996 commit fa170b8
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 176 deletions.
5 changes: 3 additions & 2 deletions ble_spam/ble_spam.c
Original file line number Diff line number Diff line change
Expand Up @@ -479,8 +479,7 @@ static bool input_callback(InputEvent* input, void* _ctx) {

if(state->ctx.lock_keyboard) {
consumed = true;
with_view_model(
state->main_view, State * *model, { (*model)->lock_warning = true; }, true);
state->lock_warning = true;
if(state->lock_count == 0) {
furi_timer_start(state->lock_timer, 1000);
}
Expand All @@ -506,7 +505,9 @@ static bool input_callback(InputEvent* input, void* _ctx) {
if(advertising) toggle_adv(state);
state->ctx.attack = &attacks[state->index];
scene_manager_set_scene_state(state->ctx.scene_manager, SceneConfig, 0);
view_commit_model(view, consumed);
scene_manager_next_scene(state->ctx.scene_manager, SceneConfig);
return consumed;
} else if(input->type == InputTypeShort) {
toggle_adv(state);
}
Expand Down
11 changes: 0 additions & 11 deletions orgasmotron/application.fam

This file was deleted.

163 changes: 0 additions & 163 deletions orgasmotron/orgasmotron.c

This file was deleted.

Binary file removed orgasmotron/orgasmotron_10px.png
Binary file not shown.

0 comments on commit fa170b8

Please sign in to comment.