Wifi lwip

firmware/config/boards/atlas/board.mk

@@ -21,6 +21,8 @@ DDEFS += -DSTM32_LSE_BYPASS
 # We are running on Atlas hardware!
 DDEFS += -DHW_ATLAS=1
 
+include $(PROJECT_DIR)/controllers/modules/ethernet_console/ethernet_console.mk
+
 # Atlas has WiFi
 USE_WIFI = yes
 

firmware/console/console.mk

@@ -9,7 +9,6 @@ CONSOLE_SRC_CPP = $(CONSOLE_COMMON_SRC_CPP) \
 	$(PROJECT_DIR)/console/connector_uart_dma.cpp \
 	$(PROJECT_DIR)/console/binary_log/binary_logging.cpp \
 	$(PROJECT_DIR)/console/binary_log/usb_console.cpp \
-	$(PROJECT_DIR)/console/wifi_console.cpp \
 
 
 CONSOLE_INC=\

firmware/controllers/modules/ethernet_console/ethernet_console.cpp

@@ -2,6 +2,8 @@
 
 #include "lwipthread.h"
 
+#include "wifi_socket.h"
+
 #include "lwip/sockets.h"
 
 #include "thread_controller.h"
@@ -97,7 +99,7 @@ struct EthernetThread : public TunerstudioThread {
 	EthernetThread() : TunerstudioThread("Ethernet Console") { }
 
 	TsChannelBase* setupChannel() override {
-		lwipInit(nullptr);
+		waitForWifiInit();
 
 		sockaddr_in address;
 		address.sin_family = AF_INET;

firmware/ext/atwinc1500/atwinc1500.mk

@@ -24,8 +24,8 @@ ALLCPPSRC += \
 	$(ATWINC_DIR)/driver/source/nmi2c.cpp \
 	$(ATWINC_DIR)/driver/source/nmspi.cpp \
 	$(ATWINC_DIR)/driver/source/nmuart.cpp \
-	$(ATWINC_DIR)/socket/source/socket.cpp \
 	$(ATWINC_DIR)/spi_flash/source/spi_flash.cpp \
+	#$(ATWINC_DIR)/socket/source/socket.cpp \
 
 
 #$(ATWINC_DIR)/driver/source/m2m_ssl.c

firmware/hw_layer/ports/rusefi_halconf.h

@@ -41,7 +41,7 @@
 #define USB_USE_WAIT (EFI_FILE_LOGGING && EFI_USB_SERIAL)
 
 // Ethernet
-#define HAL_USE_MAC MODULE_ETHERNET_CONSOLE
+#define HAL_USE_MAC FALSE
 
 /*===========================================================================*/
 /* Required rusEFI settings                                                  */

firmware/net/lwipopts.h

@@ -58,21 +58,29 @@
 #define LWIP_STATS 0
 
 // In theory we're only talking to a single PC, so we don't need a big ARP table
-#define ARP_TABLE_SIZE 4
+#define ARP_TABLE_SIZE 16
 
 // ascii `rus`
-#define LWIP_ETHADDR_0 0x72
-#define LWIP_ETHADDR_1 0x75
-#define LWIP_ETHADDR_2 0x73
-#define LWIP_ETHADDR_3 0x12
-#define LWIP_ETHADDR_4 0x34
-#define LWIP_ETHADDR_5 0x56
+#define LWIP_ETHADDR_0 0xf8
+#define LWIP_ETHADDR_1 0xf0
+#define LWIP_ETHADDR_2 0x05
+#define LWIP_ETHADDR_3 0xa3
+#define LWIP_ETHADDR_4 0x19
+#define LWIP_ETHADDR_5 0xc2
 
 #include "rusefi_generated.h"
 
 // Ensure that one TCP segment can always fit an entire response to TS - we never need to split a TS packet across multiple frames.
 #define TCP_MSS (BLOCKING_FACTOR + 10)
 
+#define MEM_SIZE 65536
+
+// Crank the TCP timer interval down to 10ms (down from 250ms default)
+// As this sets the lower limit on retransmissions
+// We want retransmissions to be super snappy in case of a dropped frame
+#define TCP_TMR_INTERVAL 10
+#define LWIP_TCP_CLOSE_TIMEOUT_MS_DEFAULT 5000
+
 // Enable the socket recv timeout (and it uses a nonstandard option of int, rather than timeval)
 #define LWIP_SO_SNDRCVTIMEO_NONSTANDARD 1
 #define LWIP_SO_RCVTIMEO 1