mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-07-29 02:08:10 -07:00
Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev --nobuild
This commit is contained in:
@@ -82,7 +82,7 @@ static void hid_mouse_jiggler_timer_callback(void* context) {
|
||||
model->counter++;
|
||||
hid_hal_mouse_move(
|
||||
hid_mouse_jiggler->hid,
|
||||
(model->counter % 2 == 0) ? MOUSE_MOVE_TINY : -MOUSE_MOVE_TINY,
|
||||
(model->counter % 2 == 0) ? MOUSE_MOVE_SHORT : -MOUSE_MOVE_SHORT,
|
||||
0);
|
||||
}
|
||||
},
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <gui/view.h>
|
||||
|
||||
#define MOUSE_MOVE_TINY 1
|
||||
#define MOUSE_MOVE_SHORT 5
|
||||
|
||||
typedef struct Hid Hid;
|
||||
typedef struct HidMouseJiggler HidMouseJiggler;
|
||||
|
||||
@@ -104,11 +104,7 @@ static void hid_ptt_trigger_camera_linux_zoom(HidPushToTalk* hid_ptt) {
|
||||
hid_hal_keyboard_press(hid_ptt->hid, KEY_MOD_LEFT_ALT | HID_KEYBOARD_V);
|
||||
hid_hal_keyboard_release(hid_ptt->hid, KEY_MOD_LEFT_ALT | HID_KEYBOARD_V);
|
||||
}
|
||||
static void hid_ptt_trigger_hand_macos_zoom(HidPushToTalk* hid_ptt) {
|
||||
hid_hal_keyboard_press(hid_ptt->hid, KEY_MOD_LEFT_GUI | HID_KEYBOARD_Y);
|
||||
hid_hal_keyboard_release(hid_ptt->hid, KEY_MOD_LEFT_GUI | HID_KEYBOARD_Y);
|
||||
}
|
||||
static void hid_ptt_trigger_hand_linux_zoom(HidPushToTalk* hid_ptt) {
|
||||
static void hid_ptt_trigger_hand_zoom(HidPushToTalk* hid_ptt) {
|
||||
hid_hal_keyboard_press(hid_ptt->hid, KEY_MOD_LEFT_ALT | HID_KEYBOARD_Y);
|
||||
hid_hal_keyboard_release(hid_ptt->hid, KEY_MOD_LEFT_ALT | HID_KEYBOARD_Y);
|
||||
}
|
||||
@@ -427,7 +423,7 @@ static void hid_ptt_menu_callback(
|
||||
case HidPushToTalkAppIndexZoom:
|
||||
model->callback_trigger_mute = hid_ptt_trigger_mute_macos_zoom;
|
||||
model->callback_trigger_camera = hid_ptt_trigger_camera_macos_zoom;
|
||||
model->callback_trigger_hand = hid_ptt_trigger_hand_macos_zoom;
|
||||
model->callback_trigger_hand = hid_ptt_trigger_hand_zoom;
|
||||
model->callback_start_ptt = hid_ptt_start_ptt_meet_zoom;
|
||||
model->callback_stop_ptt = hid_ptt_stop_ptt_meet_zoom;
|
||||
break;
|
||||
@@ -495,7 +491,7 @@ static void hid_ptt_menu_callback(
|
||||
case HidPushToTalkAppIndexZoom:
|
||||
model->callback_trigger_mute = hid_ptt_trigger_mute_linux_zoom;
|
||||
model->callback_trigger_camera = hid_ptt_trigger_camera_linux_zoom;
|
||||
model->callback_trigger_hand = hid_ptt_trigger_hand_linux_zoom;
|
||||
model->callback_trigger_hand = hid_ptt_trigger_hand_zoom;
|
||||
model->callback_start_ptt = hid_ptt_start_ptt_meet_zoom;
|
||||
model->callback_stop_ptt = hid_ptt_stop_ptt_meet_zoom;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user