Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
c9fc2819
Commit
c9fc2819
authored
Sep 03, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Same fix
parent
050b3c40
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
333 additions
and
37 deletions
+333
-37
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+1
-1
comunication.h
MarlinKimbra/comunication.h
+9
-9
conditionals.h
MarlinKimbra/conditionals.h
+1
-1
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+320
-25
ultralcd.h
MarlinKimbra/ultralcd.h
+2
-1
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
c9fc2819
...
...
@@ -68,7 +68,7 @@
#endif
#if HAS(DIGIPOTSS)
#include
"SPI.h"
#include
<SPI.h>
#endif
...
...
MarlinKimbra/comunication.h
View file @
c9fc2819
...
...
@@ -32,15 +32,15 @@
#endif
#endif
#define START "start" //start for host
#define OK "ok " //ok answer for host
#define ER "
Error: " //
error for host
#define WT "wait" //wait for host
#define DB "echo: " //message for user
#define RS "Resend: " //resend for host
#define PAUSE "//action:pause" //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 START "start" //
start for host
#define OK "ok " //
ok answer for host
#define ER "
error: " //
error for host
#define WT "wait" //
wait for host
#define DB "echo: " //
message for user
#define RS "Resend: " //
resend for host
#define PAUSE "//action:pause" //
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 SERIAL_INIT(baud) MYSERIAL.begin(baud), delay(1)
#define SERIAL_WRITE(x) MYSERIAL.write(x)
...
...
MarlinKimbra/conditionals.h
View file @
c9fc2819
...
...
@@ -629,7 +629,7 @@
#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_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
...
...
MarlinKimbra/ultralcd.cpp
View file @
c9fc2819
This diff is collapsed.
Click to expand it.
MarlinKimbra/ultralcd.h
View file @
c9fc2819
...
...
@@ -111,8 +111,9 @@
#elif ENABLED(NEXTION)
#define LCD_UPDATE_INTERVAL
2
00
#define LCD_UPDATE_INTERVAL
1
00
void
page0PopCallback
(
void
*
ptr
);
void
setpagePopCallback
(
void
*
ptr
);
void
hotPopCallback
(
void
*
ptr
);
void
sethotPopCallback
(
void
*
ptr
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment