Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 07:18:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Cnt value edit [in progress]

Browse Source
This commit is contained in:
Eng1n33r
2023-08-24 19:23:05 +03:00
parent f93aab9b22
commit 32fb94f5db
8 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/main/subghz/helpers/subghz_custom_event.h
View File

@@ -105,7 +105,6 @@ typedef enum {
SubGhzCustomEventViewTransmitterBack,
SubGhzCustomEventViewTransmitterSendStart,
SubGhzCustomEventViewTransmitterSendStop,
SubGhzCustomEventViewTransmitterEditCnt,
SubGhzCustomEventViewTransmitterError,
SubGhzCustomEventViewFreqAnalOkShort,

2
applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c
View File

@@ -229,7 +229,7 @@ bool subghz_txrx_gen_faac_slh_protocol(
}
flipper_format_write_hex(txrx->fff_data, "Seed", seed_data, sizeof(uint32_t));
flipper_format_write_string_cstr(txrx->fff_data, "Valid", "1\n");
flipper_format_write_string_cstr(txrx->fff_data, "Valid", "1\r\n");
FURI_LOG_I(TAG, "Flag write to SD is OK");
}

8
applications/main/subghz/scenes/subghz_scene_edit_cnt.c
View File

@@ -1,7 +1,6 @@
#include "../subghz_i.h"
#include <lib/subghz/protocols/keeloq.h>
#define TAG "SubGhzEditCnt"
#define TAG "subghz_scene_edit_cnt"
void subghz_scene_edit_cnt_byte_input_callback(void* context) {
SubGhz* subghz = context;
@@ -29,14 +28,9 @@ void subghz_scene_edit_cnt_on_enter(void* context) {
bool subghz_scene_edit_cnt_on_event(void* context, SceneManagerEvent event) {
SubGhz* subghz = context;
bool consumed = false;
uint32_t cnt;
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == SubGhzCustomEventByteInputDone) {
cnt = subghz->secure_data->cnt[0] << 24 | subghz->secure_data->cnt[1] << 16 |
subghz->secure_data->cnt[2] << 8 | subghz->secure_data->cnt[3];
FURI_LOG_I(TAG, "cnt = %08lX", cnt);
// TO DO
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneTransmitter);
consumed = true;
}

13
applications/main/subghz/scenes/subghz_scene_saved_menu.c
View File

@@ -4,6 +4,7 @@ enum SubmenuIndex {
SubmenuIndexEmulate,
SubmenuIndexEdit,
SubmenuIndexDelete,
SubmenuIndexEditCnt,
};
void subghz_scene_saved_menu_submenu_callback(void* context, uint32_t index) {
@@ -19,6 +20,13 @@ void subghz_scene_saved_menu_on_enter(void* context) {
SubmenuIndexEmulate,
subghz_scene_saved_menu_submenu_callback,
subghz);
submenu_add_item(
subghz->submenu,
"Edit counter",
SubmenuIndexEditCnt,
subghz_scene_saved_menu_submenu_callback,
subghz);
submenu_add_item(
subghz->submenu,
@@ -60,6 +68,11 @@ bool subghz_scene_saved_menu_on_event(void* context, SceneManagerEvent event) {
subghz->scene_manager, SubGhzSceneSavedMenu, SubmenuIndexEdit);
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaveName);
return true;
} else if(event.event == SubmenuIndexEditCnt) {
scene_manager_set_scene_state(
subghz->scene_manager, SubGhzSceneSavedMenu, SubmenuIndexEditCnt);
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneEditCnt);
return true;
}
}
return false;

16
applications/main/subghz/scenes/subghz_scene_transmitter.c
View File

@@ -4,6 +4,8 @@
#include <lib/subghz/blocks/custom_btn.h>
#define TAG "subghz_scene_transmitter"
void subghz_scene_transmitter_callback(SubGhzCustomEvent event, void* context) {
furi_assert(context);
SubGhz* subghz = context;
@@ -20,6 +22,16 @@ bool subghz_scene_transmitter_update_data_show(void* context) {
FuriString* frequency_str = furi_string_alloc();
FuriString* modulation_str = furi_string_alloc();
if(scene_manager_has_previous_scene(subghz->scene_manager, SubGhzSceneEditCnt)) {
FURI_LOG_I(TAG, "<transmitter> has previous scene <EditCnt>");
uint32_t cnt_temp;
cnt_temp = subghz->secure_data->cnt[0] << 24 | subghz->secure_data->cnt[1] << 16 |
subghz->secure_data->cnt[2] << 8 | subghz->secure_data->cnt[3];
FURI_LOG_I(TAG, "cnt = %08lX", cnt_temp);
furi_hal_subghz_set_rolling_counter_value(cnt_temp);
FURI_LOG_I(TAG, "furi_hal_subghz.rolling_counter_value == %08lX", cnt_temp);
}
if(subghz_protocol_decoder_base_deserialize(
decoder, subghz_txrx_get_fff_data(subghz->txrx)) == SubGhzProtocolStatusOk) {
subghz_protocol_decoder_base_get_string(decoder, key_str);
@@ -85,10 +97,6 @@ bool subghz_scene_transmitter_on_event(void* context, SceneManagerEvent event) {
furi_hal_subghz_set_rolling_counter_mult(tmp_counter);
}
return true;
} else if(event.event == SubGhzCustomEventViewTransmitterEditCnt) {
subghz->state_notifications = SubGhzNotificationStateIDLE;
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneEditCnt);
return true;
} else if(event.event == SubGhzCustomEventViewTransmitterBack) {
subghz->state_notifications = SubGhzNotificationStateIDLE;
scene_manager_search_and_switch_to_previous_scene(