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

Revert "Merge remote-tracking branch 'OFW/portasynthinca3/3332-autolock-fixes' into dev"

Browse source 
This reverts commit ba4c4e528a, reversing
changes made to 16e4b9219a.
This commit is contained in:
MX 2024-09-26 21:58:50 +03:00
parent b03d9f313b
commit e407c623e0
No known key found for this signature in database
GPG key ID: 7CCC66B7DBDD1C83
7 changed files with 4 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
applications/services/cli/cli_vcp.c
View file

@ -2,10 +2,6 @@
#include <furi_hal_usb_cdc.h>
#include <furi_hal.h>
#include <furi.h>
#include <gui/gui.h>
#include <gui/view_port.h>
#include <assets_icons.h>
#include <applications/services/desktop/desktop.h>
#define TAG "CliVcp"
@ -47,13 +43,6 @@ typedef struct {
FuriHalUsbInterface* usb_if_prev;
uint8_t data_buffer[USB_CDC_PKT_LEN];
// CLI icon
Gui* gui;
ViewPort* view_port;
// Autolocking inhibition
Desktop* desktop;
} CliVcp;
static int32_t vcp_worker(void* context);
@ -75,13 +64,6 @@ static CliVcp* vcp = NULL;
static const uint8_t ascii_soh = 0x01;
static const uint8_t ascii_eot = 0x04;
static void cli_vcp_icon_draw_callback(Canvas* canvas, void* context) {
furi_assert(canvas);
furi_assert(context);
const Icon* icon = context;
canvas_draw_icon(canvas, 0, 0, icon);
}
static void cli_vcp_init(void) {
if(vcp == NULL) {
vcp = malloc(sizeof(CliVcp));
@ -121,15 +103,6 @@ static int32_t vcp_worker(void* context) {
FURI_LOG_D(TAG, "Start");
vcp->running = true;
// GUI icon
vcp->desktop = furi_record_open(RECORD_DESKTOP);
const Icon* icon = &I_Console_active_8x8;
vcp->gui = furi_record_open(RECORD_GUI);
vcp->view_port = view_port_alloc();
view_port_set_width(vcp->view_port, icon_get_width(icon));
// casting const away. we know that we cast it right back in the callback
view_port_draw_callback_set(vcp->view_port, cli_vcp_icon_draw_callback, (void*)icon);
while(1) {
uint32_t flags =
furi_thread_flags_wait(VCP_THREAD_FLAG_ALL, FuriFlagWaitAny, FuriWaitForever);
@ -142,8 +115,6 @@ static int32_t vcp_worker(void* context) {
if(vcp->connected == false) {
vcp->connected = true;
furi_stream_buffer_send(vcp->rx_stream, &ascii_soh, 1, FuriWaitForever);
gui_add_view_port(vcp->gui, vcp->view_port, GuiLayerStatusBarLeft);
desktop_api_add_external_inhibitor(vcp->desktop);
}
}
@ -155,8 +126,6 @@ static int32_t vcp_worker(void* context) {
vcp->connected = false;
furi_stream_buffer_receive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0);
furi_stream_buffer_send(vcp->rx_stream, &ascii_eot, 1, FuriWaitForever);
gui_remove_view_port(vcp->gui, vcp->view_port);
desktop_api_remove_external_inhibitor(vcp->desktop);
}
}
@ -221,10 +190,6 @@ static int32_t vcp_worker(void* context) {
}
if(flags & VcpEvtStop) {
if(vcp->connected) {
gui_remove_view_port(vcp->gui, vcp->view_port);
desktop_api_remove_external_inhibitor(vcp->desktop);
}
vcp->connected = false;
vcp->running = false;
furi_hal_cdc_set_callbacks(VCP_IF_NUM, NULL, NULL);
@ -238,11 +203,6 @@ static int32_t vcp_worker(void* context) {
break;
}
}
view_port_free(vcp->view_port);
furi_record_close(RECORD_DESKTOP);
furi_record_close(RECORD_GUI);
FURI_LOG_D(TAG, "End");
return 0;
}

45
applications/services/desktop/desktop.c
View file

@ -19,8 +19,6 @@ static void desktop_auto_lock_arm(Desktop*);
static void desktop_auto_lock_inhibit(Desktop*);
static void desktop_start_auto_lock_timer(Desktop*);
static void desktop_apply_settings(Desktop*);
static void desktop_auto_lock_add_inhibitor(Desktop* desktop);
static void desktop_auto_lock_remove_inhibitor(Desktop* desktop);
static void desktop_loader_callback(const void* message, void* context) {
furi_assert(context);
@ -132,22 +130,16 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
animation_manager_unload_and_stall_animation(desktop->animation_manager);
}
desktop_auto_lock_add_inhibitor(desktop);
desktop_auto_lock_inhibit(desktop);
desktop->app_running = true;
furi_semaphore_release(desktop->animation_semaphore);
} else if(event == DesktopGlobalAfterAppFinished) {
animation_manager_load_and_continue_animation(desktop->animation_manager);
desktop_auto_lock_remove_inhibitor(desktop);
desktop_auto_lock_arm(desktop);
desktop->app_running = false;
} else if(event == DesktopGlobalAddExternalInhibitor) {
desktop_auto_lock_add_inhibitor(desktop);
} else if(event == DesktopGlobalRemoveExternalInhibitor) {
desktop_auto_lock_remove_inhibitor(desktop);
} else if(event == DesktopGlobalAutoLock) {
if(!desktop->app_running && !desktop->locked) {
desktop_lock(desktop);
@ -213,24 +205,6 @@ static void desktop_auto_lock_arm(Desktop* desktop) {
}
}
static void desktop_auto_lock_add_inhibitor(Desktop* desktop) {
furi_check(furi_semaphore_release(desktop->auto_lock_inhibitors) == FuriStatusOk);
FURI_LOG_D(
TAG,
"%lu autolock inhibitors (+1)",
furi_semaphore_get_count(desktop->auto_lock_inhibitors));
desktop_auto_lock_inhibit(desktop);
}
static void desktop_auto_lock_remove_inhibitor(Desktop* desktop) {
furi_check(furi_semaphore_acquire(desktop->auto_lock_inhibitors, 0) == FuriStatusOk);
uint32_t inhibitors = furi_semaphore_get_count(desktop->auto_lock_inhibitors);
FURI_LOG_D(TAG, "%lu autolock inhibitors (-1)", inhibitors);
if(inhibitors == 0) {
desktop_auto_lock_arm(desktop);
}
}
static void desktop_auto_lock_inhibit(Desktop* desktop) {
desktop_stop_auto_lock_timer(desktop);
if(desktop->input_events_subscription) {
@ -397,7 +371,6 @@ static Desktop* desktop_alloc(void) {
desktop->notification = furi_record_open(RECORD_NOTIFICATION);
desktop->input_events_pubsub = furi_record_open(RECORD_INPUT_EVENTS);
desktop->auto_lock_inhibitors = furi_semaphore_alloc(UINT32_MAX, 0);
desktop->auto_lock_timer =
furi_timer_alloc(desktop_auto_lock_timer_callback, FuriTimerTypeOnce, desktop);
@ -530,18 +503,6 @@ void desktop_api_set_settings(Desktop* instance, const DesktopSettings* settings
view_dispatcher_send_custom_event(instance->view_dispatcher, DesktopGlobalSaveSettings);
}
void desktop_api_add_external_inhibitor(Desktop* instance) {
furi_assert(instance);
view_dispatcher_send_custom_event(
instance->view_dispatcher, DesktopGlobalAddExternalInhibitor);
}
void desktop_api_remove_external_inhibitor(Desktop* instance) {
furi_assert(instance);
view_dispatcher_send_custom_event(
instance->view_dispatcher, DesktopGlobalRemoveExternalInhibitor);
}
/*
* Application thread
*/
@ -562,7 +523,7 @@ int32_t desktop_srv(void* p) {
scene_manager_next_scene(desktop->scene_manager, DesktopSceneMain);
if(desktop_pin_code_is_set()) {
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagLock)) {
desktop_lock(desktop);
}

14
applications/services/desktop/desktop.h
View file

@ -21,17 +21,3 @@ FuriPubSub* desktop_api_get_status_pubsub(Desktop* instance);
void desktop_api_get_settings(Desktop* instance, DesktopSettings* settings);
void desktop_api_set_settings(Desktop* instance, const DesktopSettings* settings);
/**
* @brief Adds 1 to the count of active external autolock inhibitors
*
* Autolocking will not get triggered while there's at least 1 inhibitor
*/
void desktop_api_add_external_inhibitor(Desktop* instance);
/**
* @brief Removes 1 from the count of active external autolock inhibitors
*
* Autolocking will not get triggered while there's at least 1 inhibitor
*/
void desktop_api_remove_external_inhibitor(Desktop* instance);

1
applications/services/desktop/desktop_i.h
View file

@ -73,7 +73,6 @@ struct Desktop {
FuriPubSub* input_events_pubsub;
FuriPubSubSubscription* input_events_subscription;
FuriSemaphore* auto_lock_inhibitors;
FuriTimer* auto_lock_timer;
FuriTimer* update_clock_timer;

2
applications/services/desktop/views/desktop_events.h
View file

@ -62,6 +62,4 @@ typedef enum {
DesktopGlobalApiUnlock,
DesktopGlobalSaveSettings,
DesktopGlobalReloadSettings,
DesktopGlobalAddExternalInhibitor,
DesktopGlobalRemoveExternalInhibitor,
} DesktopEvent;

BIN
assets/icons/StatusBar/Console_active_8x8.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 75 B

4
scripts/serial_cli.py
View file

@ -13,9 +13,7 @@ def main():
parser.add_argument("-p", "--port", help="CDC Port", default="auto")
args = parser.parse_args()
if not (port := resolve_port(logger, args.port)):
logger.error(
"Is Flipper connected via USB, currently unlocked and not in DFU mode?"
)
logger.error("Is Flipper connected via USB and not in DFU mode?")
return 1
subprocess.call(
[