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

SubGhz: Сreating and delivering Security+ 2.0 (#1273)

Browse Source 
* SubGhz: Security+ 2.0 "Add manually" option
* SubGhz: fix message error
* Unit_test: add Security+ 2.0 encoder
* Applications: remove obsolete code
* SubGhz: save menu position in "Add Manually" menu

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
Skorpionm
2022-05-27 16:19:20 +04:00
committed by GitHub
parent 5c45250dd2
commit 67fbefbe63
14 changed files with 689 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/applications.c
View File

@@ -420,14 +420,6 @@ const FlipperApplication FLIPPER_DEBUG_APPS[] = {
.flags = FlipperApplicationFlagDefault},
#endif
#ifdef APP_SCENED
{.app = scened_app,
.name = "Templated Scene",
.stack_size = 1024,
.icon = NULL,
.flags = FlipperApplicationFlagDefault},
#endif
#ifdef APP_LF_RFID
{.app = lfrfid_debug_app,
.name = "LF-RFID Debug",

35
applications/scened_app_example/scene/scened_app_scene_byte_input.cpp
View File

@@ -1,35 +0,0 @@
#include "scened_app_scene_byte_input.h"
void ScenedAppSceneByteInput::on_enter(ScenedApp* app, bool /* need_restore */) {
ByteInputVM* byte_input = app->view_controller;
auto callback = cbc::obtain_connector(this, &ScenedAppSceneByteInput::result_callback);
byte_input->set_result_callback(callback, NULL, app, data, 4);
byte_input->set_header_text("Enter the key");
app->view_controller.switch_to<ByteInputVM>();
}
bool ScenedAppSceneByteInput::on_event(ScenedApp* app, ScenedApp::Event* event) {
bool consumed = false;
if(event->type == ScenedApp::EventType::ByteEditResult) {
app->scene_controller.switch_to_previous_scene();
consumed = true;
}
return consumed;
}
void ScenedAppSceneByteInput::on_exit(ScenedApp* app) {
app->view_controller.get<ByteInputVM>()->clean();
}
void ScenedAppSceneByteInput::result_callback(void* context) {
ScenedApp* app = static_cast<ScenedApp*>(context);
ScenedApp::Event event;
event.type = ScenedApp::EventType::ByteEditResult;
app->view_controller.send_event(&event);
}

19
applications/scened_app_example/scene/scened_app_scene_byte_input.h
View File

@@ -1,19 +0,0 @@
#pragma once
#include "../scened_app.h"
class ScenedAppSceneByteInput : public GenericScene<ScenedApp> {
public:
void on_enter(ScenedApp* app, bool need_restore) final;
bool on_event(ScenedApp* app, ScenedApp::Event* event) final;
void on_exit(ScenedApp* app) final;
private:
void result_callback(void* context);
uint8_t data[4] = {
0x01,
0xA2,
0xF4,
0xD3,
};
};

47
applications/scened_app_example/scene/scened_app_scene_start.cpp
View File

@@ -1,47 +0,0 @@
#include "scened_app_scene_start.h"
typedef enum {
SubmenuByteInput,
} SubmenuIndex;
void ScenedAppSceneStart::on_enter(ScenedApp* app, bool need_restore) {
auto submenu = app->view_controller.get<SubmenuVM>();
auto callback = cbc::obtain_connector(this, &ScenedAppSceneStart::submenu_callback);
submenu->add_item("Byte Input", SubmenuByteInput, callback, app);
if(need_restore) {
submenu->set_selected_item(submenu_item_selected);
}
app->view_controller.switch_to<SubmenuVM>();
}
bool ScenedAppSceneStart::on_event(ScenedApp* app, ScenedApp::Event* event) {
bool consumed = false;
if(event->type == ScenedApp::EventType::MenuSelected) {
submenu_item_selected = event->payload.menu_index;
switch(event->payload.menu_index) {
case SubmenuByteInput:
app->scene_controller.switch_to_next_scene(ScenedApp::SceneType::ByteInputScene);
break;
}
consumed = true;
}
return consumed;
}
void ScenedAppSceneStart::on_exit(ScenedApp* app) {
app->view_controller.get<SubmenuVM>()->clean();
}
void ScenedAppSceneStart::submenu_callback(void* context, uint32_t index) {
ScenedApp* app = static_cast<ScenedApp*>(context);
ScenedApp::Event event;
event.type = ScenedApp::EventType::MenuSelected;
event.payload.menu_index = index;
app->view_controller.send_event(&event);
}

13
applications/scened_app_example/scene/scened_app_scene_start.h
View File

@@ -1,13 +0,0 @@
#pragma once
#include "../scened_app.h"
class ScenedAppSceneStart : public GenericScene<ScenedApp> {
public:
void on_enter(ScenedApp* app, bool need_restore) final;
bool on_event(ScenedApp* app, ScenedApp::Event* event) final;
void on_exit(ScenedApp* app) final;
private:
void submenu_callback(void* context, uint32_t index);
uint32_t submenu_item_selected = 0;
};

20
applications/scened_app_example/scened_app.cpp
View File

@@ -1,20 +0,0 @@
#include "scened_app.h"
#include "scene/scened_app_scene_start.h"
#include "scene/scened_app_scene_byte_input.h"
ScenedApp::ScenedApp()
: scene_controller{this}
, text_store{128}
, notification{"notification"} {
}
ScenedApp::~ScenedApp() {
}
void ScenedApp::run() {
scene_controller.add_scene(SceneType::Start, new ScenedAppSceneStart());
scene_controller.add_scene(SceneType::ByteInputScene, new ScenedAppSceneByteInput());
notification_message(notification, &sequence_blink_green_10);
scene_controller.process(100);
}

47
applications/scened_app_example/scened_app.h
View File

@@ -1,47 +0,0 @@
#pragma once
#include <furi.h>
#include <furi_hal.h>
#include <generic_scene.hpp>
#include <scene_controller.hpp>
#include <view_controller.hpp>
#include <record_controller.hpp>
#include <text_store.h>
#include <view_modules/submenu_vm.h>
#include <view_modules/byte_input_vm.h>
#include <notification/notification_messages.h>
class ScenedApp {
public:
enum class EventType : uint8_t {
GENERIC_EVENT_ENUM_VALUES,
MenuSelected,
ByteEditResult,
};
enum class SceneType : uint8_t {
GENERIC_SCENE_ENUM_VALUES,
ByteInputScene,
};
class Event {
public:
union {
int32_t menu_index;
} payload;
EventType type;
};
SceneController<GenericScene<ScenedApp>, ScenedApp> scene_controller;
TextStore text_store;
ViewController<ScenedApp, SubmenuVM, ByteInputVM> view_controller;
RecordController<NotificationApp> notification;
~ScenedApp();
ScenedApp();
void run();
};

11
applications/scened_app_example/scened_app_launcher.cpp
View File

@@ -1,11 +0,0 @@
#include "scened_app.h"
// app enter function
extern "C" int32_t scened_app(void* p) {
UNUSED(p);
ScenedApp* app = new ScenedApp();
app->run();
delete app;
return 0;
}

83
applications/subghz/scenes/subghz_scene_set_type.c
View File

@@ -1,6 +1,7 @@
#include "../subghz_i.h"
#include <lib/subghz/protocols/keeloq.h>
#include <lib/subghz/protocols/secplus_v1.h>
#include <lib/subghz/protocols/secplus_v2.h>
#include <lib/subghz/blocks/math.h>
#include <dolphin/dolphin.h>
#include <flipper_format/flipper_format_i.h>
@@ -24,6 +25,9 @@ enum SubmenuIndex {
SubmenuIndexFirefly_300_00,
SubmenuIndexLiftMaster_315_00,
SubmenuIndexLiftMaster_390_00,
SubmenuIndexSecPlus_v2_310_00,
SubmenuIndexSecPlus_v2_315_00,
SubmenuIndexSecPlus_v2_390_00,
};
bool subghz_scene_set_type_submenu_gen_data_protocol(
@@ -157,6 +161,24 @@ void subghz_scene_set_type_on_enter(void* context) {
SubmenuIndexLiftMaster_390_00,
subghz_scene_set_type_submenu_callback,
subghz);
submenu_add_item(
subghz->submenu,
"Security+2.0_310",
SubmenuIndexSecPlus_v2_310_00,
subghz_scene_set_type_submenu_callback,
subghz);
submenu_add_item(
subghz->submenu,
"Security+2.0_315",
SubmenuIndexSecPlus_v2_315_00,
subghz_scene_set_type_submenu_callback,
subghz);
submenu_add_item(
subghz->submenu,
"Security+2.0_390",
SubmenuIndexSecPlus_v2_390_00,
subghz_scene_set_type_submenu_callback,
subghz);
submenu_set_selected_item(
subghz->submenu, scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneSetType));
@@ -330,7 +352,6 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
while(!subghz_protocol_secplus_v1_check_fixed(key)) {
key = subghz_random_serial();
}
if(subghz_scene_set_type_submenu_gen_data_protocol(
subghz,
SUBGHZ_PROTOCOL_SECPLUS_V1_NAME,
@@ -345,7 +366,6 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
while(!subghz_protocol_secplus_v1_check_fixed(key)) {
key = subghz_random_serial();
}
if(subghz_scene_set_type_submenu_gen_data_protocol(
subghz,
SUBGHZ_PROTOCOL_SECPLUS_V1_NAME,
@@ -356,17 +376,70 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
generated_protocol = true;
}
break;
case SubmenuIndexSecPlus_v2_310_00:
subghz->txrx->transmitter = subghz_transmitter_alloc_init(
subghz->txrx->environment, SUBGHZ_PROTOCOL_SECPLUS_V2_NAME);
if(subghz->txrx->transmitter) {
subghz_protocol_secplus_v2_create_data(
subghz_transmitter_get_protocol_instance(subghz->txrx->transmitter),
subghz->txrx->fff_data,
key,
0x68,
0xE500000,
310000000,
FuriHalSubGhzPresetOok650Async);
generated_protocol = true;
} else {
generated_protocol = false;
}
subghz_transmitter_free(subghz->txrx->transmitter);
break;
case SubmenuIndexSecPlus_v2_315_00:
subghz->txrx->transmitter = subghz_transmitter_alloc_init(
subghz->txrx->environment, SUBGHZ_PROTOCOL_SECPLUS_V2_NAME);
if(subghz->txrx->transmitter) {
subghz_protocol_secplus_v2_create_data(
subghz_transmitter_get_protocol_instance(subghz->txrx->transmitter),
subghz->txrx->fff_data,
key,
0x68,
0xE500000,
315000000,
FuriHalSubGhzPresetOok650Async);
generated_protocol = true;
} else {
generated_protocol = false;
}
subghz_transmitter_free(subghz->txrx->transmitter);
break;
case SubmenuIndexSecPlus_v2_390_00:
subghz->txrx->transmitter = subghz_transmitter_alloc_init(
subghz->txrx->environment, SUBGHZ_PROTOCOL_SECPLUS_V2_NAME);
if(subghz->txrx->transmitter) {
subghz_protocol_secplus_v2_create_data(
subghz_transmitter_get_protocol_instance(subghz->txrx->transmitter),
subghz->txrx->fff_data,
key,
0x68,
0xE500000,
390000000,
FuriHalSubGhzPresetOok650Async);
generated_protocol = true;
} else {
generated_protocol = false;
}
subghz_transmitter_free(subghz->txrx->transmitter);
break;
default:
return false;
break;
}
scene_manager_set_scene_state(subghz->scene_manager, SubGhzSceneSetType, event.event);
if(generated_protocol) {
subghz_file_name_clear(subghz);
DOLPHIN_DEED(DolphinDeedSubGhzAddManually);
scene_manager_set_scene_state(
subghz->scene_manager, SubGhzSceneSetType, SubGhzCustomEventManagerSet);
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaveName);
return true;
}

7
applications/unit_tests/subghz/subghz_test.c
View File

@@ -422,6 +422,12 @@ MU_TEST(subghz_encoder_secplus_v1_test) {
"Test encoder " SUBGHZ_PROTOCOL_SECPLUS_V1_NAME " error\r\n");
}
MU_TEST(subghz_encoder_secplus_v2_test) {
mu_assert(
subghz_encoder_test("/ext/unit_tests/subghz/security_pls_2_0.sub"),
"Test encoder " SUBGHZ_PROTOCOL_SECPLUS_V2_NAME " error\r\n");
}
MU_TEST(subghz_random_test) {
mu_assert(subghz_decode_random_test(TEST_RANDOM_DIR_NAME), "Random test error\r\n");
}
@@ -464,6 +470,7 @@ MU_TEST_SUITE(subghz) {
MU_RUN_TEST(subghz_encoder_megacode_test);
MU_RUN_TEST(subghz_encoder_holtek_test);
MU_RUN_TEST(subghz_encoder_secplus_v1_test);
MU_RUN_TEST(subghz_encoder_secplus_v2_test);
MU_RUN_TEST(subghz_random_test);
subghz_test_deinit();