Merge branch 'flipperdevices:dev' into dev

This commit is contained in:
Eng1n33r
2022-04-14 00:33:03 +03:00
committed by GitHub
221 changed files with 4202 additions and 11704 deletions

View File

@@ -85,7 +85,7 @@ static void subghz_keystore_mess_with_iv(uint8_t* iv) {
// Sharing them will bring some discomfort to legal owners
// And potential legal action against you
// While you reading this code think about your own personal responsibility
asm volatile("nani: \n"
asm volatile("nani%=: \n"
"ldrd r0, r2, [%0, #0x0] \n"
"lsl r1, r0, #8 \n"
"lsl r3, r2, #8 \n"
@@ -606,4 +606,4 @@ bool subghz_keystore_raw_get_data(const char* file_name, size_t offset, uint8_t*
string_clear(str_temp);
return result;
}
}