felix/Marlin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changes for parity with 2.0.x

Browse Source
This commit is contained in:
Scott Lahteine
2017-12-06 17:14:54 -06:00
parent 93560836de
commit 1063b3b2b8
10 changed files with 86 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/temperature.h
View File

@@ -370,14 +370,14 @@ class Temperature {
static int16_t degTargetBed() { return target_temperature_bed; }
#if WATCH_HOTENDS
static void start_watching_heater(uint8_t e = 0);
static void start_watching_heater(const uint8_t e = 0);
#endif
#if WATCH_THE_BED
static void start_watching_bed();
#endif
static void setTargetHotend(const int16_t celsius, uint8_t e) {
static void setTargetHotend(const int16_t celsius, const uint8_t e) {
#if HOTENDS == 1
UNUSED(e);
#endif
@@ -455,7 +455,7 @@ class Temperature {
#if ENABLED(BABYSTEPPING)
static void babystep_axis(const AxisEnum axis, const int distance) {
static void babystep_axis(const AxisEnum axis, const int16_t distance) {
if (axis_known_position[axis]) {
#if IS_CORE
#if ENABLED(BABYSTEP_XY)