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
b98132d3
Commit
b98132d3
authored
Feb 14, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Gcode multyline
parent
0d1966f7
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
121 additions
and
114 deletions
+121
-114
Marlin.h
MarlinKimbra/Marlin.h
+3
-2
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+107
-99
cardreader.cpp
MarlinKimbra/cardreader.cpp
+2
-2
dogm_lcd_implementation.h
MarlinKimbra/dogm_lcd_implementation.h
+3
-0
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+6
-11
No files found.
MarlinKimbra/Marlin.h
View file @
b98132d3
...
...
@@ -217,8 +217,9 @@ void Stop();
bool
IsStopped
();
void
enquecommand
(
const
char
*
cmd
);
//put an ASCII command at the end of the current buffer.
void
enquecommand_P
(
const
char
*
cmd
);
//put an ASCII command at the end of the current buffer, read from flash
bool
enquecommand
(
const
char
*
cmd
);
//put a single ASCII command at the end of the current buffer or return false when it is full
void
enquecommands_P
(
const
char
*
cmd
);
//put one or many ASCII commands at the end of the current buffer, read from flash
void
prepare_arc_move
(
char
isclockwise
);
void
clamp_to_software_endstops
(
float
target
[
3
]);
...
...
MarlinKimbra/Marlin_main.cpp
View file @
b98132d3
This diff is collapsed.
Click to expand it.
MarlinKimbra/cardreader.cpp
View file @
b98132d3
...
...
@@ -532,7 +532,7 @@ void CardReader::checkautostart(bool force)
sprintf_P
(
cmd
,
PSTR
(
"M23 %s"
),
autoname
);
enquecommand
(
cmd
);
enquecommand_P
(
PSTR
(
"M24"
));
enquecommand
s
_P
(
PSTR
(
"M24"
));
found
=
true
;
}
}
...
...
@@ -637,7 +637,7 @@ void CardReader::printingHasFinished()
if
(
SD_FINISHED_STEPPERRELEASE
)
{
//finishAndDisableSteppers();
enquecommand_P
(
PSTR
(
SD_FINISHED_RELEASECOMMAND
));
enquecommand
s
_P
(
PSTR
(
SD_FINISHED_RELEASECOMMAND
));
}
autotempShutdown
();
}
...
...
MarlinKimbra/dogm_lcd_implementation.h
View file @
b98132d3
...
...
@@ -92,6 +92,9 @@ U8GLIB_ST7920_128X64_RRD u8g(0);
#elif defined(MAKRPANEL)
// The MaKrPanel display, ST7565 controller as well
U8GLIB_NHD_C12864
u8g
(
DOGLCD_CS
,
DOGLCD_A0
);
#elif defined(VIKI2) || defined(miniVIKI)
// Mini Viki and Viki 2.0 LCD, ST7565 controller as well
U8GLIB_NHD_C12864
u8g
(
DOGLCD_CS
,
DOGLCD_A0
);
#else
// for regular DOGM128 display with HW-SPI
U8GLIB_DOGM128
u8g
(
DOGLCD_CS
,
DOGLCD_A0
);
// HW-SPI Com: CS, A0
...
...
MarlinKimbra/ultralcd.cpp
View file @
b98132d3
...
...
@@ -329,9 +329,8 @@ static void lcd_sdcard_stop()
card
.
sdprinting
=
false
;
card
.
closefile
();
quickStop
();
if
(
SD_FINISHED_STEPPERRELEASE
)
{
enquecommand_P
(
PSTR
(
SD_FINISHED_RELEASECOMMAND
));
if
(
SD_FINISHED_STEPPERRELEASE
)
{
enquecommands_P
(
PSTR
(
SD_FINISHED_RELEASECOMMAND
));
}
autotempShutdown
();
...
...
@@ -402,14 +401,11 @@ void lcd_set_home_offsets()
plan_set_position
(
0.0
,
0.0
,
0.0
,
current_position
[
E_AXIS
]);
// Audio feedback
enquecommand_P
(
PSTR
(
"M300 S659 P200"
));
enquecommand_P
(
PSTR
(
"M300 S698 P200"
));
enquecommands_P
(
PSTR
(
"M300 S659 P200
\n
M300 S698 P200"
));
lcd_return_to_status
();
}
#ifdef BABYSTEPPING
static
void
_lcd_babystep
(
int
axis
,
const
char
*
msg
)
{
if
(
encoderPosition
!=
0
)
{
babystepsTodo
[
axis
]
+=
(
int
)
encoderPosition
;
...
...
@@ -422,7 +418,6 @@ void lcd_set_home_offsets()
static
void
lcd_babystep_x
()
{
_lcd_babystep
(
X_AXIS
,
PSTR
(
MSG_BABYSTEPPING_X
));
}
static
void
lcd_babystep_y
()
{
_lcd_babystep
(
Y_AXIS
,
PSTR
(
MSG_BABYSTEPPING_Y
));
}
static
void
lcd_babystep_z
()
{
_lcd_babystep
(
Z_AXIS
,
PSTR
(
MSG_BABYSTEPPING_Z
));
}
#endif //BABYSTEPPING
static
void
lcd_tune_menu
()
...
...
@@ -1356,7 +1351,7 @@ menu_edit_type(unsigned long, long5, ftostr5, 0.01)
lcd_move_y
();
}
static
void
reprapworld_keypad_move_home
()
{
enquecommand_P
((
PSTR
(
"G28"
)));
// move all axis home
enquecommand
s
_P
((
PSTR
(
"G28"
)));
// move all axis home
}
#endif
...
...
@@ -1372,7 +1367,7 @@ static void lcd_quick_feedback()
/** Menu action functions **/
static
void
menu_action_back
(
menuFunc_t
data
)
{
lcd_goto_menu
(
data
);
}
static
void
menu_action_submenu
(
menuFunc_t
data
)
{
lcd_goto_menu
(
data
);
}
static
void
menu_action_gcode
(
const
char
*
pgcode
)
{
enquecommand_P
(
pgcode
);
}
static
void
menu_action_gcode
(
const
char
*
pgcode
)
{
enquecommand
s
_P
(
pgcode
);
}
static
void
menu_action_function
(
menuFunc_t
data
)
{
(
*
data
)();
}
static
void
menu_action_sdfile
(
const
char
*
filename
,
char
*
longFilename
)
{
...
...
@@ -1382,7 +1377,7 @@ static void menu_action_sdfile(const char* filename, char* longFilename)
for
(
c
=
&
cmd
[
4
];
*
c
;
c
++
)
*
c
=
tolower
(
*
c
);
enquecommand
(
cmd
);
enquecommand_P
(
PSTR
(
"M24"
));
enquecommand
s
_P
(
PSTR
(
"M24"
));
lcd_return_to_status
();
}
static
void
menu_action_sddirectory
(
const
char
*
filename
,
char
*
longFilename
)
...
...
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