From b65c4e06d2cabaa7e986b4c0ec6319da16ee40df Mon Sep 17 00:00:00 2001 From: Marcio Teixeira Date: Mon, 29 Jan 2018 14:17:41 -0700 Subject: [PATCH] Reorg'd files to allow build from Arduino IDE. To build Hibiscus, it is only necessary now to sym link to ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper from the Arduino libs directory. --- .../libraries/TMC2130Stepper/{source => }/TMC2130Stepper.cpp | 0 .../TMC2130Stepper/{source => }/TMC2130Stepper_CHOPCONF.cpp | 0 .../TMC2130Stepper/{source => }/TMC2130Stepper_COOLCONF.cpp | 0 .../TMC2130Stepper/{source => }/TMC2130Stepper_DRV_STATUS.cpp | 0 .../TMC2130Stepper/{source => }/TMC2130Stepper_GCONF.cpp | 0 .../TMC2130Stepper/{source => }/TMC2130Stepper_IHOLD_IRUN.cpp | 0 .../TMC2130Stepper/{source => }/TMC2130Stepper_MACROS.h | 2 +- .../TMC2130Stepper/{source => }/TMC2130Stepper_PWMCONF.cpp | 0 .../libraries/TMC2130Stepper/TMC2130Stepper_UTILITY.h | 2 ++ Marlin/Conditionals_LulzBot.h | 2 +- Marlin/Makefile | 1 - 11 files changed, 4 insertions(+), 3 deletions(-) rename ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/{source => }/TMC2130Stepper.cpp (100%) rename ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/{source => }/TMC2130Stepper_CHOPCONF.cpp (100%) rename ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/{source => }/TMC2130Stepper_COOLCONF.cpp (100%) rename ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/{source => }/TMC2130Stepper_DRV_STATUS.cpp (100%) rename ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/{source => }/TMC2130Stepper_GCONF.cpp (100%) rename ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/{source => }/TMC2130Stepper_IHOLD_IRUN.cpp (100%) rename ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/{source => }/TMC2130Stepper_MACROS.h (94%) rename ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/{source => }/TMC2130Stepper_PWMCONF.cpp (100%) diff --git a/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper.cpp b/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper.cpp similarity index 100% rename from ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper.cpp rename to ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper.cpp diff --git a/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_CHOPCONF.cpp b/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_CHOPCONF.cpp similarity index 100% rename from ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_CHOPCONF.cpp rename to ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_CHOPCONF.cpp diff --git a/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_COOLCONF.cpp b/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_COOLCONF.cpp similarity index 100% rename from ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_COOLCONF.cpp rename to ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_COOLCONF.cpp diff --git a/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_DRV_STATUS.cpp b/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_DRV_STATUS.cpp similarity index 100% rename from ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_DRV_STATUS.cpp rename to ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_DRV_STATUS.cpp diff --git a/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_GCONF.cpp b/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_GCONF.cpp similarity index 100% rename from ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_GCONF.cpp rename to ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_GCONF.cpp diff --git a/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_IHOLD_IRUN.cpp b/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_IHOLD_IRUN.cpp similarity index 100% rename from ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_IHOLD_IRUN.cpp rename to ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_IHOLD_IRUN.cpp diff --git a/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_MACROS.h b/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_MACROS.h similarity index 94% rename from ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_MACROS.h rename to ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_MACROS.h index 982969812..9199bea2b 100644 --- a/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_MACROS.h +++ b/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_MACROS.h @@ -1,7 +1,7 @@ #ifndef TMC2130Stepper_MACROS_H #define TMC2130Stepper_MACROS_H #include "TMC2130Stepper.h" -#include "../TMC2130Stepper_REGDEFS.h" +#include "TMC2130Stepper_REGDEFS.h" #define WRITE_REG(R) send2130(TMC2130_WRITE|REG_##R, &R##_sr); diff --git a/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_PWMCONF.cpp b/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_PWMCONF.cpp similarity index 100% rename from ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/source/TMC2130Stepper_PWMCONF.cpp rename to ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_PWMCONF.cpp diff --git a/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_UTILITY.h b/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_UTILITY.h index a5eb60563..02b017de5 100644 --- a/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_UTILITY.h +++ b/ArduinoAddons/arduino-1.8.3/libraries/TMC2130Stepper/TMC2130Stepper_UTILITY.h @@ -1,6 +1,7 @@ #ifndef TMC2130Stepper_UTILITY_h #define TMC2130Stepper_UTILITY_h +#ifdef TMC2130DEBUG void print_HEX(uint32_t data) { for(uint8_t B=24; B>=4; B-=8){ Serial.print((data>>(B+4))&0xF, HEX); @@ -29,5 +30,6 @@ void print_BIN(uint32_t data) { Serial.print((data>>b)&0b1); } } +#endif #endif diff --git a/Marlin/Conditionals_LulzBot.h b/Marlin/Conditionals_LulzBot.h index 6a1a3e468..8c7c0df14 100644 --- a/Marlin/Conditionals_LulzBot.h +++ b/Marlin/Conditionals_LulzBot.h @@ -13,7 +13,7 @@ * got disabled. */ -#define LULZBOT_FW_VERSION ".74" // Change this with each update +#define LULZBOT_FW_VERSION ".75" // Change this with each update #if ( \ !defined(LULZBOT_Gladiola_Mini) && \ diff --git a/Marlin/Makefile b/Marlin/Makefile index 5875a6808..8d6b69099 100644 --- a/Marlin/Makefile +++ b/Marlin/Makefile @@ -314,7 +314,6 @@ VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib/utility endif ifeq ($(TMC2630), 1) VPATH += $(ARDUINO_INSTALL_DIR)/libraries/TMC2130Stepper -VPATH += $(ARDUINO_INSTALL_DIR)/libraries/TMC2130Stepper/source endif ifeq ($(HARDWARE_VARIANT), arduino)