liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-300] Launch applications from CLI (#380)

Browse Source 
* app_loader: release console after cli start app cmd
* furi: add thread state getter
* app_loader: check thread started before launch with cli
* app_loader: remove view port from app loader
* blink: rework blink plugin to manage view and free resources
* vibro: rework vibro plugin to manage view and free resources
* music_player: rework app to manage exit and free resources
* input_dump: rework app to manage exit and free resources
* coreglitch_demo: add app exit and free resources
* floopper-bloopper: update submodule
* app-loader: remove applications context
* rules.mk: add submodule sync
* gui-test: add exit from application
* applications: exit on back short instead of press event
This commit is contained in:
gornekich
2021-03-18 10:58:16 +03:00
committed by GitHub
parent ca9862ef6c
commit 5eba573f43
13 changed files with 311 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
applications/examples/blink.c
View File

@@ -1,30 +1,96 @@
#include <furi.h>
#include <api-hal.h>
#include <gui/gui.h>
#include <input/input.h>
typedef enum {
EventTypeTick,
EventTypeKey,
} EventType;
typedef struct {
EventType type;
InputEvent input;
} BlinkEvent;
void rgb_set(bool r, bool g, bool b) {
api_hal_light_set(LightRed, r ? 0xFF : 0x00);
api_hal_light_set(LightGreen, g ? 0xFF : 0x00);
api_hal_light_set(LightBlue, b ? 0xFF : 0x00);
}
void blink_update(void* ctx) {
furi_assert(ctx);
osMessageQueueId_t event_queue = ctx;
BlinkEvent event = {.type = EventTypeTick};
osMessageQueuePut(event_queue, &event, 0, 0);
}
void blink_draw_callback(Canvas* canvas, void* ctx) {
canvas_clear(canvas);
canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 2, 10, "Blink application");
}
void blink_input_callback(InputEvent* input_event, void* ctx) {
furi_assert(ctx);
osMessageQueueId_t event_queue = ctx;
BlinkEvent event = {.type = EventTypeKey, .input = *input_event};
osMessageQueuePut(event_queue, &event, 0, 0);
}
int32_t application_blink(void* p) {
osMessageQueueId_t event_queue = osMessageQueueNew(8, sizeof(BlinkEvent), NULL);
// Configure view port
ViewPort* view_port = view_port_alloc();
furi_check(view_port);
view_port_draw_callback_set(view_port, blink_draw_callback, NULL);
view_port_input_callback_set(view_port, blink_input_callback, event_queue);
osTimerId_t timer = osTimerNew(blink_update, osTimerPeriodic, event_queue, NULL);
osTimerStart(timer, 500);
// Register view port in GUI
Gui* gui = furi_record_open("gui");
gui_add_view_port(gui, view_port, GuiLayerFullscreen);
bool blink_color[][3] = {
{1, 0, 0},
{0, 1, 0},
{0, 0, 1},
{1, 1, 0},
{0, 1, 1},
{1, 0, 1},
{1, 1, 1},
{0, 0, 0},
};
uint8_t state = 0;
BlinkEvent event;
while(1) {
rgb_set(1, 0, 0);
delay(500);
rgb_set(0, 1, 0);
delay(500);
rgb_set(0, 0, 1);
delay(500);
rgb_set(1, 1, 0);
delay(500);
rgb_set(0, 1, 1);
delay(500);
rgb_set(1, 0, 1);
delay(500);
rgb_set(1, 1, 1);
delay(500);
rgb_set(0, 0, 0);
delay(500);
furi_check(osMessageQueueGet(event_queue, &event, NULL, osWaitForever) == osOK);
if(event.type == EventTypeKey) {
if((event.input.type == InputTypeShort) && (event.input.key == InputKeyBack)) {
rgb_set(0, 0, 0);
view_port_enabled_set(view_port, false);
gui_remove_view_port(gui, view_port);
view_port_free(view_port);
osMessageQueueDelete(event_queue);
osTimerDelete(timer);
return 0;
}
} else {
if(state < sizeof(blink_color) / sizeof(blink_color[0])) {
state++;
} else {
state = 0;
}
rgb_set(blink_color[state][0], blink_color[state][1], blink_color[state][2]);
}
}
return 0;

53
applications/examples/input_dump.c
View File

@@ -1,28 +1,57 @@
#include <furi.h>
#include <api-hal.h>
#include <stdio.h>
#include <gui/gui.h>
#include <input/input.h>
typedef union {
unsigned int packed;
InputType state;
} InputDump;
typedef struct {
InputEvent input;
} InputDumpEvent;
static void event_cb(const void* value, void* ctx) {
const InputEvent* event = value;
void input_dump_draw_callback(Canvas* canvas, void* ctx) {
canvas_clear(canvas);
canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 2, 10, "Input dump application");
canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 2, 22, "Press long back to exit");
}
printf("event: %02x %s\r\n", event->key, event->type ? "pressed" : "released");
void input_dump_input_callback(InputEvent* input_event, void* ctx) {
furi_assert(ctx);
osMessageQueueId_t event_queue = ctx;
InputDumpEvent event = {.input = *input_event};
osMessageQueuePut(event_queue, &event, 0, 0);
}
int32_t application_input_dump(void* p) {
// open record
PubSub* event_record = furi_record_open("input_events");
subscribe_pubsub(event_record, event_cb, NULL);
osMessageQueueId_t event_queue = osMessageQueueNew(8, sizeof(InputDumpEvent), NULL);
// Configure view port
ViewPort* view_port = view_port_alloc();
furi_check(view_port);
view_port_draw_callback_set(view_port, input_dump_draw_callback, NULL);
view_port_input_callback_set(view_port, input_dump_input_callback, event_queue);
// Register view port in GUI
Gui* gui = furi_record_open("gui");
gui_add_view_port(gui, view_port, GuiLayerFullscreen);
printf("Example app [input dump]\r\n");
InputDumpEvent event;
for(;;) {
delay(100);
while(1) {
furi_check(osMessageQueueGet(event_queue, &event, NULL, osWaitForever) == osOK);
if(event.input.type == InputTypeLong && event.input.key == InputKeyBack) {
view_port_enabled_set(view_port, false);
gui_remove_view_port(gui, view_port);
view_port_free(view_port);
osMessageQueueDelete(event_queue);
return 0;
} else if(event.input.type == InputTypePress || event.input.type == InputTypeRelease) {
printf(
"event: %02x %s\r\n", event.input.key, event.input.type ? "pressed" : "released");
}
}
return 0;

72
applications/examples/vibro.c
View File

@@ -1,40 +1,70 @@
#include <furi.h>
#include <api-hal.h>
#include <gui/gui.h>
#include <input/input.h>
typedef struct {
GpioPin* vibro;
} Ctx;
InputEvent input;
} VibroEvent;
static void button_handler(const void* value, void* _ctx) {
const InputEvent* event = value;
Ctx* ctx = (Ctx*)_ctx;
void vibro_draw_callback(Canvas* canvas, void* ctx) {
canvas_clear(canvas);
canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 2, 10, "Vibro application");
canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 2, 22, "Press OK turns on vibro");
canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 2, 34, "Release OK turns off vibro");
}
if(event->key != InputKeyOk) return;
void vibro_input_callback(InputEvent* input_event, void* ctx) {
furi_assert(ctx);
osMessageQueueId_t event_queue = ctx;
if(event->type == InputTypePress) {
api_hal_light_set(LightGreen, 0xFF);
gpio_write(ctx->vibro, true);
} else if(event->type == InputTypeRelease) {
api_hal_light_set(LightGreen, 0x00);
gpio_write(ctx->vibro, false);
}
VibroEvent event = {.input = *input_event};
osMessageQueuePut(event_queue, &event, 0, 0);
}
int32_t application_vibro(void* p) {
Ctx ctx = {.vibro = (GpioPin*)&vibro_gpio};
GpioPin* gpio = (GpioPin*)&vibro_gpio;
osMessageQueueId_t event_queue = osMessageQueueNew(8, sizeof(VibroEvent), NULL);
gpio_init(ctx.vibro, GpioModeOutputPushPull);
gpio_write(ctx.vibro, false);
// Configure view port
ViewPort* view_port = view_port_alloc();
furi_check(view_port);
view_port_draw_callback_set(view_port, vibro_draw_callback, NULL);
view_port_input_callback_set(view_port, vibro_input_callback, event_queue);
// subscribe on buttons
PubSub* event_record = furi_record_open("input_events");
furi_check(event_record);
subscribe_pubsub(event_record, button_handler, &ctx);
// Register view port in GUI
Gui* gui = furi_record_open("gui");
gui_add_view_port(gui, view_port, GuiLayerFullscreen);
gpio_init(gpio, GpioModeOutputPushPull);
gpio_write(gpio, false);
VibroEvent event;
while(1) {
osDelay(osWaitForever);
furi_check(osMessageQueueGet(event_queue, &event, NULL, osWaitForever) == osOK);
if(event.input.type == InputTypeShort && event.input.key == InputKeyBack) {
gpio_write(gpio, false);
api_hal_light_set(LightGreen, 0);
view_port_enabled_set(view_port, false);
gui_remove_view_port(gui, view_port);
view_port_free(view_port);
osMessageQueueDelete(event_queue);
return 0;
}
if(event.input.key == InputKeyOk) {
if(event.input.type == InputTypePress) {
gpio_write(gpio, true);
api_hal_light_set(LightGreen, 255);
} else if(event.input.type == InputTypeRelease) {
gpio_write(gpio, false);
api_hal_light_set(LightGreen, 0);
}
}
}
return 0;