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
e16d723c
Commit
e16d723c
authored
Jan 12, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Same fix
parent
16ad18c4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
144 additions
and
136 deletions
+144
-136
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+1
-1
language.h
MarlinKimbra/language/language.h
+143
-135
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
e16d723c
...
@@ -834,7 +834,7 @@ void setup() {
...
@@ -834,7 +834,7 @@ void setup() {
if
(
mcu
&
32
)
ECHO_EM
(
SERIAL_SOFTWARE_RESET
);
if
(
mcu
&
32
)
ECHO_EM
(
SERIAL_SOFTWARE_RESET
);
MCUSR
=
0
;
MCUSR
=
0
;
ECHO_LM
(
DB
,
MSG_MARLIN
" "
BUILD_VERSION
);
ECHO_LM
(
DB
,
BUILD_VERSION
);
#if ENABLED(STRING_DISTRIBUTION_DATE) && ENABLED(STRING_CONFIG_H_AUTHOR)
#if ENABLED(STRING_DISTRIBUTION_DATE) && ENABLED(STRING_CONFIG_H_AUTHOR)
ECHO_LM
(
DB
,
SERIAL_CONFIGURATION_VER
STRING_DISTRIBUTION_DATE
SERIAL_AUTHOR
STRING_CONFIG_H_AUTHOR
);
ECHO_LM
(
DB
,
SERIAL_CONFIGURATION_VER
STRING_DISTRIBUTION_DATE
SERIAL_AUTHOR
STRING_CONFIG_H_AUTHOR
);
...
...
MarlinKimbra/language/language.h
View file @
e16d723c
...
@@ -60,6 +60,17 @@
...
@@ -60,6 +60,17 @@
#endif
#endif
// Serial Console Messages (do not translate those!)
// Serial Console Messages (do not translate those!)
#if MECH(CARTESIAN)
#define SERIAL_M115_REPORT "FIRMWARE_NAME:MK_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:Mendel EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#elif MECH(COREXY)
#define SERIAL_M115_REPORT "FIRMWARE_NAME:MK_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:Core_XY EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#elif MECH(COREXZ)
#define SERIAL_M115_REPORT "FIRMWARE_NAME:MK_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:Core_XZ EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#elif MECH(DELTA)
#define SERIAL_M115_REPORT "FIRMWARE_NAME:MK_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:Delta EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#elif MECH(SCARA)
#define SERIAL_M115_REPORT "FIRMWARE_NAME:MK_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:Scara EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#endif
#define MSG_MARLIN "MarlinKimbra"
#define MSG_MARLIN "MarlinKimbra"
#define SERIAL_ENQUEUEING "enqueueing \""
#define SERIAL_ENQUEUEING "enqueueing \""
#define SERIAL_POWERUP "PowerUp"
#define SERIAL_POWERUP "PowerUp"
...
@@ -83,7 +94,6 @@
...
@@ -83,7 +94,6 @@
#define SERIAL_INVALID_EXTRUDER "Invalid extruder"
#define SERIAL_INVALID_EXTRUDER "Invalid extruder"
#define SERIAL_INVALID_SOLENOID "Invalid solenoid"
#define SERIAL_INVALID_SOLENOID "Invalid solenoid"
#define SERIAL_ERR_NO_THERMISTORS "No thermistors - no temperature"
#define SERIAL_ERR_NO_THERMISTORS "No thermistors - no temperature"
#define SERIAL_M115_REPORT "FIRMWARE_NAME:MarlinKimbra_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#define SERIAL_COUNT_X " Count X: "
#define SERIAL_COUNT_X " Count X: "
#define SERIAL_ERR_KILLED "Printer halted. kill() called!"
#define SERIAL_ERR_KILLED "Printer halted. kill() called!"
#define SERIAL_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
#define SERIAL_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
...
@@ -107,9 +117,7 @@
...
@@ -107,9 +117,7 @@
#define SERIAL_ENDSTOP_OPEN "NOT TRIGGERED"
#define SERIAL_ENDSTOP_OPEN "NOT TRIGGERED"
#define SERIAL_HOTEND_OFFSET "Hotend offsets:"
#define SERIAL_HOTEND_OFFSET "Hotend offsets:"
#define SERIAL_EMPTY_PLANE "Autolevel can only be execute on an actual plane, make sure width and height are not 0!"
#define SERIAL_EMPTY_PLANE "Autolevel can only be execute on an actual plane, make sure width and height are not 0!"
#define SERIAL_FILRUNOUT_PIN "filament_runout_pin: "
#define SERIAL_FILRUNOUT_PIN "filament_runout_pin: "
#define SERIAL_SD_CANT_OPEN_SUBDIR "Cannot open subdir"
#define SERIAL_SD_CANT_OPEN_SUBDIR "Cannot open subdir"
#define SERIAL_SD_INIT_FAIL "SD init fail"
#define SERIAL_SD_INIT_FAIL "SD init fail"
#define SERIAL_SD_VOL_INIT_FAIL "volume.init failed"
#define SERIAL_SD_VOL_INIT_FAIL "volume.init failed"
...
...
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