Updated delay_us() function to accept long integers

daapp · Oct 12, 2012 · 00701ff · 00701ff
1 parent 9b4e108
commit 00701ff
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/config.h b/config.h
@@ -162,13 +162,6 @@
 #define CYCLE_AUTO_START 1    // Cycle auto-start boolean flag for the planner.
 #define BLOCK_DELETE_ENABLE 0 // Block delete enable/disable flag during g-code parsing
 #define REPORT_INCH_MODE 0    // Status reporting unit mode (1 = inch, 0 = mm)
-#if REPORT_INCH_MODE
-  #define DECIMAL_PLACES 3
-  #define DECIMAL_MULTIPLIER 1000 // 10^DECIMAL_PLACES
-#else
-  #define DECIMAL_PLACES 2  // mm-mode
-  #define DECIMAL_MULTIPLIER 100
-#endif
 
 // This parameter sets the delay time before disabling the steppers after the final block of movement.
 // A short delay ensures the steppers come to a complete stop and the residual inertial force in the 

diff --git a/nuts_bolts.c b/nuts_bolts.c
@@ -121,7 +121,7 @@ void delay_ms(uint16_t ms)
 // Delays variable defined microseconds. Compiler compatibility fix for _delay_us(),
 // which only accepts constants in future compiler releases. Written to perform more 
 // efficiently with larger delays, as the counter adds parasitic time in each iteration.
-void delay_us(uint16_t us) 
+void delay_us(uint32_t us) 
 {
   while (us) {
     if (us < 10) { 

diff --git a/nuts_bolts.h b/nuts_bolts.h
@@ -94,6 +94,6 @@ int read_float(char *line, uint8_t *char_counter, float *float_ptr);
 void delay_ms(uint16_t ms);
 
 // Delays variable-defined microseconds. Compiler compatibility fix for _delay_us().
-void delay_us(uint16_t us);
+void delay_us(uint32_t us);
 
 #endif