mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Project: enum cast fix. Makefile: blackmagic rule in global makefile (#819)

Browse Source
This commit is contained in:
あく 2021-11-15 22:55:25 +03:00 committed by GitHub
parent 2e46ec36a7
commit 1571d4ec54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -26,6 +26,10 @@ flash: bootloader_flash firmware_flash
debug: debug:
$(MAKE) -C firmware -j$(NPROCS) debug $(MAKE) -C firmware -j$(NPROCS) debug
.PHONY: blackmagic
blackmagic:
$(MAKE) -C firmware -j$(NPROCS) blackmagic
.PHONY: wipe .PHONY: wipe
wipe: wipe:
$(PROJECT_ROOT)/scripts/flash.py wipe $(PROJECT_ROOT)/scripts/flash.py wipe

3
applications/subghz/subghz_i.c
View File

@ -345,8 +345,7 @@ bool subghz_save_protocol_to_file(SubGhz* subghz, const char* dev_name) {
break; break;
} }
if(!flipper_file_write_uint32( if(!flipper_file_write_uint32(flipper_file, "Frequency", &subghz->txrx->frequency, 1)) {
flipper_file, "Frequency", (uint32_t*)&subghz->txrx->frequency, 1)) {
FURI_LOG_E(SUBGHZ_PARSER_TAG, "Unable to add Frequency"); FURI_LOG_E(SUBGHZ_PARSER_TAG, "Unable to add Frequency");
break; break;
} }

3
lib/subghz/protocols/subghz_protocol_common.c
View File

@ -178,8 +178,9 @@ bool subghz_protocol_common_to_save_file(SubGhzProtocolCommon* instance, Flipper
FURI_LOG_E(SUBGHZ_PARSER_TAG, "Unable to add Protocol"); FURI_LOG_E(SUBGHZ_PARSER_TAG, "Unable to add Protocol");
break; break;
} }
uint32_t temp = instance->code_last_count_bit;
if(!flipper_file_write_uint32( if(!flipper_file_write_uint32(
flipper_file, "Bit", (uint32_t*)&instance->code_last_count_bit, 1)) { flipper_file, "Bit", &temp, 1)) {
FURI_LOG_E(SUBGHZ_PARSER_TAG, "Unable to add Bit"); FURI_LOG_E(SUBGHZ_PARSER_TAG, "Unable to add Bit");
break; break;
} }

2
lib/subghz/protocols/subghz_protocol_princeton.c
View File

@ -298,7 +298,7 @@ bool subghz_decoder_princeton_to_save_file(
FlipperFile* flipper_file) { FlipperFile* flipper_file) {
bool res = subghz_protocol_common_to_save_file((SubGhzProtocolCommon*)instance, flipper_file); bool res = subghz_protocol_common_to_save_file((SubGhzProtocolCommon*)instance, flipper_file);
if(res) { if(res) {
res = flipper_file_write_uint32(flipper_file, "TE", (uint32_t*)&instance->te, 1); res = flipper_file_write_uint32(flipper_file, "TE", &instance->te, 1);
if(!res) FURI_LOG_E(SUBGHZ_PARSER_TAG, "Unable to add Te"); if(!res) FURI_LOG_E(SUBGHZ_PARSER_TAG, "Unable to add Te");
} }
return res; return res;

2
lib/subghz/protocols/subghz_protocol_raw.c
View File

@ -177,7 +177,7 @@ bool subghz_protocol_raw_save_to_file_init(
break; break;
} }
if(!flipper_file_write_uint32(instance->flipper_file, "Frequency", (uint32_t*)&frequency, 1)) { if(!flipper_file_write_uint32(instance->flipper_file, "Frequency", &frequency, 1)) {
FURI_LOG_E(TAG, "Unable to add Frequency"); FURI_LOG_E(TAG, "Unable to add Frequency");
break; break;
} }

8
lib/subghz/subghz_keystore.c
View File

@ -248,8 +248,8 @@ bool subghz_keystore_save(SubGhzKeystore* instance, const char* file_name, uint8
FURI_LOG_E(TAG, "Unable to add header"); FURI_LOG_E(TAG, "Unable to add header");
break; break;
} }
SubGhzKeystoreEncryption encryption = SubGhzKeystoreEncryptionAES256; uint32_t encryption = SubGhzKeystoreEncryptionAES256;
if(!flipper_file_write_uint32(flipper_file, "Encryption", (uint32_t*)&encryption, 1)) { if(!flipper_file_write_uint32(flipper_file, "Encryption", &encryption, 1)) {
FURI_LOG_E(TAG, "Unable to add Encryption"); FURI_LOG_E(TAG, "Unable to add Encryption");
break; break;
} }
@ -379,9 +379,9 @@ bool subghz_keystore_raw_encrypted_save(
FURI_LOG_E(TAG, "Unable to add header"); FURI_LOG_E(TAG, "Unable to add header");
break; break;
} }
SubGhzKeystoreEncryption tmp_encryption = SubGhzKeystoreEncryptionAES256; uint32_t encryption = SubGhzKeystoreEncryptionAES256;
if(!flipper_file_write_uint32( if(!flipper_file_write_uint32(
output_flipper_file, "Encryption", (uint32_t*)&tmp_encryption, 1)) { output_flipper_file, "Encryption", &encryption, 1)) {
FURI_LOG_E(TAG, "Unable to add Encryption"); FURI_LOG_E(TAG, "Unable to add Encryption");
break; break;
} }

2
make/rules.mk
View File

@ -100,7 +100,7 @@ debug_other:
-ex "svd_load $(SVD_FILE)" \ -ex "svd_load $(SVD_FILE)" \
blackmagic: flash blackmagic:
arm-none-eabi-gdb-py \ arm-none-eabi-gdb-py \
-ex 'target extended-remote $(BLACKMAGIC)' \ -ex 'target extended-remote $(BLACKMAGIC)' \
-ex 'monitor swdp_scan' \ -ex 'monitor swdp_scan' \