+1
-1
@@ -13,6 +13,6 @@ App(
|
||||
fap_icon="uk_mbirth_sonicare.png", # 10x10 1-bit PNG
|
||||
fap_description="Philips Sonicare brush head reader",
|
||||
fap_author="mbirth.uk",
|
||||
fap_weburl="https://git.mbirth.uk/",
|
||||
fap_weburl="https://git.mbirth.uk/flipper_zero/sonicare",
|
||||
fap_icon_assets="images", # Image assets to compile for this application
|
||||
)
|
||||
|
||||
@@ -21,7 +21,7 @@ void (*const sonicare_on_exit_handlers[])(void* context) = {
|
||||
};
|
||||
#undef ADD_SCENE
|
||||
|
||||
// Initialize scene handlers configuration structure
|
||||
// Initialise scene handlers configuration structure
|
||||
const SceneManagerHandlers sonicare_scene_handlers = {
|
||||
.on_enter_handlers = sonicare_on_enter_handlers,
|
||||
.on_event_handlers = sonicare_on_event_handlers,
|
||||
|
||||
@@ -11,30 +11,22 @@ 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_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_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;
|
||||
submenu_set_selected_item(submenu, scene_manager_get_scene_state(app->scene_manager, SonicareSceneStart));
|
||||
|
||||
view_dispatcher_switch_to_view(app->view_dispatcher, SonicareViewSubmenu);
|
||||
}
|
||||
@@ -43,12 +35,11 @@ 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);
|
||||
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);
|
||||
dolphin_deed(DolphinDeedNfcRead);
|
||||
consumed = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,8 +37,7 @@ static Sonicare* sonicare_alloc(void) {
|
||||
|
||||
// Submenu
|
||||
sonicare->submenu = submenu_alloc();
|
||||
view_dispatcher_add_view(
|
||||
sonicare->view_dispatcher, SonicareViewSubmenu, submenu_get_view(sonicare->submenu));
|
||||
view_dispatcher_add_view(sonicare->view_dispatcher, SonicareViewSubmenu, submenu_get_view(sonicare->submenu));
|
||||
|
||||
return sonicare;
|
||||
}
|
||||
|
||||
@@ -13,25 +13,21 @@
|
||||
#include <gui/modules/submenu.h>
|
||||
#include <gui/modules/dialog_ex.h>
|
||||
#include <gui/modules/popup.h>
|
||||
#include <gui/modules/loading.h>
|
||||
#include <gui/modules/text_input.h>
|
||||
#include <gui/modules/byte_input.h>
|
||||
#include <gui/modules/widget.h>
|
||||
|
||||
#include <notification/notification_messages.h>
|
||||
#include <loader/loader.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;
|
||||
|
||||
Reference in New Issue
Block a user