Skip to content

Commit

Permalink
Merge branch 'dev' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
xMasterX committed May 5, 2023
2 parents 4b74d13 + 1feb876 commit d953d35
Show file tree
Hide file tree
Showing 141 changed files with 1,786 additions and 1,072 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
*.swp
*.swo
*.gdb_history
*.old


# LSP
Expand Down
25 changes: 15 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
### New changes
* NFC: Temp fix for Detect reader not collecting nonces
* Desktop: Temp fix for old backlight bug when locking by holding up arrow
* IR: Add Sharp and Vizio to Universal TV remote
* BLE Info: Show version instead of branch
* Plugins: Add new game - Bomberduck (by @leo-need-more-coffee | PR #450)
* Plugins: Fix `SWD Probe` plugin GPIO pins state reset on exit
* Plugins: Bluetooth Remote - new UI (by @krolchonok | PR #447)
* Plugins: Update **TOTP (Authenticator)** [(by akopachov)](https://github.com/akopachov/flipper-zero_authenticator)
* Docs: Update HowToInstall (by @krolchonok | PR #443)
* OFW PR 2627: Add HID mouse auto-clicker (by @rwl4)
* If you have copied any apps manually into `apps` folder - remove `apps` folder or that specific apps you copied on your microSD before installing this release to avoid issues!
* Plugins: RFID and iButton Fuzzer remove excessive free's (thanks @Willy-JL)
* Plugins: Use COUNT_OF in mouse jiggler
* Plugins: Added Numpad keyboard to HID app (by @clipboard1 | PR #452)
* About: Don't show 00 on about screens
* SubGHz: Combine FuriString allocs and other small changes
* Infrared: Updated universal remote assets (by @amec0e | PR #454)
* Update slideshow: Replace QR code with good old link
* OFW: Various Furi/FuriHal bug fixes and improvements -> **Breaking API change, api was changed from 24.x to 26.x**
* OFW: Loader refactoring, part 1 -> **Breaking API change, api was changed from 23.x to 24.x** **(this will make your manually copied plugins not work, update them in same way you installed them, or delete `apps` folder and then install firmware, if you using extra pack builds (with `e` in version) all apps in _Extra will be updated automatically)**
* OFW: Dolphin builder in ufbt; minor ufbt/fbt improvements
* OFW: Added API version to device info
* OFW: Gui: relax some asserts in view
* OFW: Move gauge calibration to separate header, add f18 calibration
* OFW: Fix TERMINFO on Linux systems

#### [🎲 Download latest extra apps pack](https://github.com/xMasterX/all-the-plugins/archive/refs/heads/main.zip)

Expand Down
3 changes: 0 additions & 3 deletions applications/external/flipfrid/flipfrid.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,6 @@ void flipfrid_free(FlipFridState* flipfrid) {
furi_string_free(flipfrid->main_menu_proto_items[i]);
}

free(flipfrid->data);
free(flipfrid->payload);

// The rest
free(flipfrid);
}
Expand Down
15 changes: 15 additions & 0 deletions applications/external/hid_app/hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ enum HidDebugSubmenuIndex {
HidSubmenuIndexKeynote,
HidSubmenuIndexKeynoteVertical,
HidSubmenuIndexKeyboard,
HidSubmenuIndexNumpad,
HidSubmenuIndexMedia,
HidSubmenuIndexTikTok,
HidSubmenuIndexYTShorts,
Expand All @@ -29,6 +30,9 @@ static void hid_submenu_callback(void* context, uint32_t index) {
} else if(index == HidSubmenuIndexKeyboard) {
app->view_id = HidViewKeyboard;
view_dispatcher_switch_to_view(app->view_dispatcher, HidViewKeyboard);
} else if(index == HidSubmenuIndexNumpad) {
app->view_id = HidViewNumpad;
view_dispatcher_switch_to_view(app->view_dispatcher, HidViewNumpad);
} else if(index == HidSubmenuIndexMedia) {
app->view_id = HidViewMedia;
view_dispatcher_switch_to_view(app->view_dispatcher, HidViewMedia);
Expand Down Expand Up @@ -64,6 +68,7 @@ static void bt_hid_connection_status_changed_callback(BtStatus status, void* con
hid_keynote_set_connected_status(hid->hid_keynote, connected);
hid_keynote_vertical_set_connected_status(hid->hid_keynote_vertical, connected);
hid_keyboard_set_connected_status(hid->hid_keyboard, connected);
hid_numpad_set_connected_status(hid->hid_numpad, connected);
hid_media_set_connected_status(hid->hid_media, connected);
hid_mouse_set_connected_status(hid->hid_mouse, connected);
hid_mouse_clicker_set_connected_status(hid->hid_mouse_clicker, connected);
Expand Down Expand Up @@ -123,6 +128,8 @@ Hid* hid_alloc(HidTransport transport) {
app);
submenu_add_item(
app->device_type_submenu, "Keyboard", HidSubmenuIndexKeyboard, hid_submenu_callback, app);
submenu_add_item(
app->device_type_submenu, "Numpad", HidSubmenuIndexNumpad, hid_submenu_callback, app);
submenu_add_item(
app->device_type_submenu, "Media", HidSubmenuIndexMedia, hid_submenu_callback, app);
submenu_add_item(
Expand Down Expand Up @@ -196,6 +203,12 @@ Hid* hid_app_alloc_view(void* context) {
view_dispatcher_add_view(
app->view_dispatcher, HidViewKeyboard, hid_keyboard_get_view(app->hid_keyboard));

//Numpad keyboard view
app->hid_numpad = hid_numpad_alloc(app);
view_set_previous_callback(hid_numpad_get_view(app->hid_numpad), hid_exit_confirm_view);
view_dispatcher_add_view(
app->view_dispatcher, HidViewNumpad, hid_numpad_get_view(app->hid_numpad));

// Media view
app->hid_media = hid_media_alloc(app);
view_set_previous_callback(hid_media_get_view(app->hid_media), hid_exit_confirm_view);
Expand Down Expand Up @@ -259,6 +272,8 @@ void hid_free(Hid* app) {
hid_keynote_vertical_free(app->hid_keynote_vertical);
view_dispatcher_remove_view(app->view_dispatcher, HidViewKeyboard);
hid_keyboard_free(app->hid_keyboard);
view_dispatcher_remove_view(app->view_dispatcher, HidViewNumpad);
hid_numpad_free(app->hid_numpad);
view_dispatcher_remove_view(app->view_dispatcher, HidViewMedia);
hid_media_free(app->hid_media);
view_dispatcher_remove_view(app->view_dispatcher, HidViewMouse);
Expand Down
2 changes: 2 additions & 0 deletions applications/external/hid_app/hid.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "views/hid_keynote.h"
#include "views/hid_keynote_vertical.h"
#include "views/hid_keyboard.h"
#include "views/hid_numpad.h"
#include "views/hid_media.h"
#include "views/hid_mouse.h"
#include "views/hid_mouse_jiggler.h"
Expand All @@ -45,6 +46,7 @@ struct Hid {
HidKeynote* hid_keynote;
HidKeynoteVertical* hid_keynote_vertical;
HidKeyboard* hid_keyboard;
HidNumpad* hid_numpad;
HidMedia* hid_media;
HidMouse* hid_mouse;
HidMouseClicker* hid_mouse_clicker;
Expand Down
1 change: 1 addition & 0 deletions applications/external/hid_app/views.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ typedef enum {
HidViewKeynote,
HidViewKeynoteVertical,
HidViewKeyboard,
HidViewNumpad,
HidViewMedia,
HidViewMouse,
HidViewMouseClicker,
Expand Down
2 changes: 1 addition & 1 deletion applications/external/hid_app/views/hid_mouse_clicker.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ static bool hid_mouse_clicker_input_callback(InputEvent* event, void* context) {
bool consumed = false;
bool rate_changed = false;

if(event->type != InputTypeRelease) {
if(event->type != InputTypeShort && event->type != InputTypeRepeat) {
return false;
}

Expand Down
6 changes: 2 additions & 4 deletions applications/external/hid_app/views/hid_mouse_jiggler.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

#define TAG "HidMouseJiggler"

#define LENGTH(x) (int)(sizeof(x) / sizeof((x)[0]))

struct HidMouseJiggler {
View* view;
Hid* hid;
Expand Down Expand Up @@ -44,7 +42,7 @@ static void hid_mouse_jiggler_draw_callback(Canvas* canvas, void* context) {
elements_multiline_text(canvas, AlignLeft, 26, "Interval (ms):");
canvas_set_font(canvas, FontSecondary);
if(model->interval_idx != 0) canvas_draw_icon(canvas, 74, 19, &I_ButtonLeft_4x7);
if(model->interval_idx != LENGTH(intervals) - 1)
if(model->interval_idx != (int)COUNT_OF(intervals) - 1)
canvas_draw_icon(canvas, 80, 19, &I_ButtonRight_4x7);
FuriString* interval_str = furi_string_alloc_printf("%d", intervals[model->interval_idx]);
elements_multiline_text(canvas, 91, 26, furi_string_get_cstr(interval_str));
Expand Down Expand Up @@ -116,7 +114,7 @@ static bool hid_mouse_jiggler_input_callback(InputEvent* event, void* context) {
consumed = true;
}
if(event->type == InputTypePress && event->key == InputKeyRight && !model->running &&
model->interval_idx < LENGTH(intervals) - 1) {
model->interval_idx < (int)COUNT_OF(intervals) - 1) {
model->interval_idx++;
consumed = true;
}
Expand Down
Loading

0 comments on commit d953d35

Please sign in to comment.