[FL-1237] Notifications app (#476)
* Notification app: init * Notification app: separate message sequences * Notification app: rename notifications to notification * Notification app: rework api * Notification app: new sequences for charger * Power app: add state for better led handling * Power app: NotificationSequence type, notification led process * Blink app: use notifications * Notification app: sound and vibro notifications * Notification app: note messages * Notification app: more messages * Notification app: update note message generator * Blink app: fix state counter * Notification app: fix delay event * App sd-filesystem: notifications * App notifications: headers c++ compatibility * App notifications: Cmaj success chord sequence * App iButton: use notifications * App notification: display backlight notifications * App notification: add "display on" message to success and error sequences * App accessor: use notifications * App ibutton: guard onewire key read * Lib-RFAL: remove api_hal_light usage * App notification: add blocking mode, rework display api * Cli led command: use internal notification instead of direc access to leds. * App unit test: use notifications * App lfrfid: use notifications * Apps: close notification record * App subghz: rough use of notifications * App notificaton: ignore reset flag * App strobe: removed * Lib irda decoder: fix nec decoding * App irda: fix assert, use notifications * Apps: use notifications * Fix IRDA tests * Cli: better var naming * App notification: readable sources Co-authored-by: Albert Kharisov <albert@flipperdevices.com> Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
@@ -4,6 +4,10 @@
|
||||
#include <gui/gui.h>
|
||||
#include <input/input.h>
|
||||
|
||||
#include <notification/notification-messages.h>
|
||||
|
||||
#define BLINK_COLOR_COUNT 7
|
||||
|
||||
typedef enum {
|
||||
EventTypeTick,
|
||||
EventTypeKey,
|
||||
@@ -14,12 +18,6 @@ typedef struct {
|
||||
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;
|
||||
@@ -57,16 +55,18 @@ int32_t application_blink(void* p) {
|
||||
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},
|
||||
NotificationApp* notifications = furi_record_open("notification");
|
||||
|
||||
const NotificationSequence* colors[BLINK_COLOR_COUNT] = {
|
||||
&sequence_blink_red_100,
|
||||
&sequence_blink_green_100,
|
||||
&sequence_blink_blue_100,
|
||||
&sequence_blink_yellow_100,
|
||||
&sequence_blink_cyan_100,
|
||||
&sequence_blink_magenta_100,
|
||||
&sequence_blink_white_100,
|
||||
};
|
||||
|
||||
uint8_t state = 0;
|
||||
BlinkEvent event;
|
||||
|
||||
@@ -74,7 +74,7 @@ int32_t application_blink(void* p) {
|
||||
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);
|
||||
furi_record_close("notification");
|
||||
view_port_enabled_set(view_port, false);
|
||||
gui_remove_view_port(gui, view_port);
|
||||
view_port_free(view_port);
|
||||
@@ -84,12 +84,12 @@ int32_t application_blink(void* p) {
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
if(state < sizeof(blink_color) / sizeof(blink_color[0])) {
|
||||
state++;
|
||||
} else {
|
||||
notification_message(notifications, colors[state]);
|
||||
|
||||
state++;
|
||||
if(state >= BLINK_COLOR_COUNT) {
|
||||
state = 0;
|
||||
}
|
||||
rgb_set(blink_color[state][0], blink_color[state][1], blink_color[state][2]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -1,46 +0,0 @@
|
||||
#include <furi.h>
|
||||
#include <api-hal.h>
|
||||
#include <input/input.h>
|
||||
|
||||
static void event_cb(const void* value, void* ctx) {
|
||||
const InputEvent* event = value;
|
||||
|
||||
uint32_t* delay_time = acquire_mutex(ctx, 0);
|
||||
if(delay_time == NULL) return;
|
||||
|
||||
if(event->key == InputKeyUp && *delay_time < 1000) {
|
||||
*delay_time += 5;
|
||||
}
|
||||
|
||||
if(event->key == InputKeyDown && *delay_time > 10) {
|
||||
*delay_time -= 5;
|
||||
}
|
||||
release_mutex(ctx, delay_time);
|
||||
}
|
||||
|
||||
void application_strobe(void* p) {
|
||||
// WAT
|
||||
osDelay(100);
|
||||
|
||||
uint32_t delay_time_holder = 100;
|
||||
ValueMutex delay_mutex;
|
||||
init_mutex(&delay_mutex, &delay_time_holder, sizeof(delay_time_holder));
|
||||
|
||||
PubSub* event_record = furi_record_open("input_events");
|
||||
subscribe_pubsub(event_record, event_cb, &delay_mutex);
|
||||
|
||||
while(1) {
|
||||
uint32_t delay_time = 100;
|
||||
read_mutex_block(&delay_mutex, &delay_time, sizeof(delay_time));
|
||||
|
||||
api_hal_light_set(LightRed, 0x00);
|
||||
api_hal_light_set(LightGreen, 0x00);
|
||||
api_hal_light_set(LightBlue, 0x00);
|
||||
osDelay(delay_time / 10);
|
||||
|
||||
api_hal_light_set(LightRed, 0xFF);
|
||||
api_hal_light_set(LightGreen, 0xFF);
|
||||
api_hal_light_set(LightBlue, 0xFF);
|
||||
osDelay(delay_time);
|
||||
}
|
||||
}
|
@@ -3,6 +3,7 @@
|
||||
|
||||
#include <gui/gui.h>
|
||||
#include <input/input.h>
|
||||
#include <notification/notification-messages.h>
|
||||
|
||||
typedef struct {
|
||||
InputEvent input;
|
||||
@@ -27,7 +28,6 @@ void vibro_input_callback(InputEvent* input_event, void* ctx) {
|
||||
}
|
||||
|
||||
int32_t application_vibro(void* p) {
|
||||
GpioPin* gpio = (GpioPin*)&vibro_gpio;
|
||||
osMessageQueueId_t event_queue = osMessageQueueNew(8, sizeof(VibroEvent), NULL);
|
||||
|
||||
// Configure view port
|
||||
@@ -40,15 +40,16 @@ int32_t application_vibro(void* p) {
|
||||
Gui* gui = furi_record_open("gui");
|
||||
gui_add_view_port(gui, view_port, GuiLayerFullscreen);
|
||||
|
||||
hal_gpio_init(gpio, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow);
|
||||
hal_gpio_write(gpio, false);
|
||||
NotificationApp* notification = furi_record_open("notification");
|
||||
|
||||
VibroEvent event;
|
||||
|
||||
while(1) {
|
||||
furi_check(osMessageQueueGet(event_queue, &event, NULL, osWaitForever) == osOK);
|
||||
if(event.input.type == InputTypeShort && event.input.key == InputKeyBack) {
|
||||
hal_gpio_write(gpio, false);
|
||||
api_hal_light_set(LightGreen, 0);
|
||||
notification_message(notification, &sequence_reset_vibro);
|
||||
notification_message(notification, &sequence_reset_green);
|
||||
furi_record_close("notification");
|
||||
view_port_enabled_set(view_port, false);
|
||||
gui_remove_view_port(gui, view_port);
|
||||
view_port_free(view_port);
|
||||
@@ -58,11 +59,11 @@ int32_t application_vibro(void* p) {
|
||||
}
|
||||
if(event.input.key == InputKeyOk) {
|
||||
if(event.input.type == InputTypePress) {
|
||||
hal_gpio_write(gpio, true);
|
||||
api_hal_light_set(LightGreen, 255);
|
||||
notification_message(notification, &sequence_set_vibro_on);
|
||||
notification_message(notification, &sequence_set_green_255);
|
||||
} else if(event.input.type == InputTypeRelease) {
|
||||
hal_gpio_write(gpio, false);
|
||||
api_hal_light_set(LightGreen, 0);
|
||||
notification_message(notification, &sequence_reset_vibro);
|
||||
notification_message(notification, &sequence_reset_green);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user