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

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

Browse Source
This commit is contained in:
Willy-JL
2023-02-24 01:05:31 +00:00
parent fd7620202a c230d09dad
commit d3f3bf1e11
96 changed files with 8015 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/nfc/nfc_worker.c
+2
View File
@@ -61,6 +61,8 @@ void nfc_worker_start(
while(furi_hal_nfc_is_busy()) {
furi_delay_ms(10);
}
furi_hal_nfc_deinit();
furi_hal_nfc_init();
nfc_worker->callback = callback;
nfc_worker->context = context;
lib/subghz/subghz_file_encoder_worker.c
+5 -5
View File
@@ -16,7 +16,7 @@ struct SubGhzFileEncoderWorker {
FlipperFormat* flipper_format;
volatile bool worker_running;
volatile bool worker_stoping;
volatile bool worker_stopping;
bool level;
bool is_storage_slow;
FuriString* str_data;
@@ -105,7 +105,7 @@ LevelDuration subghz_file_encoder_worker_get_level_duration(void* context) {
} else if(duration == 0) { //-V547
level_duration = level_duration_reset();
FURI_LOG_I(TAG, "Stop transmission");
instance->worker_stoping = true;
instance->worker_stopping = true;
}
return level_duration;
} else {
@@ -142,7 +142,7 @@ static int32_t subghz_file_encoder_worker_thread(void* context) {
//skip the end of the previous line "\n"
stream_seek(stream, 1, StreamOffsetFromCurrent);
res = true;
instance->worker_stoping = false;
instance->worker_stopping = false;
FURI_LOG_I(TAG, "Start transmission");
} while(0);
@@ -174,7 +174,7 @@ static int32_t subghz_file_encoder_worker_thread(void* context) {
}
FURI_LOG_I(TAG, "End transmission");
while(instance->worker_running) {
if(instance->worker_stoping) {
if(instance->worker_stopping) {
if(instance->callback_end) instance->callback_end(instance->context_end);
}
furi_delay_ms(50);
@@ -198,7 +198,7 @@ SubGhzFileEncoderWorker* subghz_file_encoder_worker_alloc() {
instance->str_data = furi_string_alloc();
instance->file_path = furi_string_alloc();
instance->level = false;
instance->worker_stoping = true;
instance->worker_stopping = true;
return instance;
}
lib/subghz/subghz_tx_rx_worker.c
+3 -3
View File
@@ -16,7 +16,7 @@ struct SubGhzTxRxWorker {
FuriStreamBuffer* stream_rx;
volatile bool worker_running;
volatile bool worker_stoping;
volatile bool worker_stopping;
SubGhzTxRxWorkerStatus status;
@@ -166,7 +166,7 @@ static int32_t subghz_tx_rx_worker_thread(void* context) {
subghz_tx_rx_worker_tx(instance, data, size_tx);
}
} else {
//recive
//receive
if(subghz_tx_rx_worker_rx(instance, data, size_rx)) {
if(furi_stream_buffer_spaces_available(instance->stream_rx) >= size_rx[0]) {
if(instance->callback_have_read &&
@@ -211,7 +211,7 @@ SubGhzTxRxWorker* subghz_tx_rx_worker_alloc() {
furi_stream_buffer_alloc(sizeof(uint8_t) * SUBGHZ_TXRX_WORKER_BUF_SIZE, sizeof(uint8_t));
instance->status = SubGhzTxRxWorkerStatusIDLE;
instance->worker_stoping = true;
instance->worker_stopping = true;
return instance;
}