Debugging
parent
56c8f34902
commit
59e6ee74fa
|
@ -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(),
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -681,6 +681,11 @@ void StepperControlAxis::setCurrentPosition(long newPos)
|
|||
coordCurrentPoint = newPos;
|
||||
}
|
||||
|
||||
long StepperControlAxis::destinationPosition()
|
||||
{
|
||||
return coordDestinationPoint;
|
||||
}
|
||||
|
||||
void StepperControlAxis::setMaxSpeed(long speed)
|
||||
{
|
||||
motorSpeedMax = speed;
|
||||
|
|
|
@ -51,6 +51,7 @@ public:
|
|||
|
||||
long currentPosition();
|
||||
void setCurrentPosition(long newPos);
|
||||
long destinationPosition();
|
||||
|
||||
void setStepAxis();
|
||||
void setMotorStep();
|
||||
|
|
|
@ -47,10 +47,10 @@
|
|||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
|
||||
<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)</AdditionalIncludeDirectories>
|
||||
<ForcedIncludeFiles>$(ProjectDir)__vm\.src.vsarduino.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
|
||||
<IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
|
||||
<PreprocessorDefinitions>__AVR_ATmega2560__;_VMDEBUG=1;F_CPU=16000000L;ARDUINO=10802;ARDUINO_AVR_MEGA2560;ARDUINO_ARCH_AVR;__cplusplus=201103L;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>__AVR_ATmega2560__;_VMDEBUG=1;F_CPU=16000000L;ARDUINO=10802;ARDUINO_AVR_MEGA2560;ARDUINO_ARCH_AVR;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
|
@ -178,7 +178,7 @@
|
|||
</ImportGroup>
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
<UserProperties vm.programmer_name="avrisp" arduino.upload.port="COM4" />
|
||||
<UserProperties vm.programmer_name="avrisp" arduino.upload.port="COM6" />
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
</Project>
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
Loading…
Reference in New Issue