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
d7434672
Commit
d7434672
authored
May 31, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix
parent
df61c152
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
8 additions
and
8 deletions
+8
-8
Configuration.h
MarlinKimbra/Configuration.h
+1
-0
Configuration_Cartesian.h
MarlinKimbra/Configuration_Cartesian.h
+1
-1
Configuration_Corexy.h
MarlinKimbra/Configuration_Corexy.h
+2
-2
Configuration_Delta.h
MarlinKimbra/Configuration_Delta.h
+1
-1
comunication.h
MarlinKimbra/comunication.h
+0
-1
language.h
MarlinKimbra/language.h
+1
-1
stepper.cpp
MarlinKimbra/stepper.cpp
+1
-1
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+1
-1
No files found.
MarlinKimbra/Configuration.h
View file @
d7434672
...
@@ -450,6 +450,7 @@
...
@@ -450,6 +450,7 @@
//========================== EXTRA SETTINGS ON SD ===========================
//========================== EXTRA SETTINGS ON SD ===========================
// Uncomment SD SETTINGS to enable the firmware to write some configuration, that require frequent update, on the SD card.
// Uncomment SD SETTINGS to enable the firmware to write some configuration, that require frequent update, on the SD card.
// ATTENTION NOT FUNCTION WIDTH OCTOPRINT
//#define SD_SETTINGS
//#define SD_SETTINGS
#define SD_CFG_SECONDS 300 //seconds between update
#define SD_CFG_SECONDS 300 //seconds between update
#define CFG_SD_FILE "INFO.CFG" //name of the configuration file
#define CFG_SD_FILE "INFO.CFG" //name of the configuration file
...
...
MarlinKimbra/Configuration_Cartesian.h
View file @
d7434672
...
@@ -115,7 +115,7 @@
...
@@ -115,7 +115,7 @@
// Note: this feature generates 10KB extra code size
// Note: this feature generates 10KB extra code size
#define AUTO_BED_LEVELING_GRID
#define AUTO_BED_LEVELING_GRID
#if
ENABLED(AUTO_BED_LEVELING_GRID)
#if
def AUTO_BED_LEVELING_GRID
#define MIN_PROBE_EDGE 10 // The probe square sides can be no smaller than this
#define MIN_PROBE_EDGE 10 // The probe square sides can be no smaller than this
...
...
MarlinKimbra/Configuration_Corexy.h
View file @
d7434672
...
@@ -76,10 +76,10 @@
...
@@ -76,10 +76,10 @@
#define E_MIN_POS 0
#define E_MIN_POS 0
//=====================================================================================
//=====================================================================================
//================
============= Bed Manual or Auto Leveling ======
=====================
//================
Manual Bed Leveling (MBL) or Auto Bed Leveling
=====================
//=====================================================================================
//=====================================================================================
// set the rectangle in which to probe in
manual or automatic
// set the rectangle in which to probe in
MBL or ABL
#define LEFT_PROBE_BED_POSITION 20
#define LEFT_PROBE_BED_POSITION 20
#define RIGHT_PROBE_BED_POSITION 180
#define RIGHT_PROBE_BED_POSITION 180
#define FRONT_PROBE_BED_POSITION 20
#define FRONT_PROBE_BED_POSITION 20
...
...
MarlinKimbra/Configuration_Delta.h
View file @
d7434672
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
// Z-Probe variables
// Z-Probe variables
// Start and end location values are used to deploy/retract the probe (will move from start to end and back again)
// Start and end location values are used to deploy/retract the probe (will move from start to end and back again)
#define PROBING_FEEDRATE 1000 // Speed for individual probe Use: G30 A F600
#define PROBING_FEEDRATE 1000 // Speed
in mm/min
for individual probe Use: G30 A F600
#define Z_PROBE_OFFSET {0, 0, -1, 0} // X, Y, Z, E distance between hotend nozzle and deployed bed leveling probe.
#define Z_PROBE_OFFSET {0, 0, -1, 0} // X, Y, Z, E distance between hotend nozzle and deployed bed leveling probe.
#define Z_PROBE_DEPLOY_START_LOCATION {0, 0, 30, 0} // X, Y, Z, E start location for z-probe deployment sequence
#define Z_PROBE_DEPLOY_START_LOCATION {0, 0, 30, 0} // X, Y, Z, E start location for z-probe deployment sequence
#define Z_PROBE_DEPLOY_END_LOCATION {0, 0, 30, 0} // X, Y, Z, E end location for z-probe deployment sequence
#define Z_PROBE_DEPLOY_END_LOCATION {0, 0, 30, 0} // X, Y, Z, E end location for z-probe deployment sequence
...
...
MarlinKimbra/comunication.h
View file @
d7434672
...
@@ -54,7 +54,6 @@
...
@@ -54,7 +54,6 @@
#define SERIAL_PRINT(msg, args...) MYSERIAL.print(msg, ##args)
#define SERIAL_PRINT(msg, args...) MYSERIAL.print(msg, ##args)
#define SERIAL_ENDL MYSERIAL.println()
#define SERIAL_ENDL MYSERIAL.println()
// Things to write to serial from Program memory. Saves 400 to 2k of RAM.
FORCE_INLINE
void
PS_PGM
(
const
char
*
str
)
{
FORCE_INLINE
void
PS_PGM
(
const
char
*
str
)
{
char
ch
;
char
ch
;
while
((
ch
=
pgm_read_byte
(
str
)))
{
while
((
ch
=
pgm_read_byte
(
str
)))
{
...
...
MarlinKimbra/language.h
View file @
d7434672
...
@@ -111,7 +111,7 @@
...
@@ -111,7 +111,7 @@
#define MSG_HEATING_COMPLETE "Heating done."
#define MSG_HEATING_COMPLETE "Heating done."
#define MSG_BED_HEATING "Bed Heating."
#define MSG_BED_HEATING "Bed Heating."
#define MSG_BED_DONE "Bed done."
#define MSG_BED_DONE "Bed done."
#define MSG_M115_REPORT "FIRMWARE_NAME:MarlinKimbra " BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#define MSG_M115_REPORT "FIRMWARE_NAME:
MarlinKimbra " BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#define MSG_COUNT_X " Count X: "
#define MSG_COUNT_X " Count X: "
#define MSG_ERR_KILLED "Printer halted. kill() called!"
#define MSG_ERR_KILLED "Printer halted. kill() called!"
#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
...
...
MarlinKimbra/stepper.cpp
View file @
d7434672
...
@@ -450,7 +450,7 @@ ISR(TIMER1_COMPA_vect) {
...
@@ -450,7 +450,7 @@ ISR(TIMER1_COMPA_vect) {
#endif
#endif
// #ifdef ADVANCE
// #ifdef ADVANCE
// e_steps[current_block->active_
extrud
er] = 0;
// e_steps[current_block->active_
driv
er] = 0;
// #endif
// #endif
}
}
else
{
else
{
...
...
MarlinKimbra/ultralcd.cpp
View file @
d7434672
...
@@ -12,7 +12,7 @@ int8_t encoderDiff; // updated from interrupt context and added to encoderPositi
...
@@ -12,7 +12,7 @@ int8_t encoderDiff; // updated from interrupt context and added to encoderPositi
bool
encoderRateMultiplierEnabled
;
bool
encoderRateMultiplierEnabled
;
int32_t
lastEncoderMovementMillis
;
int32_t
lastEncoderMovementMillis
;
#if
defined(DELTA) &&
defined(Z_SAFE_HOMING) && Z_HOME_DIR < 0
#if
!defined(DELTA) && !
defined(Z_SAFE_HOMING) && Z_HOME_DIR < 0
int
pageShowInfo
=
0
;
int
pageShowInfo
=
0
;
void
set_pageShowInfo
(
int
value
){
pageShowInfo
=
value
;
}
void
set_pageShowInfo
(
int
value
){
pageShowInfo
=
value
;
}
#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