andrey/Marlin_FB4S
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix float print

Browse Source
This commit is contained in:
Sergey
2020-11-06 12:22:32 +03:00
parent 0b8c529c03
commit 7bad09ebe1
5 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Configuration_adv.h
View File

@@ -1612,9 +1612,9 @@
#define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement).
//#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 10 // (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_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 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)

9
Marlin/src/core/serial.h
View File

@@ -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); \

2
Marlin/src/module/mks_wifi/mks_wifi_sd.cpp
View File

@@ -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;

14
Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp
View File

@@ -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);
}

2
Marlin/src/module/mks_wifi/mks_wifi_serial_out.h
View File

@@ -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);