Merge pull request speeduino#1332 from adbancroft/micros_safe

Remove micros_safe() - it's never used/defined

Author: adbancroft

speeduino/board_avr2560.cpp

@@ -116,23 +116,6 @@ uint16_t freeRam(void)
 
 void doSystemReset(void) { return; }
 void jumpToBootloader(void) { return; }
-#if defined(TIMER5_MICROS)
-//This is used by the fast version of micros(). We just need to increment the timer overflow counter
-ISR(TIMER5_OVF_vect)
-{
-    ++timer5_overflow_count;
-}
-
-static inline unsigned long micros_safe(void)
-{
-  unsigned long newMicros;
-  noInterrupts();
-  newMicros = (((timer5_overflow_count << 16) + TCNT5) * 4);
-  interrupts();
-
-  return newMicros;
-} 
-#endif //TIMER5_MICROS
 
 uint8_t getSystemTemp()
 {

speeduino/board_avr2560.h

@@ -32,13 +32,6 @@
   void jumpToBootloader(void);
   uint8_t getSystemTemp();
 
-  #if defined(TIMER5_MICROS)
-    /*#define micros() (((timer5_overflow_count << 16) + TCNT5) * 4) */ //Fast version of micros() that uses the 4uS tick of timer5. See timers.ino for the overflow ISR of timer5
-    #define millis() (ms_counter) //Replaces the standard millis() function with this macro. It is both faster and more accurate. See timers.ino for its counter increment.
-    static inline unsigned long micros_safe(); //A version of micros() that is interrupt safe
-  #else
-    #define micros_safe() micros() //If the timer5 method is not used, the micros_safe() macro is simply an alias for the normal micros()
-  #endif
   #define pinIsReserved(pin)  ( ((pin) == 0) ) //Forbidden pins like USB on other boards
 
 /*

speeduino/board_same51.h

@@ -37,13 +37,6 @@
   void jumpToBootloader();
   uint8_t getSystemTemp();
 
-  #if defined(TIMER5_MICROS)
-    /*#define micros() (((timer5_overflow_count << 16) + TCNT5) * 4) */ //Fast version of micros() that uses the 4uS tick of timer5. See timers.ino for the overflow ISR of timer5
-    #define millis() (ms_counter) //Replaces the standard millis() function with this macro. It is both faster and more accurate. See timers.ino for its counter increment.
-    static inline unsigned long micros_safe(); //A version of micros() that is interrupt safe
-  #else
-    #define micros_safe() micros() //If the timer5 method is not used, the micros_safe() macro is simply an alias for the normal micros()
-  #endif
   #define pinIsReserved(pin)  ( ((pin) == 0) ) //Forbidden pins like USB on other boards
 
   //Additional analog pins (These won't work without other changes)

speeduino/board_stm32_official.h

@@ -35,7 +35,6 @@
 #define COMPARE_TYPE uint16_t
 #define SERIAL_BUFFER_SIZE 517 //Size of the serial buffer used by new comms protocol. For SD transfers this must be at least 512 + 1 (flag) + 4 (sector)
 #define FPU_MAX_SIZE 32 //Size of the FPU buffer. 0 means no FPU.
-#define micros_safe() micros() //timer5 method is not used on anything but AVR, the micros_safe() macro is simply an alias for the normal micros()
 #define TIMER_RESOLUTION 4
 
 //Select one for EEPROM,the default is EEPROM emulation on internal flash.

speeduino/board_teensy35.h

@@ -30,7 +30,6 @@
   #define RTC_LIB_H "TimeLib.h"
   #define SD_CONFIG  SdioConfig(FIFO_SDIO) //Set Teensy to use SDIO in FIFO mode. This is the fastest SD mode on Teensy as it offloads most of the writes
 
-  #define micros_safe() micros() //timer5 method is not used on anything but AVR, the micros_safe() macro is simply an alias for the normal micros()
   #define PWM_FAN_AVAILABLE
   #define pinIsReserved(pin)  ( ((pin) == 0) || ((pin) == 1) || ((pin) == 3) || ((pin) == 4) ) //Forbidden pins like USB
 

speeduino/board_teensy41.h

@@ -29,7 +29,6 @@
   #define RTC_LIB_H "TimeLib.h"
   #define SD_CONFIG  SdioConfig(FIFO_SDIO) //Set Teensy to use SDIO in FIFO mode. This is the fastest SD mode on Teensy as it offloads most of the writes
 
-  #define micros_safe() micros() //timer5 method is not used on anything but AVR, the micros_safe() macro is simply an alias for the normal micros()
   //#define PWM_FAN_AVAILABLE
   #define pinIsReserved(pin)  ( ((pin) == 0) || ((pin) == 42) || ((pin) == 43) || ((pin) == 44) || ((pin) == 45) || ((pin) == 46) || ((pin) == 47) || pinIsSerial((pin)) ) //Forbidden pins like USB
 

speeduino/board_template.h

@@ -12,7 +12,6 @@
   #define BOARD_MAX_DIGITAL_PINS 52 //Pretty sure this isn't right
   #define EEPROM_LIB_H <EEPROM.h> //The name of the file that provides the EEPROM class
   typedef int eeprom_address_t;
-  #define micros_safe() micros() //timer5 method is not used on anything but AVR, the micros_safe() macro is simply an alias for the normal micros()
   void initBoard();
   uint16_t freeRam();
   void doSystemReset();

speeduino/corrections.cpp

@@ -298,7 +298,7 @@ uint16_t correctionAccel(void)
   if( BIT_CHECK(currentStatus.engine, BIT_ENGINE_ACC) || BIT_CHECK(currentStatus.engine, BIT_ENGINE_DCC))
   {
     //If it is currently running, check whether it should still be running or whether it's reached it's end time
-    if( micros_safe() >= currentStatus.AEEndTime )
+    if( micros() >= currentStatus.AEEndTime )
     {
       //Time to turn enrichment off
       BIT_CLEAR(currentStatus.engine, BIT_ENGINE_ACC);
@@ -346,7 +346,7 @@ uint16_t correctionAccel(void)
         if (abs(currentStatus.mapDOT) > configPage2.maeThresh)
         {
           activateMAPDOT = abs(currentStatus.mapDOT);
-          currentStatus.AEEndTime = micros_safe() + ((unsigned long)configPage2.aeTime * 10000); //Set the time in the future where the enrichment will be turned off. taeTime is stored as mS / 10, so multiply it by 100 to get it in uS
+          currentStatus.AEEndTime = micros() + ((unsigned long)configPage2.aeTime * 10000); //Set the time in the future where the enrichment will be turned off. taeTime is stored as mS / 10, so multiply it by 100 to get it in uS
           //Check if the MAP rate of change is negative or positive. Negative means decelarion.
           if (currentStatus.mapDOT < 0)
           {
@@ -412,7 +412,7 @@ uint16_t correctionAccel(void)
         if (abs(currentStatus.tpsDOT) > configPage2.taeThresh)
         {
           activateTPSDOT = abs(currentStatus.tpsDOT);
-          currentStatus.AEEndTime = micros_safe() + ((unsigned long)configPage2.aeTime * 10000); //Set the time in the future where the enrichment will be turned off. taeTime is stored as mS / 10, so multiply it by 100 to get it in uS
+          currentStatus.AEEndTime = micros() + ((unsigned long)configPage2.aeTime * 10000); //Set the time in the future where the enrichment will be turned off. taeTime is stored as mS / 10, so multiply it by 100 to get it in uS
           //Check if the TPS rate of change is negative or positive. Negative means decelarion.
           if (currentStatus.tpsDOT < 0)
           {

speeduino/idle.cpp

@@ -230,13 +230,13 @@ static inline byte checkForStepping(void)
       timeCheck = iacCoolTime_uS;
     }
 
-    if(micros_safe() > (idleStepper.stepStartTime + timeCheck) )
+    if(micros() > (idleStepper.stepStartTime + timeCheck) )
     {         
       if(idleStepper.stepperStatus == STEPPING)
       {
         //Means we're currently in a step, but it needs to be turned off
         digitalWrite(pinStepperStep, LOW); //Turn off the step
-        idleStepper.stepStartTime = micros_safe();
+        idleStepper.stepStartTime = micros();
 
 	//Set status to COOLING. In next cycle, status will be set to SOFF and set stepper power OFF based on given settings
         idleStepper.stepperStatus = COOLING; //'Cooling' is the time the stepper needs to sit in LOW state before the next step can be made
@@ -290,7 +290,7 @@ static inline void doStep(void)
 
     digitalWrite(pinStepperEnable, LOW); //Enable the DRV8825
     digitalWrite(pinStepperStep, HIGH);
-    idleStepper.stepStartTime = micros_safe();
+    idleStepper.stepStartTime = micros();
     idleStepper.stepperStatus = STEPPING;
     idleOn = true;
 
@@ -314,7 +314,7 @@ static inline byte isStepperHomed(void)
     digitalWrite(pinStepperDir, STEPPER_LESS_AIR_DIRECTION() ); //homing the stepper closes off the air bleed
     digitalWrite(pinStepperEnable, LOW); //Enable the DRV8825
     digitalWrite(pinStepperStep, HIGH);
-    idleStepper.stepStartTime = micros_safe();
+    idleStepper.stepStartTime = micros();
     idleStepper.stepperStatus = STEPPING;
     completedHomeSteps++;
     idleOn = true;

speeduino/init.cpp

@@ -292,7 +292,7 @@ void initialiseAll(void)
     }
 
     //Initial values for loop times
-    currentLoopTime = micros_safe();
+    currentLoopTime = micros();
     mainLoopCount = 0;
 
     if(configPage2.divider == 0) { currentStatus.nSquirts = 2; } //Safety check.