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

Merge branch 'fz-dev' into dev

Browse Source
This commit is contained in:
Eng1n33r
2022-07-20 16:28:48 +03:00
parent 8e7246ae8c ec57dd310a
commit ad970c6c6d
265 changed files with 2576 additions and 3884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/subghz/protocols/princeton_for_testing.c
+2 -3
View File
@@ -76,9 +76,8 @@ void subghz_encoder_princeton_for_testing_set(
instance->count_key = instance->count_key_package + 3;
if((furi_hal_get_tick() - instance->time_stop) < instance->timeout) {
instance->time_stop =
(instance->timeout - (furi_hal_get_tick() - instance->time_stop)) * 1000;
if((furi_get_tick() - instance->time_stop) < instance->timeout) {
instance->time_stop = (instance->timeout - (furi_get_tick() - instance->time_stop)) * 1000;
} else {
instance->time_stop = 0;
}
lib/subghz/protocols/raw.c
+1 -1
View File
@@ -287,7 +287,7 @@ static bool subghz_protocol_encoder_raw_worker_init(SubGhzProtocolEncoderRAW* in
if(subghz_file_encoder_worker_start(
instance->file_worker_encoder, string_get_cstr(instance->file_name))) {
//the worker needs a file in order to open and read part of the file
osDelay(100);
furi_delay_ms(100);
instance->is_runing = true;
} else {
subghz_protocol_encoder_raw_stop(instance);