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

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

Browse Source
This commit is contained in:
Willy-JL
2023-10-15 06:25:14 +01:00
parent 04dc10dc7f b87a8ca329
commit f8fc8cbdf8
19 changed files with 105 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/flipper_application/elf/elf_file.c
+1 -1
View File
@@ -853,7 +853,7 @@ ElfProcessSectionResult elf_process_section(
if(process_section(elf->fd, section_header.sh_offset, section_header.sh_size, context)) {
result = ElfProcessSectionResultSuccess;
} else {
result = ElfProcessSectionResultCannotProcess;
result = ElfProcessSectionResultCannotProcess; //-V1048
}
}
lib/flipper_application/elf/elf_file_i.h
+1 -1
View File
@@ -6,7 +6,7 @@
extern "C" {
#endif
DICT_DEF2(AddressCache, int, M_DEFAULT_OPLIST, Elf32_Addr, M_DEFAULT_OPLIST)
DICT_DEF2(AddressCache, int, M_DEFAULT_OPLIST, Elf32_Addr, M_DEFAULT_OPLIST) //-V1048
/**
* Callable elf entry type
lib/lfrfid/lfrfid_worker.c
-1
View File
@@ -118,7 +118,6 @@ void lfrfid_worker_start_thread(LFRFIDWorker* worker) {
}
void lfrfid_worker_stop_thread(LFRFIDWorker* worker) {
furi_assert(worker->mode_index == LFRFIDWorkerIdle);
furi_thread_flags_set(furi_thread_get_id(worker->thread), LFRFIDEventStopThread);
furi_thread_join(worker->thread);
}
lib/nfc/protocols/slix.c
+1 -1
View File
@@ -197,7 +197,7 @@ ReturnCode slix_get_random(NfcVData* data) {
}
ReturnCode slix_unlock(NfcVData* data, uint32_t password_id) {
furi_assert(rand);
furi_assert(data);
uint16_t received = 0;
uint8_t rxBuf[32];
lib/u8g2/u8g2_glue.c
+2 -2
View File
@@ -2,8 +2,8 @@
#include <furi_hal.h>
#define CONTRAST_ERC 31
#define CONTRAST_MGG 27
#define CONTRAST_ERC 32
#define CONTRAST_MGG 28
uint8_t u8g2_gpio_and_delay_stm32(u8x8_t* u8x8, uint8_t msg, uint8_t arg_int, void* arg_ptr) {
UNUSED(u8x8);