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
ea87d16b
Commit
ea87d16b
authored
Apr 01, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Version Stable
parent
448eccec
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
Configuration_adv.h
MarlinKimbra/Configuration_adv.h
+2
-1
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+1
-1
temperature.cpp
MarlinKimbra/temperature.cpp
+3
-3
ultralcd.h
MarlinKimbra/ultralcd.h
+2
-1
No files found.
MarlinKimbra/Configuration_adv.h
View file @
ea87d16b
...
@@ -230,7 +230,8 @@
...
@@ -230,7 +230,8 @@
#define MINIMUM_PLANNER_SPEED 0.05// (mm/sec)
#define MINIMUM_PLANNER_SPEED 0.05// (mm/sec)
// Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
// Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
// Alligator Board support 16 or 32 only value
#define MICROSTEP_MODES {32, 32, 32, 32} // [1,2,4,8,16,32]
// Motor Current setting (Only functional when motor driver current ref pins are connected to a digital trimpot on supported boards)
// Motor Current setting (Only functional when motor driver current ref pins are connected to a digital trimpot on supported boards)
#define DIGIPOT_MOTOR_CURRENT {135,135,135,135,135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
#define DIGIPOT_MOTOR_CURRENT {135,135,135,135,135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
...
...
MarlinKimbra/Marlin_main.cpp
View file @
ea87d16b
...
@@ -617,7 +617,7 @@ void setup_powerhold()
...
@@ -617,7 +617,7 @@ void setup_powerhold()
OUT_WRITE
(
SUICIDE_PIN
,
HIGH
);
OUT_WRITE
(
SUICIDE_PIN
,
HIGH
);
#endif
#endif
#if HAS_POWER_SWITCH
#if HAS_POWER_SWITCH
#if
defined(PS_DEFAULT_OFF)
#if
def PS_DEFAULT_OFF
OUT_WRITE
(
PS_ON_PIN
,
PS_ON_ASLEEP
);
OUT_WRITE
(
PS_ON_PIN
,
PS_ON_ASLEEP
);
#else
#else
OUT_WRITE
(
PS_ON_PIN
,
PS_ON_AWAKE
);
OUT_WRITE
(
PS_ON_PIN
,
PS_ON_AWAKE
);
...
...
MarlinKimbra/temperature.cpp
View file @
ea87d16b
...
@@ -1592,7 +1592,7 @@ ISR(TIMER0_COMPB_vect) {
...
@@ -1592,7 +1592,7 @@ ISR(TIMER0_COMPB_vect) {
#define GE1 >=
#define GE1 >=
#endif
#endif
if
(
current_temperature_raw
[
1
]
GE1
maxttemp_raw
[
1
])
max_temp_error
(
1
);
if
(
current_temperature_raw
[
1
]
GE1
maxttemp_raw
[
1
])
max_temp_error
(
1
);
if
(
minttemp_raw
[
1
]
GE
0
current_temperature_raw
[
1
])
min_temp_error
(
1
);
if
(
minttemp_raw
[
1
]
GE
1
current_temperature_raw
[
1
])
min_temp_error
(
1
);
#if HOTENDS > 2
#if HOTENDS > 2
#if HEATER_2_RAW_LO_TEMP > HEATER_2_RAW_HI_TEMP
#if HEATER_2_RAW_LO_TEMP > HEATER_2_RAW_HI_TEMP
...
@@ -1601,7 +1601,7 @@ ISR(TIMER0_COMPB_vect) {
...
@@ -1601,7 +1601,7 @@ ISR(TIMER0_COMPB_vect) {
#define GE2 >=
#define GE2 >=
#endif
#endif
if
(
current_temperature_raw
[
2
]
GE2
maxttemp_raw
[
2
])
max_temp_error
(
2
);
if
(
current_temperature_raw
[
2
]
GE2
maxttemp_raw
[
2
])
max_temp_error
(
2
);
if
(
minttemp_raw
[
2
]
GE
0
current_temperature_raw
[
2
])
min_temp_error
(
2
);
if
(
minttemp_raw
[
2
]
GE
2
current_temperature_raw
[
2
])
min_temp_error
(
2
);
#if HOTENDS > 3
#if HOTENDS > 3
#if HEATER_3_RAW_LO_TEMP > HEATER_3_RAW_HI_TEMP
#if HEATER_3_RAW_LO_TEMP > HEATER_3_RAW_HI_TEMP
...
@@ -1610,7 +1610,7 @@ ISR(TIMER0_COMPB_vect) {
...
@@ -1610,7 +1610,7 @@ ISR(TIMER0_COMPB_vect) {
#define GE3 >=
#define GE3 >=
#endif
#endif
if
(
current_temperature_raw
[
3
]
GE3
maxttemp_raw
[
3
])
max_temp_error
(
3
);
if
(
current_temperature_raw
[
3
]
GE3
maxttemp_raw
[
3
])
max_temp_error
(
3
);
if
(
minttemp_raw
[
3
]
GE
0
current_temperature_raw
[
3
])
min_temp_error
(
3
);
if
(
minttemp_raw
[
3
]
GE
3
current_temperature_raw
[
3
])
min_temp_error
(
3
);
#endif // HOTENDS > 3
#endif // HOTENDS > 3
#endif // HOTENDS > 2
#endif // HOTENDS > 2
...
...
MarlinKimbra/ultralcd.h
View file @
ea87d16b
...
@@ -109,7 +109,8 @@
...
@@ -109,7 +109,8 @@
#else //no LCD
#else //no LCD
FORCE_INLINE
void
lcd_update
()
{}
FORCE_INLINE
void
lcd_update
()
{}
FORCE_INLINE
void
lcd_init
()
{}
FORCE_INLINE
void
lcd_init
()
{}
FORCE_INLINE
void
lcd_setstatus
(
const
char
*
message
)
{}
FORCE_INLINE
void
lcd_setstatus
(
const
char
*
message
,
const
bool
persist
=
false
)
{}
FORCE_INLINE
void
lcd_setstatuspgm
(
const
char
*
message
,
const
uint8_t
level
=
0
)
{}
FORCE_INLINE
void
lcd_buttons_update
()
{}
FORCE_INLINE
void
lcd_buttons_update
()
{}
FORCE_INLINE
void
lcd_reset_alert_level
()
{}
FORCE_INLINE
void
lcd_reset_alert_level
()
{}
FORCE_INLINE
void
lcd_buzz
(
long
duration
,
uint16_t
freq
)
{}
FORCE_INLINE
void
lcd_buzz
(
long
duration
,
uint16_t
freq
)
{}
...
...
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