Remodeled after RFID reading app
Only the menu works so far Signed-off-by: Markus Birth <markus@birth-online.de>
This commit is contained in:
+1
-1
@@ -4,7 +4,7 @@ App(
|
||||
appid="uk_mbirth_sonicare", # Must be unique
|
||||
name="Sonicare Head ID", # Displayed in menus
|
||||
apptype=FlipperAppType.EXTERNAL,
|
||||
entry_point="uk_mbirth_sonicare_app",
|
||||
entry_point="sonicare_app",
|
||||
stack_size=2 * 1024,
|
||||
fap_category="RFID",
|
||||
# Optional values
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
#include "sonicare_scene.h"
|
||||
|
||||
// Generate scene on_enter handlers array
|
||||
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter,
|
||||
void (*const sonicare_on_enter_handlers[])(void*) = {
|
||||
#include "sonicare_scene_config.h"
|
||||
};
|
||||
#undef ADD_SCENE
|
||||
|
||||
// Generate scene on_event handlers array
|
||||
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event,
|
||||
bool (*const sonicare_on_event_handlers[])(void* context, SceneManagerEvent event) = {
|
||||
#include "sonicare_scene_config.h"
|
||||
};
|
||||
#undef ADD_SCENE
|
||||
|
||||
// Generate scene on_exit handlers array
|
||||
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit,
|
||||
void (*const sonicare_on_exit_handlers[])(void* context) = {
|
||||
#include "sonicare_scene_config.h"
|
||||
};
|
||||
#undef ADD_SCENE
|
||||
|
||||
// Initialize scene handlers configuration structure
|
||||
const SceneManagerHandlers sonicare_scene_handlers = {
|
||||
.on_enter_handlers = sonicare_on_enter_handlers,
|
||||
.on_event_handlers = sonicare_on_event_handlers,
|
||||
.on_exit_handlers = sonicare_on_exit_handlers,
|
||||
.scene_num = SonicareSceneNum,
|
||||
};
|
||||
@@ -0,0 +1,29 @@
|
||||
#pragma once
|
||||
|
||||
#include <gui/scene_manager.h>
|
||||
|
||||
// Generate scene id and total number
|
||||
#define ADD_SCENE(prefix, name, id) SonicareScene##id,
|
||||
typedef enum {
|
||||
#include "sonicare_scene_config.h"
|
||||
SonicareSceneNum,
|
||||
} SonicareScene;
|
||||
#undef ADD_SCENE
|
||||
|
||||
extern const SceneManagerHandlers sonicare_scene_handlers;
|
||||
|
||||
// Generate scene on_enter handlers declaration
|
||||
#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_enter(void*);
|
||||
#include "sonicare_scene_config.h"
|
||||
#undef ADD_SCENE
|
||||
|
||||
// Generate scene on_event handlers declaration
|
||||
#define ADD_SCENE(prefix, name, id) \
|
||||
bool prefix##_scene_##name##_on_event(void* context, SceneManagerEvent event);
|
||||
#include "sonicare_scene_config.h"
|
||||
#undef ADD_SCENE
|
||||
|
||||
// Generate scene on_exit handlers declaration
|
||||
#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_exit(void* context);
|
||||
#include "sonicare_scene_config.h"
|
||||
#undef ADD_SCENE
|
||||
@@ -0,0 +1,2 @@
|
||||
ADD_SCENE(sonicare, start, Start)
|
||||
ADD_SCENE(sonicare, read, Read)
|
||||
@@ -0,0 +1,22 @@
|
||||
#include "../uk_mbirth_sonicare.h"
|
||||
#include <dolphin/dolphin.h>
|
||||
|
||||
void sonicare_scene_read_on_enter(void* context) {
|
||||
Sonicare* app = context;
|
||||
UNUSED(app);
|
||||
}
|
||||
|
||||
bool sonicare_scene_read_on_event(void* context, SceneManagerEvent event) {
|
||||
Sonicare* app = context;
|
||||
UNUSED(app);
|
||||
UNUSED(event);
|
||||
bool consumed = false;
|
||||
|
||||
return consumed;
|
||||
}
|
||||
|
||||
void sonicare_scene_read_on_exit(void* context) {
|
||||
Sonicare* app = context;
|
||||
notification_message(app->notifications, &sequence_blink_stop);
|
||||
popup_reset(app->popup);
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
#include "../uk_mbirth_sonicare.h"
|
||||
#include <dolphin/dolphin.h>
|
||||
|
||||
static void sonicare_scene_start_submenu_callback(void* context, uint32_t index) {
|
||||
Sonicare* app = context;
|
||||
|
||||
view_dispatcher_send_custom_event(app->view_dispatcher, index);
|
||||
}
|
||||
|
||||
void sonicare_scene_start_on_enter(void* context) {
|
||||
Sonicare* app = context;
|
||||
Submenu* submenu = app->submenu;
|
||||
|
||||
submenu_add_item(
|
||||
submenu, "Read Brush Head", SonicareMenuIndexRead, sonicare_scene_start_submenu_callback, app);
|
||||
submenu_add_item(
|
||||
submenu, "Write Brush Head", SonicareMenuIndexSaved, sonicare_scene_start_submenu_callback, app);
|
||||
submenu_add_item(
|
||||
submenu,
|
||||
"Add Manually",
|
||||
SonicareMenuIndexAddManually,
|
||||
sonicare_scene_start_submenu_callback,
|
||||
app);
|
||||
submenu_add_item(
|
||||
submenu,
|
||||
"Extra Actions",
|
||||
SonicareMenuIndexExtraActions,
|
||||
sonicare_scene_start_submenu_callback,
|
||||
app);
|
||||
|
||||
submenu_set_selected_item(
|
||||
submenu, scene_manager_get_scene_state(app->scene_manager, SonicareSceneStart));
|
||||
|
||||
// clear key
|
||||
//furi_string_reset(app->file_name);
|
||||
//app->protocol_id = PROTOCOL_NO;
|
||||
//app->read_type = SONICAREWorkerReadTypeAuto;
|
||||
|
||||
view_dispatcher_switch_to_view(app->view_dispatcher, SonicareViewSubmenu);
|
||||
}
|
||||
|
||||
bool sonicare_scene_start_on_event(void* context, SceneManagerEvent event) {
|
||||
Sonicare* app = context;
|
||||
bool consumed = false;
|
||||
|
||||
if(event.type == SceneManagerEventTypeCustom) {
|
||||
if(event.event == SonicareMenuIndexRead) {
|
||||
scene_manager_set_scene_state(
|
||||
app->scene_manager, SonicareSceneStart, SonicareMenuIndexRead);
|
||||
scene_manager_next_scene(app->scene_manager, SonicareSceneRead);
|
||||
dolphin_deed(DolphinDeedRfidRead);
|
||||
consumed = true;
|
||||
}
|
||||
}
|
||||
|
||||
return consumed;
|
||||
}
|
||||
|
||||
void sonicare_scene_start_on_exit(void* context) {
|
||||
Sonicare* app = context;
|
||||
|
||||
submenu_reset(app->submenu);
|
||||
}
|
||||
+66
-72
@@ -1,89 +1,83 @@
|
||||
#include "uk_mbirth_sonicare.h"
|
||||
#include <furi.h>
|
||||
#include <gui/gui.h>
|
||||
#include <input/input.h>
|
||||
#include <dolphin/dolphin.h>
|
||||
|
||||
/* generated by fbt from .png files in images folder */
|
||||
#include <uk_mbirth_sonicare_icons.h>
|
||||
|
||||
|
||||
void draw_callback(Canvas* canvas, void* context) {
|
||||
UNUSED(context);
|
||||
|
||||
canvas_clear(canvas);
|
||||
canvas_set_color(canvas, ColorBlack);
|
||||
canvas_set_font(canvas, FontPrimary);
|
||||
|
||||
canvas_draw_str_aligned(canvas, 1, 0, AlignLeft, AlignTop, "Sonicare");
|
||||
|
||||
canvas_set_font(canvas, FontSecondary);
|
||||
canvas_draw_str_aligned(canvas, 1, 14, AlignLeft, AlignTop, "Hello world!");
|
||||
|
||||
canvas_set_font(canvas, FontKeyboard);
|
||||
canvas_draw_str_aligned(canvas, 1, 28, AlignLeft, AlignTop, "by mbirth.uk");
|
||||
|
||||
canvas_set_font(canvas, FontBigNumbers);
|
||||
canvas_draw_str_aligned(canvas, 1, 42, AlignLeft, AlignTop, "123abc");
|
||||
|
||||
canvas_draw_icon(canvas, 50, 0, &I_brush_10px);
|
||||
}
|
||||
|
||||
void input_callback(InputEvent* event, void* context) {
|
||||
static bool sonicare_debug_custom_event_callback(void* context, uint32_t event) {
|
||||
furi_assert(context);
|
||||
Sonicare* app = context;
|
||||
furi_message_queue_put(app->input_queue, event, 0);
|
||||
return scene_manager_handle_custom_event(app->scene_manager, event);
|
||||
}
|
||||
|
||||
int32_t uk_mbirth_sonicare_app(void* p) {
|
||||
UNUSED(p);
|
||||
FURI_LOG_I("TEST", "Hello world");
|
||||
FURI_LOG_I("TEST", "I'm uk_mbirth_sonicare!");
|
||||
Sonicare app;
|
||||
|
||||
// Alloc
|
||||
app.view_port = view_port_alloc();
|
||||
app.input_queue = furi_message_queue_alloc(8, sizeof(InputEvent));
|
||||
static bool sonicare_debug_back_event_callback(void* context) {
|
||||
furi_assert(context);
|
||||
Sonicare* app = context;
|
||||
return scene_manager_handle_back_event(app->scene_manager);
|
||||
}
|
||||
|
||||
// Callbacks
|
||||
view_port_draw_callback_set(app.view_port, draw_callback, &app);
|
||||
view_port_input_callback_set(app.view_port, input_callback, &app);
|
||||
static Sonicare* sonicare_alloc(void) {
|
||||
Sonicare* sonicare = malloc(sizeof(Sonicare));
|
||||
|
||||
// GUI
|
||||
app.gui = furi_record_open("gui");
|
||||
gui_add_view_port(app.gui, app.view_port, GuiLayerFullscreen);
|
||||
sonicare->storage = furi_record_open(RECORD_STORAGE);
|
||||
sonicare->dialogs = furi_record_open(RECORD_DIALOGS);
|
||||
|
||||
// Input handling
|
||||
InputEvent input;
|
||||
uint8_t exit_loop = 0;
|
||||
sonicare->view_dispatcher = view_dispatcher_alloc();
|
||||
sonicare->scene_manager = scene_manager_alloc(&sonicare_scene_handlers, sonicare);
|
||||
view_dispatcher_set_event_callback_context(sonicare->view_dispatcher, sonicare);
|
||||
view_dispatcher_set_custom_event_callback(sonicare->view_dispatcher, sonicare_debug_custom_event_callback);
|
||||
view_dispatcher_set_navigation_event_callback(sonicare->view_dispatcher, sonicare_debug_back_event_callback);
|
||||
|
||||
while (1) {
|
||||
furi_check(furi_message_queue_get(app.input_queue, &input, FuriWaitForever) == FuriStatusOk);
|
||||
|
||||
switch (input.key) {
|
||||
case InputKeyLeft:
|
||||
case InputKeyRight:
|
||||
case InputKeyOk:
|
||||
case InputKeyUp:
|
||||
case InputKeyDown:
|
||||
case InputKeyBack:
|
||||
exit_loop = 1;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (exit_loop) {
|
||||
break;
|
||||
}
|
||||
|
||||
view_port_update(app.view_port);
|
||||
}
|
||||
// Open GUI record
|
||||
sonicare->gui = furi_record_open(RECORD_GUI);
|
||||
|
||||
// Free structs
|
||||
view_port_enabled_set(app.view_port, false);
|
||||
gui_remove_view_port(app.gui, app.view_port);
|
||||
furi_record_close("gui");
|
||||
view_port_free(app.view_port);
|
||||
// Open Notification record
|
||||
sonicare->notifications = furi_record_open(RECORD_NOTIFICATION);
|
||||
|
||||
// Submenu
|
||||
sonicare->submenu = submenu_alloc();
|
||||
view_dispatcher_add_view(
|
||||
sonicare->view_dispatcher, SonicareViewSubmenu, submenu_get_view(sonicare->submenu));
|
||||
|
||||
return sonicare;
|
||||
}
|
||||
|
||||
static void sonicare_free(Sonicare* sonicare) {
|
||||
furi_assert(sonicare);
|
||||
|
||||
// Submenu
|
||||
view_dispatcher_remove_view(sonicare->view_dispatcher, SonicareViewSubmenu);
|
||||
submenu_free(sonicare->submenu);
|
||||
|
||||
view_dispatcher_free(sonicare->view_dispatcher);
|
||||
|
||||
scene_manager_free(sonicare->scene_manager);
|
||||
|
||||
furi_record_close(RECORD_GUI);
|
||||
sonicare->gui = NULL;
|
||||
|
||||
furi_record_close(RECORD_NOTIFICATION);
|
||||
sonicare->notifications = NULL;
|
||||
|
||||
furi_record_close(RECORD_STORAGE);
|
||||
furi_record_close(RECORD_DIALOGS);
|
||||
|
||||
free(sonicare);
|
||||
}
|
||||
|
||||
int32_t sonicare_app(void* p) {
|
||||
Sonicare* app = sonicare_alloc();
|
||||
UNUSED(p);
|
||||
//char* args = p;
|
||||
|
||||
view_dispatcher_attach_to_gui(
|
||||
app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
|
||||
scene_manager_next_scene(app->scene_manager, SonicareSceneStart);
|
||||
|
||||
view_dispatcher_run(app->view_dispatcher);
|
||||
|
||||
sonicare_free(app);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
+65
-7
@@ -1,8 +1,66 @@
|
||||
#include <furi.h>
|
||||
#include <gui/gui.h>
|
||||
#pragma once
|
||||
|
||||
typedef struct {
|
||||
FuriMessageQueue* input_queue;
|
||||
ViewPort* view_port;
|
||||
Gui* gui;
|
||||
} Sonicare;
|
||||
#include <furi.h>
|
||||
#include <furi_hal.h>
|
||||
|
||||
#include <gui/gui.h>
|
||||
#include <gui/view.h>
|
||||
|
||||
#include <gui/view_dispatcher.h>
|
||||
#include <gui/scene_manager.h>
|
||||
#include <notification/notification_messages.h>
|
||||
|
||||
#include <gui/modules/submenu.h>
|
||||
#include <gui/modules/dialog_ex.h>
|
||||
#include <gui/modules/popup.h>
|
||||
#include <gui/modules/text_input.h>
|
||||
#include <gui/modules/byte_input.h>
|
||||
#include <gui/modules/widget.h>
|
||||
|
||||
#include <notification/notification_messages.h>
|
||||
#include <dialogs/dialogs.h>
|
||||
#include <storage/storage.h>
|
||||
#include <flipper_format/flipper_format.h>
|
||||
|
||||
#include <toolbox/protocols/protocol_dict.h>
|
||||
#include <toolbox/path.h>
|
||||
#include <lfrfid/lfrfid_worker.h>
|
||||
|
||||
#include "scenes/sonicare_scene.h"
|
||||
|
||||
typedef struct Sonicare Sonicare;
|
||||
|
||||
struct Sonicare {
|
||||
LFRFIDWorker* lfworker;
|
||||
ViewDispatcher* view_dispatcher;
|
||||
Gui* gui;
|
||||
NotificationApp* notifications;
|
||||
SceneManager* scene_manager;
|
||||
Storage* storage;
|
||||
DialogsApp* dialogs;
|
||||
Widget* widget;
|
||||
|
||||
// Common Views
|
||||
Submenu* submenu;
|
||||
DialogEx* dialog_ex;
|
||||
Popup* popup;
|
||||
TextInput* text_input;
|
||||
ByteInput* byte_input;
|
||||
};
|
||||
|
||||
typedef enum {
|
||||
SonicareViewSubmenu,
|
||||
SonicareViewDialogEx,
|
||||
SonicareViewPopup,
|
||||
SonicareViewWidget,
|
||||
SonicareViewTextInput,
|
||||
SonicareViewByteInput,
|
||||
SonicareViewRead,
|
||||
} SonicareView;
|
||||
|
||||
typedef enum {
|
||||
SonicareMenuIndexRead,
|
||||
SonicareMenuIndexSaved,
|
||||
SonicareMenuIndexAddManually,
|
||||
SonicareMenuIndexExtraActions,
|
||||
} SonicareMenuIndex;
|
||||
|
||||
Reference in New Issue
Block a user