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

Comment debug logs in digital signal

Browse Source 
and comment some debug logs in nfc v
This commit is contained in:
MX
2023-05-28 19:24:21 +03:00
parent 0d1fea9861
commit 7b426b936e
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/digital_signal/digital_signal.c
View File

@@ -215,12 +215,12 @@ void digital_signal_prepare_arr(DigitalSignal* signal) {
uint32_t edge_scaled = (internals->factor * signal->edge_timings[pos]) / (1024 * 1024); uint32_t edge_scaled = (internals->factor * signal->edge_timings[pos]) / (1024 * 1024);
uint32_t pulse_duration = edge_scaled + internals->reload_reg_remainder; uint32_t pulse_duration = edge_scaled + internals->reload_reg_remainder;
if(pulse_duration < 10 || pulse_duration > 10000000) { if(pulse_duration < 10 || pulse_duration > 10000000) {
FURI_LOG_D( /*FURI_LOG_D(
TAG, TAG,
"[prepare] pulse_duration out of range: %lu = %lu * %llu", "[prepare] pulse_duration out of range: %lu = %lu * %llu",
pulse_duration, pulse_duration,
signal->edge_timings[pos], signal->edge_timings[pos],
internals->factor); internals->factor);*/
pulse_duration = 100; pulse_duration = 100;
} }
uint32_t pulse_ticks = (pulse_duration + T_TIM_DIV2) / T_TIM; uint32_t pulse_ticks = (pulse_duration + T_TIM_DIV2) / T_TIM;
@@ -482,13 +482,13 @@ static void digital_sequence_finish(DigitalSequence* sequence) {
prev_timer = DWT->CYCCNT; prev_timer = DWT->CYCCNT;
} }
if(DWT->CYCCNT - prev_timer > wait_ticks) { if(DWT->CYCCNT - prev_timer > wait_ticks) {
FURI_LOG_D( /*FURI_LOG_D(
TAG, TAG,
"[SEQ] hung %lu ms in finish (ARR 0x%08lx, read %lu, write %lu)", "[SEQ] hung %lu ms in finish (ARR 0x%08lx, read %lu, write %lu)",
wait_ms, wait_ms,
TIM2->ARR, TIM2->ARR,
dma_buffer->read_pos, dma_buffer->read_pos,
dma_buffer->write_pos); dma_buffer->write_pos);*/
break; break;
} }
} while(1); } while(1);
@@ -516,13 +516,13 @@ static void digital_sequence_queue_pulse(DigitalSequence* sequence, uint32_t len
prev_timer = DWT->CYCCNT; prev_timer = DWT->CYCCNT;
} }
if(DWT->CYCCNT - prev_timer > wait_ticks) { if(DWT->CYCCNT - prev_timer > wait_ticks) {
FURI_LOG_D( /*FURI_LOG_D(
TAG, TAG,
"[SEQ] hung %lu ms in queue (ARR 0x%08lx, read %lu, write %lu)", "[SEQ] hung %lu ms in queue (ARR 0x%08lx, read %lu, write %lu)",
wait_ms, wait_ms,
TIM2->ARR, TIM2->ARR,
dma_buffer->read_pos, dma_buffer->read_pos,
dma_buffer->write_pos); dma_buffer->write_pos);*/
break; break;
} }
} while(1); } while(1);

24
lib/nfc/protocols/nfcv.c
View File

@@ -52,7 +52,7 @@ ReturnCode nfcv_read_blocks(NfcVReader* reader, NfcVData* nfcv_data) {
uint16_t received = 0; uint16_t received = 0;
for(size_t block = 0; block < nfcv_data->block_num; block++) { for(size_t block = 0; block < nfcv_data->block_num; block++) {
uint8_t rxBuf[32]; uint8_t rxBuf[32];
FURI_LOG_D(TAG, "Reading block %d/%d", block, (nfcv_data->block_num - 1)); //FURI_LOG_D(TAG, "Reading block %d/%d", block, (nfcv_data->block_num - 1));
ReturnCode ret = ERR_NONE; ReturnCode ret = ERR_NONE;
for(int tries = 0; tries < NFCV_COMMAND_RETRIES; tries++) { for(int tries = 0; tries < NFCV_COMMAND_RETRIES; tries++) {
@@ -64,18 +64,18 @@ ReturnCode nfcv_read_blocks(NfcVReader* reader, NfcVData* nfcv_data) {
} }
} }
if(ret != ERR_NONE) { if(ret != ERR_NONE) {
FURI_LOG_D(TAG, "failed to read: %d", ret); //FURI_LOG_D(TAG, "failed to read: %d", ret);
return ret; return ret;
} }
memcpy( memcpy(
&(nfcv_data->data[block * nfcv_data->block_size]), &rxBuf[1], nfcv_data->block_size); &(nfcv_data->data[block * nfcv_data->block_size]), &rxBuf[1], nfcv_data->block_size);
FURI_LOG_D( /*FURI_LOG_D(
TAG, TAG,
" %02X %02X %02X %02X", " %02X %02X %02X %02X",
nfcv_data->data[block * nfcv_data->block_size + 0], nfcv_data->data[block * nfcv_data->block_size + 0],
nfcv_data->data[block * nfcv_data->block_size + 1], nfcv_data->data[block * nfcv_data->block_size + 1],
nfcv_data->data[block * nfcv_data->block_size + 2], nfcv_data->data[block * nfcv_data->block_size + 2],
nfcv_data->data[block * nfcv_data->block_size + 3]); nfcv_data->data[block * nfcv_data->block_size + 3]);*/
} }
return ERR_NONE; return ERR_NONE;
@@ -86,7 +86,7 @@ ReturnCode nfcv_read_sysinfo(FuriHalNfcDevData* nfc_data, NfcVData* nfcv_data) {
uint16_t received = 0; uint16_t received = 0;
ReturnCode ret = ERR_NONE; ReturnCode ret = ERR_NONE;
FURI_LOG_D(TAG, "Read SYSTEM INFORMATION..."); //FURI_LOG_D(TAG, "Read SYSTEM INFORMATION...");
for(int tries = 0; tries < NFCV_COMMAND_RETRIES; tries++) { for(int tries = 0; tries < NFCV_COMMAND_RETRIES; tries++) {
/* TODO: needs proper abstraction via fury_hal(_ll)_* */ /* TODO: needs proper abstraction via fury_hal(_ll)_* */
@@ -110,7 +110,7 @@ ReturnCode nfcv_read_sysinfo(FuriHalNfcDevData* nfc_data, NfcVData* nfcv_data) {
nfcv_data->block_num = rxBuf[NFCV_UID_LENGTH + 4] + 1; nfcv_data->block_num = rxBuf[NFCV_UID_LENGTH + 4] + 1;
nfcv_data->block_size = rxBuf[NFCV_UID_LENGTH + 5] + 1; nfcv_data->block_size = rxBuf[NFCV_UID_LENGTH + 5] + 1;
nfcv_data->ic_ref = rxBuf[NFCV_UID_LENGTH + 6]; nfcv_data->ic_ref = rxBuf[NFCV_UID_LENGTH + 6];
FURI_LOG_D( /*FURI_LOG_D(
TAG, TAG,
" UID: %02X %02X %02X %02X %02X %02X %02X %02X", " UID: %02X %02X %02X %02X %02X %02X %02X %02X",
nfc_data->uid[0], nfc_data->uid[0],
@@ -128,10 +128,10 @@ ReturnCode nfcv_read_sysinfo(FuriHalNfcDevData* nfc_data, NfcVData* nfcv_data) {
nfcv_data->afi, nfcv_data->afi,
nfcv_data->block_num, nfcv_data->block_num,
nfcv_data->block_size, nfcv_data->block_size,
nfcv_data->ic_ref); nfcv_data->ic_ref);*/
return ret; return ret;
} }
FURI_LOG_D(TAG, "Failed: %d", ret); //FURI_LOG_D(TAG, "Failed: %d", ret);
return ret; return ret;
} }
@@ -1081,9 +1081,9 @@ void nfcv_emu_sniff_packet(
break; break;
} }
if(strlen(nfcv_data->last_command) > 0) { /*if(strlen(nfcv_data->last_command) > 0) {
FURI_LOG_D(TAG, "Received command %s", nfcv_data->last_command); FURI_LOG_D(TAG, "Received command %s", nfcv_data->last_command);
} }*/
} }
void nfcv_emu_init(FuriHalNfcDevData* nfc_data, NfcVData* nfcv_data) { void nfcv_emu_init(FuriHalNfcDevData* nfc_data, NfcVData* nfcv_data) {
@@ -1137,7 +1137,7 @@ void nfcv_emu_init(FuriHalNfcDevData* nfc_data, NfcVData* nfcv_data) {
} }
} }
FURI_LOG_D(TAG, "Starting NfcV emulation"); /*FURI_LOG_D(TAG, "Starting NfcV emulation");
FURI_LOG_D( FURI_LOG_D(
TAG, TAG,
" UID: %02X %02X %02X %02X %02X %02X %02X %02X", " UID: %02X %02X %02X %02X %02X %02X %02X %02X",
@@ -1148,7 +1148,7 @@ void nfcv_emu_init(FuriHalNfcDevData* nfc_data, NfcVData* nfcv_data) {
nfc_data->uid[4], nfc_data->uid[4],
nfc_data->uid[5], nfc_data->uid[5],
nfc_data->uid[6], nfc_data->uid[6],
nfc_data->uid[7]); nfc_data->uid[7]);*/
switch(nfcv_data->sub_type) { switch(nfcv_data->sub_type) {
case NfcVTypeSlixL: case NfcVTypeSlixL: