From 10ba3e7ffde4229e46cd819fdd551bd55027a1ca Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 7 Aug 2018 19:59:32 +0200 Subject: [PATCH 1/2] Move global variable count_position declaration to stepper.h header file. --- Firmware/stepper.h | 1 + Firmware/xyzcal.cpp | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/stepper.h b/Firmware/stepper.h index ac5089441..ab48c644c 100644 --- a/Firmware/stepper.h +++ b/Firmware/stepper.h @@ -90,6 +90,7 @@ extern bool x_min_endstop; extern bool x_max_endstop; extern bool y_min_endstop; extern bool y_max_endstop; +extern volatile long count_position[NUM_AXIS]; void quickStop(); diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 1ecc86cf4..164ec79cb 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -32,8 +32,6 @@ #define _PI 3.14159265F -extern volatile long count_position[NUM_AXIS]; - uint8_t check_pinda_0(); uint8_t check_pinda_1(); void xyzcal_update_pos(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de); From 5493ac57f9759e1c1b556605f06084bdec857109 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 7 Aug 2018 20:15:04 +0200 Subject: [PATCH 2/2] Fix declaration and definition type mismatch of lcd_change_fil_state. Move declaration to Marlin.h. --- Firmware/Marlin.h | 1 + Firmware/ultralcd.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 2bbab9879..8f0ca477d 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -282,6 +282,7 @@ extern bool axis_known_position[3]; extern float zprobe_zoffset; extern int fanSpeed; extern void homeaxis(int axis, uint8_t cnt = 1, uint8_t* pstep = 0); +extern int8_t lcd_change_fil_state; #ifdef FAN_SOFT_PWM diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0ca7cf924..3fb194494 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -37,7 +37,6 @@ #include "mmu.h" -extern int lcd_change_fil_state; extern bool fans_check_enabled;