Commit c9fc2819 authored by MagoKimbra's avatar MagoKimbra

Same fix

parent 050b3c40
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
#endif #endif
#if HAS(DIGIPOTSS) #if HAS(DIGIPOTSS)
#include "SPI.h" #include <SPI.h>
#endif #endif
......
...@@ -32,15 +32,15 @@ ...@@ -32,15 +32,15 @@
#endif #endif
#endif #endif
#define START "start" //start for host #define START "start" // start for host
#define OK "ok " //ok answer for host #define OK "ok " // ok answer for host
#define ER "Error: " //error for host #define ER "error: " // error for host
#define WT "wait" //wait for host #define WT "wait" // wait for host
#define DB "echo: " //message for user #define DB "echo: " // message for user
#define RS "Resend: " //resend for host #define RS "Resend: " // resend for host
#define PAUSE "//action:pause" //command for host that support action #define PAUSE "//action:pause" // command for host that support action
#define RESUME "//action:resume" //command for host that support action #define RESUME "//action:resume" // command for host that support action
#define DISCONNECT "//action:disconnect" //command for host that support action #define DISCONNECT "//action:disconnect" // command for host that support action
#define SERIAL_INIT(baud) MYSERIAL.begin(baud), delay(1) #define SERIAL_INIT(baud) MYSERIAL.begin(baud), delay(1)
#define SERIAL_WRITE(x) MYSERIAL.write(x) #define SERIAL_WRITE(x) MYSERIAL.write(x)
......
...@@ -629,7 +629,7 @@ ...@@ -629,7 +629,7 @@
#define HAS_POWER_SWITCH (POWER_SUPPLY > 0 && PIN_EXISTS(PS_ON)) #define HAS_POWER_SWITCH (POWER_SUPPLY > 0 && PIN_EXISTS(PS_ON))
#define HAS_MOTOR_CURRENT_PWM_XY (PIN_EXISTS(MOTOR_CURRENT_PWM_XY)) #define HAS_MOTOR_CURRENT_PWM_XY (PIN_EXISTS(MOTOR_CURRENT_PWM_XY))
#define HAS_DIGIPOTSS (DIGIPOTSS_PIN >= 0) #define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS))
/** /**
* Shorthand for filament sensor and power sensor for ultralcd.cpp, dogm_lcd_implementation.h, ultralcd_implementation_hitachi_HD44780.h * Shorthand for filament sensor and power sensor for ultralcd.cpp, dogm_lcd_implementation.h, ultralcd_implementation_hitachi_HD44780.h
......
This diff is collapsed.
...@@ -111,8 +111,9 @@ ...@@ -111,8 +111,9 @@
#elif ENABLED(NEXTION) #elif ENABLED(NEXTION)
#define LCD_UPDATE_INTERVAL 200 #define LCD_UPDATE_INTERVAL 100
void page0PopCallback(void *ptr);
void setpagePopCallback(void *ptr); void setpagePopCallback(void *ptr);
void hotPopCallback(void *ptr); void hotPopCallback(void *ptr);
void sethotPopCallback(void *ptr); void sethotPopCallback(void *ptr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment