From df75a9804f75da04245d5a8a6d65d39eea2295b5 Mon Sep 17 00:00:00 2001 From: Paciente8159 Date: Tue, 5 Mar 2024 09:31:16 +0000 Subject: [PATCH] fixed RP2040 wifi and telnet connection - initialize EEPROM before wifi connection to allow proper wifi startup connection (saved parameters) - removed duplicate local buffer for telnet connection --- uCNC/src/hal/mcus/rp2040/mcu_rp2040.c | 7 ++++--- uCNC/src/hal/mcus/rp2040/rp2040_arduino.cpp | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/uCNC/src/hal/mcus/rp2040/mcu_rp2040.c b/uCNC/src/hal/mcus/rp2040/mcu_rp2040.c index 68c9bf5d..04de583a 100644 --- a/uCNC/src/hal/mcus/rp2040/mcu_rp2040.c +++ b/uCNC/src/hal/mcus/rp2040/mcu_rp2040.c @@ -308,6 +308,10 @@ void mcu_init(void) #ifdef IC74HC595_CUSTOM_SHIFT_IO ic74hc595_pio_init(); #endif +#ifndef RAM_ONLY_SETTINGS + rp2040_eeprom_init(NVM_STORAGE_SIZE); // 2K Emulated EEPROM +#endif + mcu_usart_init(); pinMode(LED_BUILTIN, OUTPUT); @@ -320,9 +324,6 @@ void mcu_init(void) servo_alarm.alarm_cb = &mcu_clear_servos; #endif -#ifndef RAM_ONLY_SETTINGS - rp2040_eeprom_init(NVM_STORAGE_SIZE); // 2K Emulated EEPROM -#endif #ifdef MCU_HAS_SPI mcu_spi_config(SPI_FREQ, SPI_MODE); #endif diff --git a/uCNC/src/hal/mcus/rp2040/rp2040_arduino.cpp b/uCNC/src/hal/mcus/rp2040/rp2040_arduino.cpp index d1eebc58..27df1d80 100644 --- a/uCNC/src/hal/mcus/rp2040/rp2040_arduino.cpp +++ b/uCNC/src/hal/mcus/rp2040/rp2040_arduino.cpp @@ -845,8 +845,6 @@ uint8_t rp2040_wifi_bt_read(void) void rp2040_wifi_bt_process(void) { #ifdef MCU_HAS_WIFI - DECL_BUFFER(uint8_t, wifi_rx, RX_BUFFER_SIZE); - if (rp2040_wifi_clientok()) { while (server_client.available() > 0)