Merge remote-tracking branch 'origin/CNC_Firmware' into CNC_Machine_C…

…omplete
mhouse1 · Jan 24, 2016 · ecaef42 · ecaef42
2 parents 58c6fd5 + 106d298
commit ecaef42
Show file tree

Hide file tree

Showing 3 changed files with 291 additions and 252 deletions.
diff --git a/FPGA_PROJECT_BASE_SYSTEM_V3/software/RAPTOR_03/cncmachine.cpp b/FPGA_PROJECT_BASE_SYSTEM_V3/software/RAPTOR_03/cncmachine.cpp
@@ -23,7 +23,6 @@ extern "C"
 #include "stdio.h"
 #include "altera_avalon_pio_regs.h"
 #include "slave_template_macros.h"
-#include "includes.h"
 }
 #include <iostream>
 #include <cmath>
@@ -495,7 +494,7 @@ alt_u8 CncMachine::SetNextPosition(alt_32 x, alt_32 y)
 
 	//@todo move scaling constant elsewhere
 	//for now just keep it within the function stack
-	alt_16 scaling_constant = 220;//smaller constant means bigger plot
+	alt_16 scaling_constant = 222;//smaller constant means bigger plot
 
 	//assign state router_xy to indicate data is xy movement
 	data.router_state = router_xy;
@@ -874,7 +873,7 @@ void CncMachine::CncPauseRouting()
 void CncMachine::ExecuteRouteData(CncMachine::TRAVERSALXY  route_data)
 {
     //printf("executing route data\n");
-    this->WriteRouterPWM(40000);
+    //this->WriteRouterPWM(40000);
     //DisplayRoutes(route_data);
 
     switch(route_data.router_state)

diff --git a/FPGA_PROJECT_BASE_SYSTEM_V3/software/RAPTOR_03/cncmachine.hpp b/FPGA_PROJECT_BASE_SYSTEM_V3/software/RAPTOR_03/cncmachine.hpp
@@ -12,6 +12,7 @@
 /// @ingroup [SUBSYSTEM_PREFIX]
 ///
 /// @par Copyright (c) 2014 All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
 
 #ifndef CNCMACHINE_HPP_
 #define CNCMACHINE_HPP_