ManuelW/grbl-LPC-CoreXY
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Minor compiler compatibility update for _delay_us().

Browse Source
This commit is contained in:
Sonny Jeon 2012-02-11 12:08:37 -07:00
parent 24f1e0231e
commit fbed795f47
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
limits.c
View File

@ -71,9 +71,9 @@ static void homing_cycle(bool x_axis, bool y_axis, bool z_axis, bool reverse_dir
// Check if we are done // Check if we are done
if(!(x_axis || y_axis || z_axis)) { return; } if(!(x_axis || y_axis || z_axis)) { return; }
STEPPING_PORT |= out_bits & STEP_MASK; STEPPING_PORT |= out_bits & STEP_MASK;
_delay_us(settings.pulse_microseconds); delay_us(settings.pulse_microseconds);
STEPPING_PORT ^= out_bits & STEP_MASK; STEPPING_PORT ^= out_bits & STEP_MASK;
_delay_us(step_delay); delay_us(step_delay);
} }
return; return;
} }

10
nuts_bolts.c
View File

@ -3,7 +3,8 @@
Part of Grbl Part of Grbl
Copyright (c) 2009-2011 Simen Svale Skogsrud Copyright (c) 2009-2011 Simen Svale Skogsrud
Copyright (c) 2011-2012 Sungeun K. Jeon
Grbl is free software: you can redistribute it and/or modify Grbl is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
@ -43,3 +44,10 @@ void delay_ms(uint16_t ms)
{ {
while ( ms-- ) { _delay_ms(1); } while ( ms-- ) { _delay_ms(1); }
} }
// Delays variable defined microseconds. Compiler compatibility fix for _delay_us(),
// which only accepts constants in future compiler releases.
void delay_us(uint16_t us)
{
while ( us-- ) { _delay_us(1); }
}

5
nuts_bolts.h
View File

@ -3,7 +3,7 @@
Part of Grbl Part of Grbl
Copyright (c) 2009-2011 Simen Svale Skogsrud Copyright (c) 2009-2011 Simen Svale Skogsrud
Copyright (c) 2011 Sungeun K. Jeon Copyright (c) 2011-2012 Sungeun K. Jeon
Grbl is free software: you can redistribute it and/or modify Grbl is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -45,4 +45,7 @@ int read_double(char *line, uint8_t *char_counter, double *double_ptr);
// Delays variable-defined milliseconds. Compiler compatibility fix for _delay_ms(). // Delays variable-defined milliseconds. Compiler compatibility fix for _delay_ms().
void delay_ms(uint16_t ms); void delay_ms(uint16_t ms);
// Delays variable-defined microseconds. Compiler compatibility fix for _delay_us().
void delay_us(uint16_t us);
#endif #endif