Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ClusterM/flipperzero-firmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Kharisov <albkharisov@gmail.com>2022-01-29 12:20:41 +0300
committerGitHub <noreply@github.com>2022-01-29 12:20:41 +0300
commit84410c83b54a26efbd6e7d248de8d96bdef78725 (patch)
tree8952a28e798d7f7ab59f76f1fe1574a4cc4cf011 /applications/subghz/scenes
parent53e7415d126d30e64c1ba275a1a725573a963535 (diff)
[FL-2183] [FL-2209] Dolphin Deeds, Level up, assets generation, refactoring (#965)
* Desktop: cleanup headers * Get loader pubsub via record * [FL-2183] Dolphin refactoring 2022.01 * Restruct animations assets structure * Rename assets * Cleanup headers * Update Recording animation * Add BadBattery animation * Provide loader's pubsub via record * Fix load/unload animations * Scripts: add flipper format support, initial dolphin packager rework. Assets: internal and external dolphin. * Sync internal meta.txt and manifest.txt * Reorder, rename dolphin assets * Split essential generated assets * Add ReadMe for dolphin assets * Separate essential blocking animations * Scripts: full dolphin validation before packaging * Assets, Scripts: dolphin external resources packer * Github: update codeowners * Scripts: proper slots handling in dolphin animation meta * Scripts: correct frames enumeration and fix compiled assets. * [FL-2209] Add Dolphin Deeds points and many more * Remove excess frame_rate * Change dolphin assets directory * Scripts: add internal resource support to dolphin compiler * Scripts: add internal assets generation, renaming * Scripts: correct assert, renaming * Code cleanup, documentation, fixes * Update Levelup animations * Rename essential -> blocking * Fix Unlocked hint * Scripts: rewrite Templite compiller, replace regexps with token parser, split block types into code and variable blocks. Update dolphin templates. * Documentation: add key combos description and use information * Scripts: cleanup templit, more debug info and add dev comment Co-authored-by: あく <alleteam@gmail.com>
Diffstat (limited to 'applications/subghz/scenes')
-rw-r--r--applications/subghz/scenes/subghz_scene_frequency_analyzer.c2
-rw-r--r--applications/subghz/scenes/subghz_scene_read_raw.c3
-rw-r--r--applications/subghz/scenes/subghz_scene_receiver_info.c2
-rw-r--r--applications/subghz/scenes/subghz_scene_save_success.c3
-rw-r--r--applications/subghz/scenes/subghz_scene_set_type.c2
-rw-r--r--applications/subghz/scenes/subghz_scene_transmitter.c2
6 files changed, 14 insertions, 0 deletions
diff --git a/applications/subghz/scenes/subghz_scene_frequency_analyzer.c b/applications/subghz/scenes/subghz_scene_frequency_analyzer.c
index 548a0f8f..554030ad 100644
--- a/applications/subghz/scenes/subghz_scene_frequency_analyzer.c
+++ b/applications/subghz/scenes/subghz_scene_frequency_analyzer.c
@@ -1,5 +1,6 @@
#include "../subghz_i.h"
#include "../views/subghz_frequency_analyzer.h"
+#include <dolphin/dolphin.h>
void subghz_scene_frequency_analyzer_callback(SubghzCustomEvent event, void* context) {
furi_assert(context);
@@ -9,6 +10,7 @@ void subghz_scene_frequency_analyzer_callback(SubghzCustomEvent event, void* con
void subghz_scene_frequency_analyzer_on_enter(void* context) {
SubGhz* subghz = context;
+ DOLPHIN_DEED(DolphinDeedSubGhzFrequencyAnalyzer);
subghz_frequency_analyzer_set_callback(
subghz->subghz_frequency_analyzer, subghz_scene_frequency_analyzer_callback, subghz);
view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewFrequencyAnalyzer);
diff --git a/applications/subghz/scenes/subghz_scene_read_raw.c b/applications/subghz/scenes/subghz_scene_read_raw.c
index 50edcb22..481138dc 100644
--- a/applications/subghz/scenes/subghz_scene_read_raw.c
+++ b/applications/subghz/scenes/subghz_scene_read_raw.c
@@ -1,5 +1,6 @@
#include "../subghz_i.h"
#include "../views/subghz_read_raw.h"
+#include <dolphin/dolphin.h>
#include <lib/subghz/protocols/subghz_protocol_raw.h>
#include <lib/subghz/subghz_parser.h>
#include <lib/toolbox/path.h>
@@ -199,6 +200,7 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) {
if(!subghz_tx_start(subghz)) {
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowOnlyRx);
} else {
+ DOLPHIN_DEED(DolphinDeedSubGhzSend);
subghz->state_notifications = SubGhzNotificationStateTX;
}
}
@@ -240,6 +242,7 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) {
RAW_FILE_NAME,
subghz->txrx->frequency,
string_get_cstr(subghz->error_str))) {
+ DOLPHIN_DEED(DolphinDeedSubGhzRawRec);
if((subghz->txrx->txrx_state == SubGhzTxRxStateIDLE) ||
(subghz->txrx->txrx_state == SubGhzTxRxStateSleep)) {
subghz_begin(subghz, subghz->txrx->preset);
diff --git a/applications/subghz/scenes/subghz_scene_receiver_info.c b/applications/subghz/scenes/subghz_scene_receiver_info.c
index a8935a1c..64d3633c 100644
--- a/applications/subghz/scenes/subghz_scene_receiver_info.c
+++ b/applications/subghz/scenes/subghz_scene_receiver_info.c
@@ -1,5 +1,6 @@
#include "../subghz_i.h"
#include "../helpers/subghz_custom_event.h"
+#include <dolphin/dolphin.h>
void subghz_scene_receiver_info_callback(GuiButtonType result, InputType type, void* context) {
furi_assert(context);
@@ -39,6 +40,7 @@ static bool subghz_scene_receiver_info_update_parser(void* context) {
void subghz_scene_receiver_info_on_enter(void* context) {
SubGhz* subghz = context;
+ DOLPHIN_DEED(DolphinDeedSubGhzReceiverInfo);
if(subghz_scene_receiver_info_update_parser(subghz)) {
string_t frequency_str;
string_t modulation_str;
diff --git a/applications/subghz/scenes/subghz_scene_save_success.c b/applications/subghz/scenes/subghz_scene_save_success.c
index 923a06b6..3d9d28d1 100644
--- a/applications/subghz/scenes/subghz_scene_save_success.c
+++ b/applications/subghz/scenes/subghz_scene_save_success.c
@@ -1,5 +1,7 @@
#include "../subghz_i.h"
#include "../helpers/subghz_custom_event.h"
+#include "dolphin/helpers/dolphin_deed.h"
+#include <dolphin/dolphin.h>
void subghz_scene_save_success_popup_callback(void* context) {
SubGhz* subghz = context;
@@ -8,6 +10,7 @@ void subghz_scene_save_success_popup_callback(void* context) {
void subghz_scene_save_success_on_enter(void* context) {
SubGhz* subghz = context;
+ DOLPHIN_DEED(DolphinDeedSubGhzSave);
// Setup view
Popup* popup = subghz->popup;
diff --git a/applications/subghz/scenes/subghz_scene_set_type.c b/applications/subghz/scenes/subghz_scene_set_type.c
index ddd8b976..0d8f0ad2 100644
--- a/applications/subghz/scenes/subghz_scene_set_type.c
+++ b/applications/subghz/scenes/subghz_scene_set_type.c
@@ -1,5 +1,6 @@
#include "../subghz_i.h"
#include "../lib/subghz/protocols/subghz_protocol_keeloq.h"
+#include <dolphin/dolphin.h>
enum SubmenuIndex {
SubmenuIndexPricenton,
@@ -192,6 +193,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
subghz->txrx->frequency = subghz_frequencies[subghz_frequencies_433_92];
subghz->txrx->preset = FuriHalSubGhzPresetOok650Async;
subghz_file_name_clear(subghz);
+ DOLPHIN_DEED(DolphinDeedSubGhzAddManually);
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaveName);
return true;
}
diff --git a/applications/subghz/scenes/subghz_scene_transmitter.c b/applications/subghz/scenes/subghz_scene_transmitter.c
index 287e1afd..48ed0fd8 100644
--- a/applications/subghz/scenes/subghz_scene_transmitter.c
+++ b/applications/subghz/scenes/subghz_scene_transmitter.c
@@ -1,6 +1,7 @@
#include "../subghz_i.h"
#include "../views/subghz_transmitter.h"
#include <lib/subghz/protocols/subghz_protocol_keeloq.h>
+#include <dolphin/dolphin.h>
void subghz_scene_transmitter_callback(SubghzCustomEvent event, void* context) {
furi_assert(context);
@@ -50,6 +51,7 @@ bool subghz_scene_transmitter_update_data_show(void* context) {
void subghz_scene_transmitter_on_enter(void* context) {
SubGhz* subghz = context;
+ DOLPHIN_DEED(DolphinDeedSubGhzSend);
if(!subghz_scene_transmitter_update_data_show(subghz)) {
view_dispatcher_send_custom_event(
subghz->view_dispatcher, SubghzCustomEventViewTransmitterError);