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
3de15132
Commit
3de15132
authored
Nov 24, 2014
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add motor to firmware test
parent
91ba54ae
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
201 additions
and
104 deletions
+201
-104
Configuration.h
MarlinKimbra/Configuration.h
+1
-1
Configuration_Cartesian.h
MarlinKimbra/Configuration_Cartesian.h
+1
-1
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+172
-91
language.h
MarlinKimbra/language.h
+27
-11
No files found.
MarlinKimbra/Configuration.h
View file @
3de15132
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
// User-specified version info of this build to display in [Pronterface, etc] terminal window during
// User-specified version info of this build to display in [Pronterface, etc] terminal window during
// startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
// startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
// build by the user have been successfully uploaded into firmware.
// build by the user have been successfully uploaded into firmware.
#define STRING_VERSION_CONFIG_H __DATE__ " 2
3/10
/2014 " __TIME__ // build date and time
#define STRING_VERSION_CONFIG_H __DATE__ " 2
4/11
/2014 " __TIME__ // build date and time
#define STRING_CONFIG_H_AUTHOR "(MagoKimbra: magokimbra@hotmail.com, Version 4.0)" // Who made the changes.
#define STRING_CONFIG_H_AUTHOR "(MagoKimbra: magokimbra@hotmail.com, Version 4.0)" // Who made the changes.
// SERIAL_PORT selects which serial port should be used for communication with the host.
// SERIAL_PORT selects which serial port should be used for communication with the host.
...
...
MarlinKimbra/Configuration_Cartesian.h
View file @
3de15132
...
@@ -142,7 +142,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
...
@@ -142,7 +142,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
// these are the offsets to the probe relative to the extruder tip (Hotend - Probe)
// these are the offsets to the probe relative to the extruder tip (Hotend - Probe)
#define X_PROBE_OFFSET_FROM_EXTRUDER 0
#define X_PROBE_OFFSET_FROM_EXTRUDER 0
#define Y_PROBE_OFFSET_FROM_EXTRUDER 20
#define Y_PROBE_OFFSET_FROM_EXTRUDER 20
#define Z_PROBE_OFFSET_FROM_EXTRUDER -
2.95
#define Z_PROBE_OFFSET_FROM_EXTRUDER -
3.10
#define Z_RAISE_BEFORE_HOMING 10 // (in mm) Raise Z before homing (G28) for Probe Clearance.
#define Z_RAISE_BEFORE_HOMING 10 // (in mm) Raise Z before homing (G28) for Probe Clearance.
// Be sure you have this distance over your Z_MAX_POS in case
// Be sure you have this distance over your Z_MAX_POS in case
...
...
MarlinKimbra/Marlin_main.cpp
View file @
3de15132
This diff is collapsed.
Click to expand it.
MarlinKimbra/language.h
View file @
3de15132
...
@@ -285,12 +285,20 @@
...
@@ -285,12 +285,20 @@
#define MSG_BAUDRATE "Baudrate"
#define MSG_BAUDRATE "Baudrate"
#ifdef FIRMWARE_TEST
#ifdef FIRMWARE_TEST
#define MSG_FWTEST_YES "Put the Y command to go forward"
#define MSG_FWTEST_YES "Put the Y command to go next"
#define MSG_FWTEST_NO "Put the N command to go forward"
#define MSG_FWTEST_NO "Put the N command to go next"
#define MSG_FWTEST_YES_NO "Put the Y or N command to go next"
#define MSG_FWTEST_ENDSTOP_ERR "ENDSTOP ERROR! Check wire and connection"
#define MSG_FWTEST_ENDSTOP_ERR "ENDSTOP ERROR! Check wire and connection"
#define MSG_FWTEST_INVERT "Reverse value in "
#define MSG_FWTEST_XAXIS "Has the nozzle moved to the right?"
#define MSG_FWTEST_YAXIS "Has the nozzle moved forward?"
#define MSG_FWTEST_ZAXIS "Has the nozzle moved up?"
#define MSG_FWTEST_01 "Manually move the axes X, Y and Z away from the endstop"
#define MSG_FWTEST_01 "Manually move the axes X, Y and Z away from the endstop"
#define MSG_FWTEST_02 "Start check ENDSTOP"
#define MSG_FWTEST_02 "Do you want check ENDSTOP?"
#endif
#define MSG_FWTEST_03 "Start check ENDSTOP"
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#endif // FIRMWARE_TEST
#endif
#endif
...
@@ -1004,16 +1012,16 @@
...
@@ -1004,16 +1012,16 @@
#define MSG_EXTRUDE "Estrudi"
#define MSG_EXTRUDE "Estrudi"
#define MSG_RETRACT "Ritrai"
#define MSG_RETRACT "Ritrai"
#define MSG_MOVE_AXIS "Muovi Asse"
#define MSG_MOVE_AXIS "Muovi Asse"
#define MSG_MOVE_X "M
ove
X"
#define MSG_MOVE_X "M
uovi
X"
#define MSG_MOVE_Y "M
ove
Y"
#define MSG_MOVE_Y "M
uovi
Y"
#define MSG_MOVE_Z "M
ove
Z"
#define MSG_MOVE_Z "M
uovi
Z"
#define MSG_MOVE_E "Extruder"
#define MSG_MOVE_E "Extruder"
#define MSG_MOVE_E1 "Extruder2"
#define MSG_MOVE_E1 "Extruder2"
#define MSG_MOVE_E2 "Extruder3"
#define MSG_MOVE_E2 "Extruder3"
#define MSG_MOVE_E3 "Extruder4"
#define MSG_MOVE_E3 "Extruder4"
#define MSG_MOVE_01MM "M
ove
0.1mm"
#define MSG_MOVE_01MM "M
uovi
0.1mm"
#define MSG_MOVE_1MM "M
ove
1mm"
#define MSG_MOVE_1MM "M
uovi
1mm"
#define MSG_MOVE_10MM "M
ove
10mm"
#define MSG_MOVE_10MM "M
uovi
10mm"
#define MSG_SPEED "Velcit�"
#define MSG_SPEED "Velcit�"
#define MSG_NOZZLE "Ugello"
#define MSG_NOZZLE "Ugello"
#define MSG_NOZZLE1 "Ugello2"
#define MSG_NOZZLE1 "Ugello2"
...
@@ -1102,9 +1110,17 @@
...
@@ -1102,9 +1110,17 @@
#ifdef FIRMWARE_TEST
#ifdef FIRMWARE_TEST
#define MSG_FWTEST_YES "Dai il comando Y per andare avanti"
#define MSG_FWTEST_YES "Dai il comando Y per andare avanti"
#define MSG_FWTEST_NO "Dai il comando N per andare avanti"
#define MSG_FWTEST_NO "Dai il comando N per andare avanti"
#define MSG_FWTEST_YES_NO "Dai il comando Y o N per andare avanti"
#define MSG_FWTEST_ENDSTOP_ERR "ENDSTOP ERROR! Controllare cavi e connessioni"
#define MSG_FWTEST_ENDSTOP_ERR "ENDSTOP ERROR! Controllare cavi e connessioni"
#define MSG_FWTEST_INVERT "Invertire valore in "
#define MSG_FWTEST_XAXIS "Il nozzle si e' spostato a destra?"
#define MSG_FWTEST_YAXIS "Il nozzle si e' spostato in avanti"
#define MSG_FWTEST_ZAXIS "Il nozzle si e' spostato in alto"
#define MSG_FWTEST_01 "Muovi manualmente gli assi X, Y e Z lontano dagli endstop"
#define MSG_FWTEST_01 "Muovi manualmente gli assi X, Y e Z lontano dagli endstop"
#define MSG_FWTEST_02 "Inizio controllo ENDSTOP"
#define MSG_FWTEST_02 "Vuoi controllare gli ENDSTOP?"
#define MSG_FWTEST_03 "Inizio controllo ENDSTOP"
#define MSG_FWTEST_04 "Inizio controllo MOTORI"
#define MSG_FWTEST_ATTENTION "ATTENZIONE! Controlla che i tre assi siano a piu' di 5 mm dagli endstop!"
#endif // FIRMWARE_TEST
#endif // FIRMWARE_TEST
#endif
#endif
...
...
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