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

rollback

Browse Source
This commit is contained in:
r3df0xx
2022-04-26 14:45:34 +03:00
parent 6b3faefcca
commit 941ff162e8
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/subghz/scenes/subghz_scene_set_seed.c
View File

@@ -44,7 +44,6 @@ bool subghz_scene_set_seed_on_event(void* context, SceneManagerEvent event) {
subghz_transmitter_alloc_init(subghz->txrx->environment, "Faac SLH"); subghz_transmitter_alloc_init(subghz->txrx->environment, "Faac SLH");
if(subghz->txrx->transmitter) { if(subghz->txrx->transmitter) {
subghz_protocol_faac_slh_create_data( subghz_protocol_faac_slh_create_data(
subghz->txrx->transmitter->protocol_instance,
subghz->txrx->transmitter->protocol_instance, subghz->txrx->transmitter->protocol_instance,
subghz->txrx->fff_data, subghz->txrx->fff_data,
fix_part >> 4, fix_part >> 4,

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

@@ -83,7 +83,6 @@ const SubGhzProtocol subghz_protocol_faac_slh = {
* @param instance Pointer to a SubGhzBlockGeneric* instance * @param instance Pointer to a SubGhzBlockGeneric* instance
* @param keystore Pointer to a SubGhzKeystore* instance * @param keystore Pointer to a SubGhzKeystore* instance
* @param manufacture_name * @param manufacture_name
* @param seed Seed 32bit
*/ */
static void subghz_protocol_faac_slh_check_remote_controller static void subghz_protocol_faac_slh_check_remote_controller
(SubGhzBlockGeneric* instance, (SubGhzBlockGeneric* instance,
@@ -163,7 +162,6 @@ static bool subghz_protocol_faac_slh_gen_data(SubGhzProtocolEncoderFaacSLH* inst
bool subghz_protocol_faac_slh_create_data( bool subghz_protocol_faac_slh_create_data(
void* context, void* context,
void* context2,
FlipperFormat* flipper_format, FlipperFormat* flipper_format,
uint32_t serial, uint32_t serial,
uint8_t btn, uint8_t btn,
@@ -173,14 +171,11 @@ bool subghz_protocol_faac_slh_create_data(
uint32_t frequency, uint32_t frequency,
FuriHalSubGhzPreset preset) { FuriHalSubGhzPreset preset) {
furi_assert(context); furi_assert(context);
furi_assert(context2);
SubGhzProtocolEncoderFaacSLH* instance = context; SubGhzProtocolEncoderFaacSLH* instance = context;
SubGhzProtocolDecoderFaacSLH* instance2 = context2;
instance->generic.serial = serial; instance->generic.serial = serial;
instance->generic.btn = btn; instance->generic.btn = btn;
instance->generic.cnt = cnt; instance->generic.cnt = cnt;
instance->generic.seed = seed; instance->generic.seed = seed;
instance2->generic.seed = instance->generic.seed;
instance->manufacture_name = manufacture_name; instance->manufacture_name = manufacture_name;
instance->generic.data_count_bit = 64; instance->generic.data_count_bit = 64;
bool res = subghz_protocol_faac_slh_gen_data(instance); bool res = subghz_protocol_faac_slh_gen_data(instance);
@@ -402,6 +397,7 @@ static void subghz_protocol_faac_slh_check_remote_controller
(SubGhzBlockGeneric* instance, (SubGhzBlockGeneric* instance,
SubGhzKeystore* keystore, SubGhzKeystore* keystore,
const char** manufacture_name) { const char** manufacture_name) {
FURI_LOG_I(TAG, "SEED (decrypt init): %8X\n", instance->seed); FURI_LOG_I(TAG, "SEED (decrypt init): %8X\n", instance->seed);
uint32_t code_fix = instance->data >> 32; uint32_t code_fix = instance->data >> 32;
uint32_t code_hop = instance->data & 0xFFFFFFFF; uint32_t code_hop = instance->data & 0xFFFFFFFF;
@@ -465,8 +461,6 @@ void subghz_protocol_decoder_faac_slh_get_string(void* context, string_t output)
furi_assert(context); furi_assert(context);
SubGhzProtocolDecoderFaacSLH* instance = context; SubGhzProtocolDecoderFaacSLH* instance = context;
subghz_protocol_faac_slh_check_remote_controller(&instance->generic, instance->keystore, &instance->manufacture_name); subghz_protocol_faac_slh_check_remote_controller(&instance->generic, instance->keystore, &instance->manufacture_name);
//uint64_t code_found_reverse = subghz_protocol_blocks_reverse_key(
//instance->generic.data, instance->generic.data_count_bit);
uint32_t code_fix = instance->generic.data >> 32; uint32_t code_fix = instance->generic.data >> 32;
uint32_t code_hop = instance->generic.data & 0xFFFFFFFF; uint32_t code_hop = instance->generic.data & 0xFFFFFFFF;

2
lib/subghz/protocols/faac_slh.h
View File

@@ -27,7 +27,6 @@ void subghz_protocol_encoder_faac_slh_free(void* context);
/** /**
* Key generation from simple data. * Key generation from simple data.
* @param context Pointer to a SubGhzProtocolEncoderFaacSLH instance * @param context Pointer to a SubGhzProtocolEncoderFaacSLH instance
* @param context2 Pointer to a SubGhzProtocolDecoderFaacSLH instance
* @param flipper_format Pointer to a FlipperFormat instance * @param flipper_format Pointer to a FlipperFormat instance
* @param serial Serial number, 28 bit * @param serial Serial number, 28 bit
* @param btn Button number, 4 bit * @param btn Button number, 4 bit
@@ -40,7 +39,6 @@ void subghz_protocol_encoder_faac_slh_free(void* context);
*/ */
bool subghz_protocol_faac_slh_create_data( bool subghz_protocol_faac_slh_create_data(
void* context, void* context,
void* context2,
FlipperFormat* flipper_format, FlipperFormat* flipper_format,
uint32_t serial, uint32_t serial,
uint8_t btn, uint8_t btn,