Permalink
Browse files

Minor compiler compatibility update for _delay_us().

  • Loading branch information...
1 parent 24f1e02 commit fbed795f472d66b15b7de394e6e7add8b43b710d @chamnit chamnit committed Feb 11, 2012
Showing with 15 additions and 4 deletions.
  1. +2 −2 limits.c
  2. +9 −1 nuts_bolts.c
  3. +4 −1 nuts_bolts.h
View
@@ -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
if(!(x_axis || y_axis || z_axis)) { return; }
STEPPING_PORT |= out_bits & STEP_MASK;
- _delay_us(settings.pulse_microseconds);
+ delay_us(settings.pulse_microseconds);
STEPPING_PORT ^= out_bits & STEP_MASK;
- _delay_us(step_delay);
+ delay_us(step_delay);
}
return;
}
View
@@ -3,7 +3,8 @@
Part of Grbl
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
it under the terms of the GNU General Public License as published by
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); }
}
+
+// 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); }
+}
View
@@ -3,7 +3,7 @@
Part of Grbl
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
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().
void delay_ms(uint16_t ms);
+// Delays variable-defined microseconds. Compiler compatibility fix for _delay_us().
+void delay_us(uint16_t us);
+
#endif

0 comments on commit fbed795

Please sign in to comment.