mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-13 13:09:49 +04:00
Code Issues Activity

EditCnt rework [in progress]

Browse Source
This commit is contained in:
Eng1n33r
2023-08-24 00:00:28 +03:00
parent 091d32ed7a
commit 09aabff55b
6 changed files with 6 additions and 32 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,6 +105,7 @@ typedef enum {
SubGhzCustomEventViewTransmitterBack,
SubGhzCustomEventViewTransmitterSendStart,
SubGhzCustomEventViewTransmitterSendStop,
SubGhzCustomEventViewTransmitterEditCnt,
SubGhzCustomEventViewTransmitterError,
SubGhzCustomEventViewFreqAnalOkShort,

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

@@ -36,10 +36,7 @@ bool subghz_scene_edit_cnt_on_event(void* context, SceneManagerEvent event) {
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);
if(subghz_protocol_keeloq_edit_cnt(subghz->txrx, cnt)) {
FURI_LOG_I(TAG, "Hook func from scene to protocol OK");
};
// 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,7 +4,6 @@ enum SubmenuIndex {
SubmenuIndexEmulate,
SubmenuIndexEdit,
SubmenuIndexDelete,
SubmenuIndexEditCnt,
};
void subghz_scene_saved_menu_submenu_callback(void* context, uint32_t index) {
@@ -21,13 +20,6 @@ void subghz_scene_saved_menu_on_enter(void* context) {
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,
"Rename",
@@ -68,11 +60,6 @@ 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;

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

@@ -85,6 +85,10 @@ 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(

8
lib/subghz/protocols/keeloq.c
View File

@@ -454,14 +454,6 @@ static bool
return true;
}
bool subghz_protocol_keeloq_edit_cnt(void* context, uint32_t cnt) {
furi_assert(context);
SubGhzProtocolEncoderKeeloq* instance = context;
instance->generic.cnt = cnt;
FURI_LOG_I(TAG, "edit_cnt value : %08lX", cnt);
return true;
}
SubGhzProtocolStatus
subghz_protocol_encoder_keeloq_deserialize(void* context, FlipperFormat* flipper_format) {
furi_assert(context);

7
lib/subghz/protocols/keeloq.h
View File

@@ -11,13 +11,6 @@ extern const SubGhzProtocolDecoder subghz_protocol_keeloq_decoder;
extern const SubGhzProtocolEncoder subghz_protocol_keeloq_encoder;
extern const SubGhzProtocol subghz_protocol_keeloq;
/**
* Edit counter function
* @param context Pointer to a SubGhzProtocolEncoderKeeloq instance
* @param cnt Counter
*/
bool subghz_protocol_keeloq_edit_cnt(void* context, uint32_t cnt);
/**
* Allocate SubGhzProtocolEncoderKeeloq.
* @param environment Pointer to a SubGhzEnvironment instance