From 18b53d6745723fa61363139cf00b0401a5bdd557 Mon Sep 17 00:00:00 2001 From: Jon Lamb Date: Tue, 17 Oct 2023 06:38:24 -0700 Subject: [PATCH] Revert enc28j60 workarounds, my hw is flaky --- README.md | 2 +- firmware/src/net/eth.rs | 4 ---- firmware/src/tasks/net.rs | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/README.md b/README.md index d82ff30..b12a0bb 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ The following environment variables can be set: * `AIR_GRADIENT_BROADCAST_PORT` : The port number to send the broadcast protocol data on, default is `32100` * `AIR_GRADIENT_BROADCAST_ADDRESS` : The IP address to send the broadcast protocol data to, default is `255.255.255.255` * `AIR_GRADIENT_DEVICE_PORT` : The port number the device protocol socket listens on, default is `32101` -* `AIR_GRADIENT_LOG` : The max log level filter to use, default is `Info` +* `AIR_GRADIENT_LOG` : The max log level filter to use, default is `INFO` ## FOTA Updating diff --git a/firmware/src/net/eth.rs b/firmware/src/net/eth.rs index 36f04d0..05753de 100644 --- a/firmware/src/net/eth.rs +++ b/firmware/src/net/eth.rs @@ -57,10 +57,6 @@ impl<'buf> Device for Eth<'buf> { type TxToken<'a> = TxToken<'a> where Self: 'a; fn receive(&mut self, _timestamp: Instant) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> { - // TODO - reading EIR and/or ESTAT appears to resolve rx occasionally not firing? - let _estat = self.drv.estat().ok(); - let _eir = self.drv.eir().ok(); - match self.drv.next_packet() { Ok(Some(packet)) => { let pkt_len = packet.len() as usize; diff --git a/firmware/src/tasks/net.rs b/firmware/src/tasks/net.rs index 7fc8893..3089eae 100644 --- a/firmware/src/tasks/net.rs +++ b/firmware/src/tasks/net.rs @@ -55,11 +55,6 @@ pub(crate) fn ipstack_poll_timer_task(ctx: ipstack_poll_timer_task::Context) { pub(crate) fn eth_gpio_interrupt_handler_task(ctx: eth_gpio_interrupt_handler_task::Context) { let eth = ctx.shared.eth; - - // TODO - reading EIR and/or ESTAT appears to resolve rx occasionally not firing? - let _estat = eth.driver().estat().ok(); - let _eir = eth.driver().eir().ok(); - if eth.driver().interrupt_pending() { eth.driver().int_pin().clear_interrupt_pending_bit(); ipstack_poll_task::spawn().ok();