Update system gpio and system timer.

Author: Daniel Jäckle

src/system/gpio.c

@@ -26,7 +26,7 @@ Maintainer: Miguel Luis and Gregory Cristian
 
 void GpioInit( Gpio_t *obj, PinNames pin, PinModes mode,  PinConfigs config, PinTypes type, uint32_t value )
 {
-    if( ( uint32_t )( pin >> 4 ) <= 6 ) 
+    if( ( uint32_t )( pin >> 4 ) <= 6 )
     {
         GpioMcuInit( obj, pin, mode, config, type, value );
     }
@@ -41,7 +41,7 @@ void GpioInit( Gpio_t *obj, PinNames pin, PinModes mode,  PinConfigs config, Pin
 
 void GpioSetInterrupt( Gpio_t *obj, IrqModes irqMode, IrqPriorities irqPriority, GpioIrqHandler *irqHandler )
 {
-    if( ( uint32_t )( obj->pin >> 4 ) <= 6 ) 
+    if( ( uint32_t )( obj->pin >> 4 ) <= 6 )
     {
         GpioMcuSetInterrupt( obj, irqMode, irqPriority, irqHandler );
     }
@@ -56,7 +56,7 @@ void GpioSetInterrupt( Gpio_t *obj, IrqModes irqMode, IrqPriorities irqPriority,
 
 void GpioRemoveInterrupt( Gpio_t *obj )
 {
-    if( ( uint32_t )( obj->pin >> 4 ) <= 6 ) 
+    if( ( uint32_t )( obj->pin >> 4 ) <= 6 )
     {
         //GpioMcuRemoveInterrupt( obj );
     }
@@ -71,7 +71,7 @@ void GpioRemoveInterrupt( Gpio_t *obj )
 
 void GpioWrite( Gpio_t *obj, uint32_t value )
 {
-    if( ( uint32_t )( obj->pin >> 4 ) <= 6 ) 
+    if( ( uint32_t )( obj->pin >> 4 ) <= 6 )
     {
         GpioMcuWrite( obj, value );
     }
@@ -84,9 +84,24 @@ void GpioWrite( Gpio_t *obj, uint32_t value )
     }
 }
 
+void GpioToggle( Gpio_t *obj )
+{
+    if( ( uint32_t )( obj->pin >> 4 ) <= 6 )
+    {
+        GpioMcuToggle( obj );
+    }
+    else
+    {
+#if defined( BOARD_IOE_EXT )
+        // IOExt Pin
+        GpioIoeWrite( obj, GpioIoeRead( obj ) ^ 1 );
+#endif
+    }
+}
+
 uint32_t GpioRead( Gpio_t *obj )
 {
-    if( ( uint32_t )( obj->pin >> 4 ) <= 6 ) 
+    if( ( uint32_t )( obj->pin >> 4 ) <= 6 )
     {
         return GpioMcuRead( obj );
     }

src/system/gpio.h

@@ -25,11 +25,11 @@ Maintainer: Miguel Luis and Gregory Cristian
 /*!
  * Board GPIO pin names
  */
-typedef enum 
+typedef enum
 {
     MCU_PINS,
     IOE_PINS,
-    
+
     // Not connected
     NC = (int)0xFFFFFFFF
 }PinNames;
@@ -71,7 +71,7 @@ typedef enum
 {
     NO_IRQ = 0,
     IRQ_RISING_EDGE,
-    IRQ_FALLING_EDGE,  
+    IRQ_FALLING_EDGE,
     IRQ_RISING_FALLING_EDGE
 }IrqModes;
 
@@ -82,15 +82,15 @@ typedef enum
 {
     IRQ_VERY_LOW_PRIORITY = 0,
     IRQ_LOW_PRIORITY,
-    IRQ_MEDIUM_PRIORITY,  
+    IRQ_MEDIUM_PRIORITY,
     IRQ_HIGH_PRIORITY,
     IRQ_VERY_HIGH_PRIORITY
 }IrqPriorities;
 
 /*!
  * Structure for the GPIO
  */
-typedef struct 
+typedef struct
 {
     PinNames  pin;
     uint16_t pinIndex;
@@ -144,6 +144,13 @@ void GpioRemoveInterrupt( Gpio_t *obj );
  */
 void GpioWrite( Gpio_t *obj, uint32_t value );
 
+/*!
+ * \brief Toggle the value to the GPIO output
+ *
+ * \param [IN] obj   Pointer to the GPIO object
+ */
+void GpioToggle( Gpio_t *obj );
+
 /*!
  * \brief Reads the current GPIO input value
  *

src/system/timer.c

@@ -200,13 +200,19 @@ static void TimerInsertNewHeadTimer( TimerEvent_t *obj, uint32_t remainingTime )
 void TimerIrqHandler( void )
 {
     uint32_t elapsedTime = 0;
+    uint32_t compensation = 0;
 
     elapsedTime = TimerGetValue( );
 
-    if( elapsedTime > TimerListHead->Timestamp )
+    if( elapsedTime == TimerListHead->Timestamp )
     {
         TimerListHead->Timestamp = 0;
     }
+    else if( elapsedTime > TimerListHead->Timestamp )
+    {
+        compensation = elapsedTime - TimerListHead->Timestamp;
+        TimerListHead->Timestamp = 0;
+    }
     else
     {
         TimerListHead->Timestamp -= elapsedTime;
@@ -225,6 +231,26 @@ void TimerIrqHandler( void )
         }
     }
 
+    while( TimerListHead != NULL )
+    {
+        if( compensation < TimerListHead->Timestamp )
+        {
+            TimerListHead->Timestamp = TimerListHead->Timestamp - compensation;
+            break;
+        }
+        else
+        {
+            compensation = compensation - TimerListHead->Timestamp;
+            TimerEvent_t* elapsedTimer = TimerListHead;
+            TimerListHead = TimerListHead->Next;
+
+            if( elapsedTimer->Callback != NULL )
+            {
+                elapsedTimer->Callback( );
+            }
+        }
+    }
+
     // start the next TimerListHead if it exists
     if( TimerListHead != NULL )
     {
@@ -366,6 +392,11 @@ TimerTime_t TimerGetElapsedTime( TimerTime_t savedTime )
     return RtcComputeElapsedTime( savedTime );
 }
 
+TimerTime_t TimerGetFutureTime( TimerTime_t eventInFuture )
+{
+    return RtcComputeFutureEventTime( eventInFuture );
+}
+
 static void TimerSetTimeout( TimerEvent_t *obj )
 {
     HasLoopedThroughMain = 0;

src/system/timer.h

@@ -80,7 +80,7 @@ void TimerReset( TimerEvent_t *obj );
 void TimerSetValue( TimerEvent_t *obj, uint32_t value );
 
 /*!
- * \brief Read the current time (with the Month as the MSByte)
+ * \brief Read the current time
  *
  * \retval time returns current time
  */
@@ -94,6 +94,14 @@ TimerTime_t TimerGetCurrentTime( void );
  */
 TimerTime_t TimerGetElapsedTime( TimerTime_t savedTime );
 
+/*!
+ * \brief Return the Time elapsed since a fix moment in Time
+ *
+ * \param [IN] eventInFuture    fix moment in the future
+ * \retval time             returns difference between now and future event
+ */
+TimerTime_t TimerGetFutureTime( TimerTime_t eventInFuture );
+
 /*!
  * \brief Manages the entry into ARM cortex deep-sleep mode
  */