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
3eb34342
Commit
3eb34342
authored
Feb 17, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
parents
47b90b39
947ed498
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
13 deletions
+7
-13
ultralcd.cpp
MK/module/lcd/ultralcd.cpp
+1
-1
ultralcd_st7920_u8glib_rrd.h
MK/module/lcd/ultralcd_st7920_u8glib_rrd.h
+5
-11
stepper.cpp
MK/module/motion/stepper.cpp
+1
-1
No files found.
MK/module/lcd/ultralcd.cpp
View file @
3eb34342
...
@@ -839,7 +839,7 @@ static void lcd_prepare_menu() {
...
@@ -839,7 +839,7 @@ static void lcd_prepare_menu() {
// Level Bed
// Level Bed
//
//
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
if
(
axis_known_position
&
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
==
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
{
if
(
axis_known_position
&
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
==
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
MENU_ITEM
(
gcode
,
MSG_LEVEL_BED
,
PSTR
(
"G29"
));
MENU_ITEM
(
gcode
,
MSG_LEVEL_BED
,
PSTR
(
"G29"
));
#elif !MECH(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
#elif !MECH(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
MENU_ITEM
(
submenu
,
MSG_MBL_SETTING
,
config_lcd_level_bed
);
MENU_ITEM
(
submenu
,
MSG_MBL_SETTING
,
config_lcd_level_bed
);
...
...
MK/module/lcd/ultralcd_st7920_u8glib_rrd.h
View file @
3eb34342
...
@@ -22,21 +22,15 @@
...
@@ -22,21 +22,15 @@
static
void
ST7920_SWSPI_SND_8BIT
(
uint8_t
val
)
{
static
void
ST7920_SWSPI_SND_8BIT
(
uint8_t
val
)
{
uint8_t
i
;
uint8_t
i
;
for
(
i
=
0
;
i
<
8
;
i
++
)
{
for
(
i
=
0
;
i
<
8
;
i
++
)
{
WRITE
(
ST7920_CLK_PIN
,
0
);
digitalWrite
(
ST7920_CLK_PIN
,
0
);
#if F_CPU == 20000000
digitalWrite
(
ST7920_DAT_PIN
,
val
&
0x80
);
__asm__
(
"nop
\n\t
"
);
#endif
WRITE
(
ST7920_DAT_PIN
,
val
&
0x80
);
val
<<=
1
;
val
<<=
1
;
WRITE
(
ST7920_CLK_PIN
,
1
);
digitalWrite
(
ST7920_CLK_PIN
,
1
);
#if F_CPU == 20000000
__asm__
(
"nop
\n\t
""nop
\n\t
"
);
#endif
}
}
}
}
#define ST7920_CS() {
WRITE(ST7920_CS_PIN,1);
u8g_10MicroDelay();}
#define ST7920_CS() {
digitalWrite(ST7920_CS_PIN, 1);
u8g_10MicroDelay();}
#define ST7920_NCS() {
WRITE
(ST7920_CS_PIN,0);}
#define ST7920_NCS() {
digitalWrite
(ST7920_CS_PIN,0);}
#define ST7920_SET_CMD() {ST7920_SWSPI_SND_8BIT(0xf8);u8g_10MicroDelay();}
#define ST7920_SET_CMD() {ST7920_SWSPI_SND_8BIT(0xf8);u8g_10MicroDelay();}
#define ST7920_SET_DAT() {ST7920_SWSPI_SND_8BIT(0xfa);u8g_10MicroDelay();}
#define ST7920_SET_DAT() {ST7920_SWSPI_SND_8BIT(0xfa);u8g_10MicroDelay();}
#define ST7920_WRITE_BYTE(a) {ST7920_SWSPI_SND_8BIT((uint8_t)((a)&0xf0u));ST7920_SWSPI_SND_8BIT((uint8_t)((a)<<4u));u8g_10MicroDelay();}
#define ST7920_WRITE_BYTE(a) {ST7920_SWSPI_SND_8BIT((uint8_t)((a)&0xf0u));ST7920_SWSPI_SND_8BIT((uint8_t)((a)<<4u));u8g_10MicroDelay();}
...
...
MK/module/motion/stepper.cpp
View file @
3eb34342
...
@@ -297,7 +297,7 @@ void checkHitEndstops() {
...
@@ -297,7 +297,7 @@ void checkHitEndstops() {
card
.
sdprinting
=
false
;
card
.
sdprinting
=
false
;
card
.
closeFile
();
card
.
closeFile
();
#endif
#endif
for
(
int
i
=
0
;
i
<
3
;
i
++
)
axis_known_position
[
i
]
=
false
;
// not homed anymore
for
(
int
i
=
0
;
i
<
3
;
i
++
)
BITCLR
(
axis_known_position
,
i
)
;
// not homed anymore
quickStop
();
// kill the planner buffer
quickStop
();
// kill the planner buffer
Stop
();
// restart by M999
Stop
();
// restart by M999
}
}
...
...
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