Mirrors_Framework/grblHAL
1
0
Fork 0
mirror of https://github.com/grblHAL/core.git synced 2026-09-23 21:38:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from Expatria-Technologies/PR_Flexi_Fix

Browse Source 
Fixed some typos and syntax errors.
This commit is contained in:
Dietz0r
2024-01-02 21:00:38 +01:00
committed by GitHub
parent 299a7cd1aa dec93aa379
commit 860659f282
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gcode.c
+6 -6
View File
@@ -2242,12 +2242,12 @@ status_code_t gc_execute_block (char *block)
break;
case NonModal_SetAccelerationProfile:
if (!gc_block.values.p)
gc_block.values.p = 1.0f;
else if (gc_block.values.p < 1.0f)
FAIL(Status_NegativeValue);
else if (gc_block.values.p > 5.0f)
FAIL(Status_GcodeValueOutOfRange);
if (!gc_block.values.p){
gc_block.values.p = 1.0f;}
else if (gc_block.values.p < 1.0f){
FAIL(Status_NegativeValue);}
else if (gc_block.values.p > 5.0f){
FAIL(Status_GcodeValueOutOfRange);}
uint8_t idx = N_AXIS;
do {
idx--;
settings.c
+1 -1
View File
@@ -871,7 +871,7 @@ bool settings_override_acceleration (uint8_t axis, float acceleration, float jer
} else {
if(!override_backup.valid)
save_override_backup();
settings.axis[axis].acceleration = (override_backup.acceleration[axis] >= (acceleration * 60.0f * 60.0f)) ? (acceleration * 60.0f * 60.0f) : override_backup.aceceleration[axis]; // Limited to max setting value
settings.axis[axis].acceleration = (override_backup.acceleration[axis] >= (acceleration * 60.0f * 60.0f)) ? (acceleration * 60.0f * 60.0f) : override_backup.acceleration[axis]; // Limited to max setting value
}
if(jerk <= 0.0f) {
if(override_backup.valid)
settings.h
+1 -1
View File
@@ -958,7 +958,7 @@ void settings_write_coord_data(coord_system_id_t id, float (*coord_data)[N_AXIS]
bool settings_read_coord_data(coord_system_id_t id, float (*coord_data)[N_AXIS]);
// Temporarily override acceleration, if 0 restore to configured setting value
bool settings_override_acceleration (uint8_t axis, float acceleration);
bool settings_override_acceleration (uint8_t axis, float acceleration, float jerk);
void settings_register (setting_details_t *details);
setting_details_t *settings_get_details (void);