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

Merge branch 'dev' of https://github.com/Dmitry422/unleashed-firmware into dev

Browse Source
This commit is contained in:
Dmitry422
2026-02-02 01:22:47 +07:00
parent 1d32d1de5c d0bfce5fdd
commit e4aac3dbc6
5 changed files with 87 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
lib/subghz/protocols/phoenix_v2.c
View File

@@ -91,6 +91,8 @@ void subghz_protocol_encoder_phoenix_v2_free(void* context) {
free(instance);
}
static uint8_t v2_phoenix_counter_mode = 0;
// Pre define functions
static uint16_t subghz_protocol_phoenix_v2_encrypt_counter(uint64_t full_key, uint16_t counter);
static void subghz_protocol_phoenix_v2_check_remote_controller(SubGhzBlockGeneric* instance);
@@ -256,18 +258,30 @@ static bool
FURI_LOG_D(TAG, "Button sucessfully changed to 0x%X", btn);
// Reconstruction of the data
// Check for OFEX (overflow experimental) mode
if(furi_hal_subghz_get_rolling_counter_mult() != -0x7FFFFFFF) {
// standart counter mode. PULL data from subghz_block_generic_global variables
if(!subghz_block_generic_global_counter_override_get(&instance->generic.cnt)) {
// if counter_override_get return FALSE then counter was not changed and we increase counter by standart mult value
if((instance->generic.cnt + furi_hal_subghz_get_rolling_counter_mult()) > 0xFFFF) {
if(v2_phoenix_counter_mode == 0) {
// Check for OFEX (overflow experimental) mode
if(furi_hal_subghz_get_rolling_counter_mult() != -0x7FFFFFFF) {
// standart counter mode. PULL data from subghz_block_generic_global variables
if(!subghz_block_generic_global_counter_override_get(&instance->generic.cnt)) {
// if counter_override_get return FALSE then counter was not changed and we increase counter by standart mult value
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();
}
}
} else {
if((instance->generic.cnt + 0x1) > 0xFFFF) {
instance->generic.cnt = 0;
} else if(instance->generic.cnt >= 0x1 && instance->generic.cnt != 0xFFFE) {
instance->generic.cnt = 0xFFFE;
} else {
instance->generic.cnt += furi_hal_subghz_get_rolling_counter_mult();
instance->generic.cnt++;
}
}
} else {
} else if(v2_phoenix_counter_mode == 1) {
// Mode 1 (ofex like)
// 0000 / 0001 / FFFE / FFFF
if((instance->generic.cnt + 0x1) > 0xFFFF) {
instance->generic.cnt = 0;
} else if(instance->generic.cnt >= 0x1 && instance->generic.cnt != 0xFFFE) {
@@ -275,6 +289,14 @@ static bool
} else {
instance->generic.cnt++;
}
} else {
// Mode 2 (0 to 4)
// 0x0000 / 0x0001 / 0x0002 / 0x0003 / 0x0004
if(instance->generic.cnt >= 0x0004) {
instance->generic.cnt = 0;
} else {
instance->generic.cnt++;
}
}
uint64_t local_data_rev = subghz_protocol_blocks_reverse_key(
@@ -330,6 +352,18 @@ SubGhzProtocolStatus
flipper_format_read_uint32(
flipper_format, "Repeat", (uint32_t*)&instance->encoder.repeat, 1);
if(!flipper_format_rewind(flipper_format)) {
FURI_LOG_E(TAG, "Rewind error");
break;
}
uint32_t tmp_counter_mode;
if(flipper_format_read_uint32(flipper_format, "CounterMode", &tmp_counter_mode, 1)) {
v2_phoenix_counter_mode = (uint8_t)tmp_counter_mode;
} else {
v2_phoenix_counter_mode = 0;
}
subghz_protocol_phoenix_v2_check_remote_controller(&instance->generic);
if(!subghz_protocol_encoder_phoenix_v2_get_upload(instance)) {
@@ -337,6 +371,11 @@ SubGhzProtocolStatus
break;
}
if(!flipper_format_rewind(flipper_format)) {
FURI_LOG_E(TAG, "Rewind error");
break;
}
uint8_t key_data[sizeof(uint64_t)] = {0};
for(size_t i = 0; i < sizeof(uint64_t); i++) {
key_data[sizeof(uint64_t) - i - 1] = (instance->generic.data >> i * 8) & 0xFF;
@@ -586,10 +625,25 @@ SubGhzProtocolStatus
subghz_protocol_decoder_phoenix_v2_deserialize(void* context, FlipperFormat* flipper_format) {
furi_assert(context);
SubGhzProtocolDecoderPhoenix_V2* instance = context;
return subghz_block_generic_deserialize_check_count_bit(
SubGhzProtocolStatus ret = SubGhzProtocolStatusError;
ret = subghz_block_generic_deserialize_check_count_bit(
&instance->generic,
flipper_format,
subghz_protocol_phoenix_v2_const.min_count_bit_for_found);
if(!flipper_format_rewind(flipper_format)) {
FURI_LOG_E(TAG, "Rewind error");
return SubGhzProtocolStatusError;
}
uint32_t tmp_counter_mode;
if(flipper_format_read_uint32(flipper_format, "CounterMode", &tmp_counter_mode, 1)) {
v2_phoenix_counter_mode = (uint8_t)tmp_counter_mode;
} else {
v2_phoenix_counter_mode = 0;
}
return ret;
}
void subghz_protocol_decoder_phoenix_v2_get_string(void* context, FuriString* output) {