diff --git a/applications/subghz/scenes/subghz_scene_set_cnt.c b/applications/subghz/scenes/subghz_scene_set_cnt.c index db466fdb2..0cee0faf1 100644 --- a/applications/subghz/scenes/subghz_scene_set_cnt.c +++ b/applications/subghz/scenes/subghz_scene_set_cnt.c @@ -39,7 +39,7 @@ bool subghz_scene_set_cnt_on_event(void* context, SceneManagerEvent event) { void subghz_scene_set_cnt_on_exit(void* context) { SubGhz* subghz = context; - uint16_t cnt = *subghz->txrx->secure_data->cnt << 8 | (*subghz->txrx->secure_data->cnt+1); + uint16_t cnt = subghz->txrx->secure_data->cnt[0] << 8 | subghz->txrx->secure_data->cnt[1]; FURI_LOG_I(TAG, "cnt: %4X\n", cnt); // Clear view byte_input_set_result_callback(subghz->byte_input, NULL, NULL, NULL, NULL, 0); diff --git a/applications/subghz/scenes/subghz_scene_set_fix.c b/applications/subghz/scenes/subghz_scene_set_fix.c index fac958577..fd59eabfc 100644 --- a/applications/subghz/scenes/subghz_scene_set_fix.c +++ b/applications/subghz/scenes/subghz_scene_set_fix.c @@ -39,8 +39,8 @@ bool subghz_scene_set_fix_on_event(void* context, SceneManagerEvent event) { void subghz_scene_set_fix_on_exit(void* context) { SubGhz* subghz = context; - uint32_t fix = *subghz->txrx->secure_data->fix << 24 | (*subghz->txrx->secure_data->fix+1) << 16 | - (*subghz->txrx->secure_data->fix+2) << 8 | (*subghz->txrx->secure_data->fix+3); + uint32_t fix = subghz->txrx->secure_data->fix[0] << 24 | subghz->txrx->secure_data->fix[1] << 16 | + subghz->txrx->secure_data->fix[2] << 8 | subghz->txrx->secure_data->fix[3]; FURI_LOG_I(TAG, "fix: %8X\n", fix); // Clear view byte_input_set_result_callback(subghz->byte_input, NULL, NULL, NULL, NULL, 0); diff --git a/applications/subghz/scenes/subghz_scene_set_seed.c b/applications/subghz/scenes/subghz_scene_set_seed.c index e3da0a557..090d92b8e 100644 --- a/applications/subghz/scenes/subghz_scene_set_seed.c +++ b/applications/subghz/scenes/subghz_scene_set_seed.c @@ -39,8 +39,8 @@ bool subghz_scene_set_seed_on_event(void* context, SceneManagerEvent event) { void subghz_scene_set_seed_on_exit(void* context) { SubGhz* subghz = context; - uint32_t seed = *subghz->txrx->secure_data->seed << 24 | (*subghz->txrx->secure_data->seed+1) << 16 | - (*subghz->txrx->secure_data->seed+2) << 8 | (*subghz->txrx->secure_data->seed+3); + uint32_t seed = subghz->txrx->secure_data->seed[0] << 24 | subghz->txrx->secure_data->seed[1] << 16 | + subghz->txrx->secure_data->seed[2] << 8 | subghz->txrx->secure_data->seed[3]; FURI_LOG_I(TAG, "seed: %8X\n", seed); // Clear view byte_input_set_result_callback(subghz->byte_input, NULL, NULL, NULL, NULL, 0); diff --git a/applications/subghz/scenes/subghz_scene_set_type.c b/applications/subghz/scenes/subghz_scene_set_type.c index 9255a09cf..678d9adde 100644 --- a/applications/subghz/scenes/subghz_scene_set_type.c +++ b/applications/subghz/scenes/subghz_scene_set_type.c @@ -160,13 +160,13 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) { switch(event.event) { case SubmenuIndexFaacSLH: scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSetFix); - uint32_t fix_part = *subghz->txrx->secure_data->fix << 24 | (*subghz->txrx->secure_data->fix+1) << 16 | - (*subghz->txrx->secure_data->fix+2) << 8 | (*subghz->txrx->secure_data->fix+3); + uint32_t fix_part = subghz->txrx->secure_data->fix[0] << 24 | subghz->txrx->secure_data->fix[1] << 16 | + subghz->txrx->secure_data->fix[2] << 8 | subghz->txrx->secure_data->fix[3]; FURI_LOG_I(TAG, "fix: %8X", fix_part); - uint16_t cnt = *subghz->txrx->secure_data->cnt << 8 | (*subghz->txrx->secure_data->cnt+1); + uint16_t cnt = subghz->txrx->secure_data->cnt[0] << 8 | subghz->txrx->secure_data->cnt[1]; FURI_LOG_I(TAG, "cnt: %8X", cnt); - uint32_t seed = *subghz->txrx->secure_data->seed << 24 | (*subghz->txrx->secure_data->seed+1) << 16 | - (*subghz->txrx->secure_data->seed+2) << 8 | (*subghz->txrx->secure_data->seed+3); + uint32_t seed = subghz->txrx->secure_data->seed[0] << 24 | subghz->txrx->secure_data->seed[1] << 16 | + subghz->txrx->secure_data->seed[2] << 8 | subghz->txrx->secure_data->seed[3]; FURI_LOG_I(TAG, "seed: %8X", seed); subghz->txrx->transmitter = subghz_transmitter_alloc_init(subghz->txrx->environment, "Faac SLH");