From 72431de8e560bd2ddf2301c8394c2906e6f4c84e Mon Sep 17 00:00:00 2001 From: X-Dron Date: Fri, 6 Nov 2020 19:59:59 +0300 Subject: [PATCH] Sync with Sergey1560 --- Marlin/Configuration.h | 3 +-- Marlin/Configuration_adv.h | 4 ++-- Marlin/src/MarlinCore.cpp | 8 ++++++-- Marlin/src/core/serial.h | 9 +++++++-- Marlin/src/module/mks_wifi/mks_wifi_sd.cpp | 2 ++ Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp | 14 +++++++++----- Marlin/src/module/mks_wifi/mks_wifi_serial_out.h | 2 ++ Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h | 2 ++ Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 1 + 9 files changed, 32 insertions(+), 13 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d2504207ec..3d0810310c 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -120,8 +120,7 @@ * * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ -#define BAUDRATE 115200 -#define USB_BAUDRATE 250000 +#define BAUDRATE 250000 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 0d22236477..4916722215 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1613,8 +1613,8 @@ //#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA! #define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way #define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps - #define BABYSTEP_MULTIPLICATOR_Z 0.01 // (steps or mm) Steps or millimeter distance for each Z babystep - //#define BABYSTEP_MULTIPLICATOR_XY 10 // (steps or mm) Steps or millimeter distance for each XY babystep + #define BABYSTEP_MULTIPLICATOR_Z 0.01 // (steps or mm) Steps or millimeter distance for each Z babystep + //#define BABYSTEP_MULTIPLICATOR_XY 0.01 // (steps or mm) Steps or millimeter distance for each XY babystep #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 1141740efb..5d5ff62603 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -984,11 +984,15 @@ void setup() { #endif #endif - MYSERIAL0.begin(USB_BAUDRATE); + MYSERIAL0.begin(BAUDRATE); uint32_t serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #if HAS_MULTI_SERIAL - MYSERIAL1.begin(BAUDRATE); + #if ENABLED(MKS_WIFI) + MYSERIAL1.begin(MKS_WIFI_BAUDRATE); + #else + MYSERIAL1.begin(BAUDRATE); + #endif serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #endif diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h index d93f1961df..77711e31b1 100644 --- a/Marlin/src/core/serial.h +++ b/Marlin/src/core/serial.h @@ -58,7 +58,6 @@ extern uint8_t marlin_debug_flags; #else #define SERIAL_OUT(WHAT, V...) do{ \ if (!serial_port_index || serial_port_index == SERIAL_BOTH) (void)MYSERIAL0.WHAT(V); \ - if ( serial_port_index) (void)MYSERIAL1.WHAT(V); \ }while(0) #endif @@ -82,8 +81,14 @@ extern uint8_t marlin_debug_flags; #define SERIAL_ECHO(x) SERIAL_OUT(print, x) #endif +#if ENABLED(MKS_WIFI) +#define SERIAL_ECHO_F(V...) do{ \ + if (!serial_port_index || serial_port_index == SERIAL_BOTH ) SERIAL_OUT(print, V); \ + if ( serial_port_index) mks_wifi_print_f(V); \ +}while(0) +#else #define SERIAL_ECHO_F(V...) SERIAL_OUT(print, V) - +#endif #if ENABLED(MKS_WIFI) #define SERIAL_ECHOLN(x) do{ \ if (!serial_port_index || serial_port_index == SERIAL_BOTH ) SERIAL_OUT(println, x); \ diff --git a/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp b/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp index d9f10c064a..c23db1463c 100644 --- a/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp +++ b/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp @@ -199,6 +199,8 @@ void mks_wifi_start_file_upload(ESP_PROTOC_FRAME *packet){ while(dma_timeout-- > 0){ + iwdg_feed(); + if(DMA1->ISR & DMA_ISR_TCIF5){ DMA1->IFCR = DMA_IFCR_CGIF5|DMA_IFCR_CTEIF5|DMA_IFCR_CHTIF5|DMA_IFCR_CTCIF5; diff --git a/Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp b/Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp index ecd59553aa..09697d1267 100644 --- a/Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp +++ b/Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp @@ -16,6 +16,15 @@ void mks_wifi_print_var(uint8_t count, ...){ va_end(args); } +void mks_wifi_print_f(float f,uint8_t size){ + char str[20]; + char format[10]; + + sprintf(format,"%%0.%df",size); + sprintf(str,format,f); + mks_wifi_out_add((uint8_t *)str, strnlen((char *)str,ESP_PACKET_DATA_MAX_SIZE)); +} + // PRINT functions @@ -88,11 +97,6 @@ void mks_wifi_println(double f){ sprintf(str,"%.2f\n",f); mks_wifi_out_add((uint8_t *)str, strnlen((char *)str,ESP_PACKET_DATA_MAX_SIZE)); } -/* -void mks_wifi_println(int i){ - mks_wifi_println((int32)i); -} -*/ void mks_wifi_println(long int i){ mks_wifi_println((int32)i); } diff --git a/Marlin/src/module/mks_wifi/mks_wifi_serial_out.h b/Marlin/src/module/mks_wifi/mks_wifi_serial_out.h index de0db7d2be..f466b28dfe 100644 --- a/Marlin/src/module/mks_wifi/mks_wifi_serial_out.h +++ b/Marlin/src/module/mks_wifi/mks_wifi_serial_out.h @@ -11,6 +11,8 @@ void mks_wifi_print_var(uint8_t count, ...); +void mks_wifi_print_f(float f,uint8_t size); + void mks_wifi_print(const char *s); void mks_wifi_print(int32 i); void mks_wifi_print(uint32 i); diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h index c22b2df5d4..58f43eda3d 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h @@ -284,6 +284,8 @@ BlTouch #define MKS_WIFI #ifdef MKS_WIFI + + #define MKS_WIFI_BAUDRATE 115200 #undef PLATFORM_M997_SUPPORT #define MKS_WIFI_IO0 PA8 diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h index 5fde0b0d0f..b8ff9df34b 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h @@ -444,6 +444,7 @@ https://easyeda.com/sst78rust/fb4s-led-control */ #define MKS_WIFI #ifdef MKS_WIFI + #define MKS_WIFI_BAUDRATE 115200 #undef PLATFORM_M997_SUPPORT #define MKS_WIFI_IO0 PC13