Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-06-07 19:01:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Correct counter work. FAAC SLH bugfix.

Browse Source
This commit is contained in:
Eng1n33r
2023-08-22 20:22:49 +03:00
parent f14ed73dfd
commit 2b5ad4f5af
15 changed files with 115 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/main/subghz/scenes/subghz_scene_config.h
+1
View File
@@ -24,3 +24,4 @@ ADD_SCENE(subghz, decode_raw, DecodeRAW)
ADD_SCENE(subghz, delete_raw, DeleteRAW)
ADD_SCENE(subghz, need_saving, NeedSaving)
ADD_SCENE(subghz, rpc, Rpc)
ADD_SCENE(subghz, edit_cnt, EditCnt)
applications/main/subghz/scenes/subghz_scene_edit_cnt.c
+57
View File
@@ -0,0 +1,57 @@
#include "../subghz_i.h"
#include <lib/subghz/protocols/keeloq.h>
#define TAG "SubGhzEditCnt"
void subghz_scene_edit_cnt_byte_input_callback(void* context) {
SubGhz* subghz = context;
view_dispatcher_send_custom_event(subghz->view_dispatcher, SubGhzCustomEventByteInputDone);
}
void subghz_scene_edit_cnt_on_enter(void* context) {
SubGhz* subghz = context;
// Setup view
ByteInput* byte_input = subghz->byte_input;
byte_input_set_header_text(byte_input, "Enter COUNTER in hex");
byte_input_set_result_callback(
byte_input,
subghz_scene_edit_cnt_byte_input_callback,
NULL,
subghz,
subghz->secure_data->cnt,
4);
view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdByteInput);
}
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);
if(subghz_protocol_keeloq_edit_cnt(subghz->txrx, cnt)) {
FURI_LOG_I(TAG, "Hook func from scene to protocol OK");
};
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneTransmitter);
consumed = true;
}
memset(subghz->secure_data->cnt, 0, sizeof(subghz->secure_data->cnt));
}
return consumed;
}
void subghz_scene_edit_cnt_on_exit(void* context) {
SubGhz* subghz = context;
// Clear view
byte_input_set_result_callback(subghz->byte_input, NULL, NULL, NULL, NULL, 0);
byte_input_set_header_text(subghz->byte_input, "");
}
applications/main/subghz/scenes/subghz_scene_saved_menu.c
+13
View File
@@ -4,6 +4,7 @@ enum SubmenuIndex {
SubmenuIndexEmulate,
SubmenuIndexEdit,
SubmenuIndexDelete,
SubmenuIndesEditCnt,
};
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;
applications/main/subghz/scenes/subghz_scene_set_cnt.c
+1 -1
View File
@@ -29,7 +29,7 @@ void subghz_scene_set_cnt_on_enter(void* context) {
break;
case SubmenuIndexFaacSLH_433:
case SubmenuIndexFaacSLH_868:
byte_input_set_header_text(byte_input, "Enter COUNTER in hex, 20bits");
byte_input_set_header_text(byte_input, "Enter COUNTER in hex");
byte_input_set_result_callback(
byte_input,
subghz_scene_set_cnt_byte_input_callback,
applications/main/subghz/subghz_i.h
+1 -1
View File
@@ -45,7 +45,7 @@
typedef struct {
uint8_t fix[4];
uint8_t cnt[3];
uint8_t cnt[4];
uint8_t seed[4];
} SecureData;
lib/subghz/protocols/alutech_at_4n.c
+1 -1
View File
@@ -274,7 +274,7 @@ static bool subghz_protocol_alutech_at_4n_gen_data(
}
if(instance->generic.cnt < 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) >= 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) > 0xFFFF) {
instance->generic.cnt = 0;
} else {
instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();
lib/subghz/protocols/came_atomo.c
+1 -1
View File
@@ -186,7 +186,7 @@ static void subghz_protocol_encoder_came_atomo_get_upload(
uint8_t pack[8] = {};
if(instance->generic.cnt < 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) >= 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) > 0xFFFF) {
instance->generic.cnt = 0;
} else {
instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();
lib/subghz/protocols/faac_slh.c
+19 -8
View File
@@ -111,14 +111,23 @@ void subghz_protocol_encoder_faac_slh_free(void* context) {
free(instance);
}
static bool subghz_protocol_faac_slh_gen_data(SubGhzProtocolEncoderFaacSLH* instance) {
static bool subghz_protocol_faac_slh_gen_data(SubGhzProtocolEncoderFaacSLH* instance, FlipperFormat* flipper_format) {
FuriString* valid = furi_string_alloc();
if(flipper_format_read_string(flipper_format, "Valid", valid)) {
bvalid = true;
FURI_LOG_I(TAG, "[gen_data] is valid ? : %i", bvalid);
} else {
bvalid = false;
FURI_LOG_I(TAG, "[gen_data] is valid ? : %i", bvalid);
}
furi_string_free(valid);
if(bvalid) {
instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();
FURI_LOG_I(TAG, "[gen_data] TRUE : %i", bvalid);
} else {
// Do not generate new data, send data from buffer
FURI_LOG_I(TAG, "[gen_data] FALSE : %i", bvalid);
//return true;
return true;
}
uint32_t fix = instance->generic.serial << 4 | instance->generic.btn;
uint32_t hop = 0;
@@ -176,7 +185,7 @@ bool subghz_protocol_faac_slh_create_data(
instance->generic.seed = seed;
instance->manufacture_name = manufacture_name;
instance->generic.data_count_bit = 64;
bool res = subghz_protocol_faac_slh_gen_data(instance);
bool res = subghz_protocol_faac_slh_gen_data(instance, flipper_format);
if(res) {
return SubGhzProtocolStatusOk ==
subghz_block_generic_serialize(&instance->generic, flipper_format, preset);
@@ -189,10 +198,10 @@ bool subghz_protocol_faac_slh_create_data(
* @param instance Pointer to a SubGhzProtocolEncoderFaacSLH instance
* @return true On success
*/
static bool subghz_protocol_encoder_faac_slh_get_upload(SubGhzProtocolEncoderFaacSLH* instance) {
static bool subghz_protocol_encoder_faac_slh_get_upload(SubGhzProtocolEncoderFaacSLH* instance, FlipperFormat* flipper_format) {
furi_assert(instance);
subghz_protocol_faac_slh_gen_data(instance);
subghz_protocol_faac_slh_gen_data(instance, flipper_format);
size_t index = 0;
size_t size_upload = 2 + (instance->generic.data_count_bit * 2);
if(size_upload > instance->encoder.size_upload) {
@@ -249,9 +258,10 @@ SubGhzProtocolStatus
FuriString* valid = furi_string_alloc();
if(flipper_format_read_string(flipper_format, "Valid", valid)) {
bvalid = true;
FURI_LOG_I(TAG, "[encoder_des] Valid : %i", bvalid);
FURI_LOG_I(TAG, "[encoder_des] True : %i", bvalid);
} else {
bvalid = false;
FURI_LOG_I(TAG, "[encoder_des] False : %i", bvalid);
}
furi_string_free(valid);
instance->generic.seed = seed_data[0] << 24 | seed_data[1] << 16 | seed_data[2] << 8 |
@@ -264,7 +274,7 @@ SubGhzProtocolStatus
flipper_format_read_uint32(
flipper_format, "Repeat", (uint32_t*)&instance->encoder.repeat, 1);
subghz_protocol_encoder_faac_slh_get_upload(instance);
subghz_protocol_encoder_faac_slh_get_upload(instance, flipper_format);
if(!flipper_format_rewind(flipper_format)) {
FURI_LOG_E(TAG, "Rewind error");
@@ -501,9 +511,10 @@ SubGhzProtocolStatus
FuriString* valid = furi_string_alloc();
if(flipper_format_read_string(flipper_format, "Valid", valid)) {
bvalid = true;
FURI_LOG_I(TAG, "[decoder_des] Valid : %i", bvalid);
FURI_LOG_I(TAG, "[decoder_des] TRUE : %i", bvalid);
} else {
bvalid = false;
FURI_LOG_I(TAG, "[decoder_des] FALSE : %i", bvalid);
}
furi_string_free(valid);
instance->generic.seed = seed_data[0] << 24 | seed_data[1] << 16 | seed_data[2] << 8 |
lib/subghz/protocols/keeloq.c
+9 -1
View File
@@ -170,7 +170,7 @@ static bool subghz_protocol_keeloq_gen_data(
}
if(counter_up && prog_mode == PROG_MODE_OFF) {
if(instance->generic.cnt < 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) >= 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) > 0xFFFF) {
instance->generic.cnt = 0;
} else {
instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();
@@ -454,6 +454,14 @@ 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);
lib/subghz/protocols/keeloq.h
+7
View File
@@ -11,6 +11,13 @@ 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
lib/subghz/protocols/kinggates_stylo_4k.c
+1 -1
View File
@@ -156,7 +156,7 @@ static bool subghz_protocol_kinggates_stylo_4k_gen_data(
instance->generic.cnt = decrypt & 0xFFFF;
if(instance->generic.cnt < 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) >= 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) > 0xFFFF) {
instance->generic.cnt = 0;
} else {
instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();
lib/subghz/protocols/nice_flor_s.c
+1 -1
View File
@@ -152,7 +152,7 @@ static void subghz_protocol_encoder_nice_flor_s_get_upload(
}
if(instance->generic.cnt < 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) >= 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) > 0xFFFF) {
instance->generic.cnt = 0;
} else {
instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();
lib/subghz/protocols/somfy_keytis.c
+1 -1
View File
@@ -131,7 +131,7 @@ static bool
instance->generic.serial = data & 0xFFFFFF;
if(instance->generic.cnt < 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) >= 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) > 0xFFFF) {
instance->generic.cnt = 0;
} else {
instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();
lib/subghz/protocols/somfy_telis.c
+1 -1
View File
@@ -125,7 +125,7 @@ static bool subghz_protocol_somfy_telis_gen_data(
btn = subghz_protocol_somfy_telis_get_btn_code();
if(instance->generic.cnt < 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) >= 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) > 0xFFFF) {
instance->generic.cnt = 0;
} else {
instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();
lib/subghz/protocols/star_line.c
+1 -1
View File
@@ -130,7 +130,7 @@ void subghz_protocol_encoder_star_line_free(void* context) {
static bool
subghz_protocol_star_line_gen_data(SubGhzProtocolEncoderStarLine* instance, uint8_t btn) {
if(instance->generic.cnt < 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) >= 0xFFFF) {
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) > 0xFFFF) {
instance->generic.cnt = 0;
} else {
instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();