Code clean up

Schildkroet · Apr 15, 2020 · 5800f99 · 5800f99
1 parent f097d18
commit 5800f99
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/Src/Print.c b/Src/Print.c
@@ -14,8 +14,8 @@
 #define MAX_BUFFER_SIZE     128
 
 
-char buf[512] = {0};
-uint16_t buf_idx = 0;
+static char buf[512] = {0};
+static uint16_t buf_idx = 0;
 
 
 void Print_Init(void)

diff --git a/Src/Print.h b/Src/Print.h
@@ -2,6 +2,9 @@
 #define PRINT_H_INCLUDED
 
 
+#include <stdint.h>
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/grbl/GCode.c b/grbl/GCode.c
@@ -60,7 +60,7 @@
 
 // Declare gc extern struct
 Parser_State_t gc_state;
-Parser_Block_t gc_block;
+static Parser_Block_t gc_block;
 
 
 void GC_Init(void)

diff --git a/grbl/Protocol.c b/grbl/Protocol.c
@@ -57,7 +57,7 @@
 
 static char line[LINE_BUFFER_SIZE]; // Line to be executed. Zero-terminated.
 static void Protocol_ExecRtSuspend(void);
-
+extern void ProcessReceive(char c);
 
 /*
   GRBL PRIMARY LOOP:
@@ -586,7 +586,7 @@ void Protocol_ExecRtSystem(void)
 				Spindle_SetState(gc_state.modal.spindle, gc_state.spindle_speed);
 			}
 			else {
-				BIT_TRUE(sys.step_control, STEP_CONTROL_UPDATE_SPINDLE_PWM); 
+				BIT_TRUE(sys.step_control, STEP_CONTROL_UPDATE_SPINDLE_PWM);
 			}
 			sys.report_ovr_counter = 0; // Set to report change immediately
 		}

diff --git a/grbl/defaults.h b/grbl/defaults.h
@@ -38,13 +38,13 @@
   #define DEFAULT_X_MAX_RATE 				1000.0  // mm/min
   #define DEFAULT_Y_MAX_RATE 				1000.0  // mm/min
   #define DEFAULT_Z_MAX_RATE 				1000.0  // mm/min
-  #define DEFAULT_A_MAX_RATE                1000.0  // °/min
-  #define DEFAULT_B_MAX_RATE                1000.0  // °/min
+  #define DEFAULT_A_MAX_RATE                10000.0  // °/min
+  #define DEFAULT_B_MAX_RATE                10000.0  // °/min
   #define DEFAULT_X_ACCELERATION 			(30.0*60*60) // 30*60*60 mm/min^2 = 30 mm/sec^2
   #define DEFAULT_Y_ACCELERATION 			(30.0*60*60) // 30*60*60 mm/min^2 = 30 mm/sec^2
   #define DEFAULT_Z_ACCELERATION 			(30.0*60*60) // 30*60*60 mm/min^2 = 30 mm/sec^2
-  #define DEFAULT_A_ACCELERATION            (50.0*60*60) // 100*60*60 mm/min^2 = 100 mm/sec^2
-  #define DEFAULT_B_ACCELERATION            (50.0*60*60) // 100*60*60 mm/min^2 = 100 mm/sec^2
+  #define DEFAULT_A_ACCELERATION            (100.0*60*60) // 100*60*60 mm/min^2 = 100 mm/sec^2
+  #define DEFAULT_B_ACCELERATION            (100.0*60*60) // 100*60*60 mm/min^2 = 100 mm/sec^2
   #define DEFAULT_X_MAX_TRAVEL 				400.0   // mm NOTE: Must be a positive value.
   #define DEFAULT_Y_MAX_TRAVEL 				300.0   // mm NOTE: Must be a positive value.
   #define DEFAULT_Z_MAX_TRAVEL 				500.0   // mm NOTE: Must be a positive value.