Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
leommxj committed Apr 25, 2023
1 parent bc37343 commit 5848865
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 15 deletions.
6 changes: 0 additions & 6 deletions as_reader_worker.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

void as_reader_worker_change_state(AsReaderWorker* as_reader_worker, AsReaderWorkerState state) {
as_reader_worker->state = state;
//scene_manager_set_scene_state(
// as_reader_worker->nfc_relay->scene_manager, NfcRelaySceneAsReader, state);
if(as_reader_worker->callback) as_reader_worker->callback(state, as_reader_worker->nfc_relay);
}

Expand Down Expand Up @@ -55,14 +53,10 @@ int32_t as_reader_worker_task(void* context) {
furi_assert(context);
AsReaderWorker* as_reader_worker = context;

//while(furi_hal_nfc_is_busy()) {
// furi_delay_ms(10);
//}
furi_hal_nfc_deinit();
furi_hal_nfc_init();

FURI_LOG_D(TAG, "Send Ping Packet");
//comm_send_no_data(as_reader_worker->comm, NfcRelayPacketPing);
comm_send_pingpong(as_reader_worker->comm, NfcRelayPacketPing, NfcRelayAsReader);
NfcRelayPacket* packet = NULL;

Expand Down
3 changes: 1 addition & 2 deletions comm.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ void comm_init(Comm* comm) {
if(NfcRelayModeUart == comm->config->mode) {
comm->uart_worker = uart_worker_alloc(comm->config->uart_config);
uart_worker_start(comm->uart_worker);
} // else
} // TODO: else
}

void comm_deinit(Comm* comm) {
Expand Down Expand Up @@ -80,7 +80,6 @@ bool comm_wait_pong(Comm* comm, NfcRelayRole role, NfcRelayRole selfRole) {
if(recv_packet->typ == NfcRelayPacketPing && recv_packet->len == 1 &&
recv_packet->buf[0] == role) {
FURI_LOG_D(TAG, "Recv Ping, Send Pong");
//comm_send_no_data(comm, NfcRelayPacketPong);
comm_send_pingpong(comm, NfcRelayPacketPong, selfRole);
free(recv_packet);
return true;
Expand Down
2 changes: 0 additions & 2 deletions emu_card_worker.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ void emu_card_worker_start(EmuCardWorker* emu_card_worker, FuriHalNfcDevData* de
furi_hal_nfc_deinit();
furi_hal_nfc_init();

//emu_card_worker->dev_data = *dev_data;
memcpy(&emu_card_worker->dev_data, dev_data, sizeof(FuriHalNfcDevData));
furi_thread_start(emu_card_worker->thread);
}
Expand All @@ -202,7 +201,6 @@ int32_t emu_card_worker_task(void* context) {
emu_callback,
emu_card_worker,
5000);
//emu_card_worker->state = EmuCardWorkerStateStop;
}
emu_card_worker->state = EmuCardWorkerStateStop;
FURI_LOG_D(TAG, "task end");
Expand Down
1 change: 0 additions & 1 deletion nfc_relay.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ NfcRelay* nfc_relay_alloc() {
nfc_relay->config->mode = NfcRelayModeUart;
nfc_relay->config->uart_config.baudrate = 38400; //115200;
nfc_relay->config->uart_config.uartId = FuriHalUartIdLPUART1;
//nfc_relay->config->uart_config.uartId = FuriHalUartIdUSART1;

return nfc_relay;
}
Expand Down
4 changes: 0 additions & 4 deletions nfc_relay.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ typedef struct NfcRelayConfig {
typedef struct AsReaderWorker AsReaderWorker;
typedef struct AsCardWorker AsCardWorker;
typedef struct NfcRelay {
//NfcRelayWorker* worker;
ViewDispatcher* view_dispatcher;
Gui* gui;
NotificationApp* notifications;
Expand All @@ -49,9 +48,6 @@ typedef struct NfcRelay {
NfcRelayConfig* config;
AsReaderWorker* as_reader_worker;
AsCardWorker* as_card_worker;
// NfcRelayDevice* dev;
//NfcDevice* nfc_dev;

} NfcRelay;

typedef enum {
Expand Down

0 comments on commit 5848865

Please sign in to comment.