From 59e6ee74faa780ec0d46eb5111245a21a6289fb9 Mon Sep 17 00:00:00 2001 From: Tim Evers Date: Sun, 25 Mar 2018 20:09:22 +0200 Subject: [PATCH] Debugging --- src/G00Handler.cpp | 8 ++++---- src/StepperControl.cpp | 6 +++--- src/StepperControlAxis.cpp | 5 +++++ src/StepperControlAxis.h | 1 + src/src.vcxproj | 6 +++--- src/src.vcxproj.user | 4 ++++ 6 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 src/src.vcxproj.user diff --git a/src/G00Handler.cpp b/src/G00Handler.cpp index a196c1f..414153e 100644 --- a/src/G00Handler.cpp +++ b/src/G00Handler.cpp @@ -24,8 +24,8 @@ G00Handler::G00Handler() int G00Handler::execute(Command *command) { - /* - Serial.print("G00 was here\r\n"); + + /* Serial.print("G00 was here\r\n"); Serial.print("R99"); Serial.print(" X "); @@ -40,8 +40,8 @@ int G00Handler::execute(Command *command) Serial.print(command->getB()); Serial.print(" C "); Serial.print(command->getC()); - Serial.print("\r\n"); - */ + Serial.print("\r\n");*/ + StepperControl::getInstance()->moveToCoords( command->getX(), command->getY(), command->getZ(), diff --git a/src/StepperControl.cpp b/src/StepperControl.cpp index e24ffda..29652a3 100644 --- a/src/StepperControl.cpp +++ b/src/StepperControl.cpp @@ -314,7 +314,7 @@ int StepperControl::moveToCoords(double xDestScaled, double yDestScaled, double { Serial.print(COMM_REPORT_COORD_CHANGED_X); Serial.print(" X"); - Serial.print(destinationPoint[0]); + Serial.print(axisX.destinationPosition()); CurrentState::getInstance()->printQAndNewLine(); } @@ -322,7 +322,7 @@ int StepperControl::moveToCoords(double xDestScaled, double yDestScaled, double { Serial.print(COMM_REPORT_COORD_CHANGED_Y); Serial.print(" Y"); - Serial.print(destinationPoint[1]); + Serial.print(axisY.destinationPosition()); CurrentState::getInstance()->printQAndNewLine(); } @@ -330,7 +330,7 @@ int StepperControl::moveToCoords(double xDestScaled, double yDestScaled, double { Serial.print(COMM_REPORT_COORD_CHANGED_Z); Serial.print(" Z"); - Serial.print(destinationPoint[2]); + Serial.print(axisZ.destinationPosition()); CurrentState::getInstance()->printQAndNewLine(); } // Prepare for movement diff --git a/src/StepperControlAxis.cpp b/src/StepperControlAxis.cpp index 4e2cbfe..72bd76b 100644 --- a/src/StepperControlAxis.cpp +++ b/src/StepperControlAxis.cpp @@ -681,6 +681,11 @@ void StepperControlAxis::setCurrentPosition(long newPos) coordCurrentPoint = newPos; } +long StepperControlAxis::destinationPosition() +{ + return coordDestinationPoint; +} + void StepperControlAxis::setMaxSpeed(long speed) { motorSpeedMax = speed; diff --git a/src/StepperControlAxis.h b/src/StepperControlAxis.h index 07f8fcb..4142efe 100644 --- a/src/StepperControlAxis.h +++ b/src/StepperControlAxis.h @@ -51,6 +51,7 @@ public: long currentPosition(); void setCurrentPosition(long newPos); + long destinationPosition(); void setStepAxis(); void setMotorStep(); diff --git a/src/src.vcxproj b/src/src.vcxproj index 64766a9..4c7fc52 100644 --- a/src/src.vcxproj +++ b/src/src.vcxproj @@ -47,10 +47,10 @@ Level3 Disabled true - $(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.19\libraries\SPI\src;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.19\libraries\EEPROM\src;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\Servo\src;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.19\libraries;$(ProjectDir)..\..\..\..\Documents\Arduino\libraries;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.19\cores\arduino;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.19\variants\mega;$(ProjectDir)..\src;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.4-arduino2\avr\include\;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.4-arduino2\avr\include\avr\;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.4-arduino2\lib\gcc\avr\4.8.1\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\src;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.19\libraries\SPI\src;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.19\libraries\EEPROM\src;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries\Servo\src;$(ProjectDir)..\..\..\..\..\..\Program Files (x86)\Arduino\libraries;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.19\libraries;$(ProjectDir)..\..\..\..\Documents\Arduino\libraries;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.19\cores\arduino;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.19\variants\mega;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.4-arduino2\avr\include\;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.4-arduino2\avr\include\avr\;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.4-arduino2\lib\gcc\avr\4.8.1\include;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.4-arduino2\lib\gcc\avr\4.9.2\include;$(ProjectDir)..\..\..\..\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.4-arduino2\lib\gcc\avr\4.9.3\include;%(AdditionalIncludeDirectories) $(ProjectDir)__vm\.src.vsarduino.h;%(ForcedIncludeFiles) false - __AVR_ATmega2560__;_VMDEBUG=1;F_CPU=16000000L;ARDUINO=10802;ARDUINO_AVR_MEGA2560;ARDUINO_ARCH_AVR;__cplusplus=201103L;%(PreprocessorDefinitions) + __AVR_ATmega2560__;_VMDEBUG=1;F_CPU=16000000L;ARDUINO=10802;ARDUINO_AVR_MEGA2560;ARDUINO_ARCH_AVR;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions) true @@ -178,7 +178,7 @@ - + \ No newline at end of file diff --git a/src/src.vcxproj.user b/src/src.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/src/src.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file