From bbeb0a5765d554bf6dba931f768cec9cd9022f8a Mon Sep 17 00:00:00 2001 From: Eric Betts Date: Thu, 16 Nov 2023 21:45:02 -0800 Subject: [PATCH] format --- protocol/picopass_poller.h | 6 +++++- seader_worker.c | 35 +++++++++++++++++------------------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/protocol/picopass_poller.h b/protocol/picopass_poller.h index 92f0416..734f440 100644 --- a/protocol/picopass_poller.h +++ b/protocol/picopass_poller.h @@ -48,7 +48,11 @@ void picopass_poller_start( void picopass_poller_stop(PicopassPoller* instance); uint8_t* picopass_poller_get_csn(PicopassPoller* instance); -PicopassError picopass_poller_send_frame(PicopassPoller* instance, BitBuffer* tx_buffer, BitBuffer* rx_buffer, uint32_t fwt_fc); +PicopassError picopass_poller_send_frame( + PicopassPoller* instance, + BitBuffer* tx_buffer, + BitBuffer* rx_buffer, + uint32_t fwt_fc); #ifdef __cplusplus } diff --git a/seader_worker.c b/seader_worker.c index e8a8c42..0d7ff63 100644 --- a/seader_worker.c +++ b/seader_worker.c @@ -452,10 +452,7 @@ void seader_send_nfc_rx(SeaderUartBridge* seader_uart, uint8_t* buffer, size_t l ASN_STRUCT_FREE(asn_DEF_Response, response); } -NfcCommand seader_iso15693_transmit( - Seader* seader, - uint8_t* buffer, - size_t len) { +NfcCommand seader_iso15693_transmit(Seader* seader, uint8_t* buffer, size_t len) { UNUSED(seader); UNUSED(buffer); UNUSED(len); @@ -471,30 +468,33 @@ NfcCommand seader_iso15693_transmit( //seader_worker_fake_epurse_update(buffer, rxBuffer, &recvLen); do { - bit_buffer_append_bytes(tx_buffer, buffer, len); // TODO: could this be a `bit_buffer_copy_bytes` ? - // + bit_buffer_append_bytes( + tx_buffer, buffer, len); // TODO: could this be a `bit_buffer_copy_bytes` ? + // PicopassError error = picopass_poller_send_frame( seader->picopass_poller, tx_buffer, rx_buffer, SEADER_POLLER_MAX_FWT); - if (error == PicopassErrorIncorrectCrc) { - error = PicopassErrorNone; + if(error == PicopassErrorIncorrectCrc) { + error = PicopassErrorNone; } FURI_LOG_I(TAG, "picopass_poller_send_frame %d", error); if(error != PicopassErrorNone) { - ret = NfcCommandStop; - break; + ret = NfcCommandStop; + break; } FURI_LOG_I(TAG, "picopass incoming %d bytes", bit_buffer_get_size_bytes(rx_buffer)); // seader_capture_sio(buffer, len, rxBuffer, credential); - seader_send_nfc_rx(seader_uart, (uint8_t*)bit_buffer_get_data(rx_buffer), bit_buffer_get_size_bytes(rx_buffer)); + seader_send_nfc_rx( + seader_uart, + (uint8_t*)bit_buffer_get_data(rx_buffer), + bit_buffer_get_size_bytes(rx_buffer)); } while(false); bit_buffer_free(tx_buffer); bit_buffer_free(rx_buffer); - return ret; } @@ -562,13 +562,12 @@ NfcCommand seader_parse_nfc_command_transmit(Seader* seader, NFCSend_t* nfcSend) #endif if(frameProtocol == FrameProtocol_iclass) { - return seader_iso15693_transmit( - seader, nfcSend->data.buf, nfcSend->data.size); + return seader_iso15693_transmit(seader, nfcSend->data.buf, nfcSend->data.size); } else if(frameProtocol == FrameProtocol_nfc) { return seader_iso14443a_transmit( seader, nfcSend->data.buf, nfcSend->data.size, (uint16_t)timeOut, nfcSend->format->buf); } else { - FURI_LOG_W(TAG, "unknown frame protocol %lx", frameProtocol); + FURI_LOG_W(TAG, "unknown frame protocol %lx", frameProtocol); } return NfcCommandContinue; } @@ -886,7 +885,6 @@ NfcCommand seader_worker_poller_callback_picopass(PicopassPollerEvent event, voi PicopassPoller* instance = seader->picopass_poller; if(event.type == PicopassPollerEventTypeSuccess) { - if(stage == SeaderPollerEventTypeCardDetect) { FURI_LOG_D(TAG, "Card Detect"); @@ -925,12 +923,13 @@ NfcCommand seader_worker_poller_callback_picopass(PicopassPollerEvent event, voi //stage = SeaderPollerEventTypeComplete; } else { - furi_delay_ms(10); + furi_delay_ms(10); } } else if(stage == SeaderPollerEventTypeComplete) { FURI_LOG_D(TAG, "Complete"); - view_dispatcher_send_custom_event(seader->view_dispatcher, SeaderCustomEventWorkerExit); + view_dispatcher_send_custom_event( + seader->view_dispatcher, SeaderCustomEventWorkerExit); ret = NfcCommandStop; } }