From 5800f99bad759618bf754b935b2daa2b9e53a2c1 Mon Sep 17 00:00:00 2001 From: Patrick Felixberger Date: Wed, 15 Apr 2020 20:26:40 +0200 Subject: [PATCH] Code clean up --- Src/Print.c | 4 ++-- Src/Print.h | 3 +++ grbl/GCode.c | 2 +- grbl/Protocol.c | 4 ++-- grbl/defaults.h | 8 ++++---- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Src/Print.c b/Src/Print.c index f3fc360..6d3a942 100644 --- 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 index 9beffe6..5d6ede0 100644 --- a/Src/Print.h +++ b/Src/Print.h @@ -2,6 +2,9 @@ #define PRINT_H_INCLUDED +#include + + #ifdef __cplusplus extern "C" { #endif diff --git a/grbl/GCode.c b/grbl/GCode.c index f623071..650c239 100644 --- 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 index 544de04..533c3f7 100644 --- 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 index 1abd4b7..d3ecd64 100644 --- 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.