Fixed TS calib bug

[hackover2013-badge-firmware.git] / main.c

diff --git a/main.c b/main.c
index 8b75435..bb2c280 100644 (file)
--- a/main.c
+++ b/main.c
@@ -7,7 +7,7 @@
 
     Software License Agreement (BSD License)
 
 
     Software License Agreement (BSD License)
 

-    Copyright (c) 2011, microBuilder SARL
+    Copyright (c) 2012, microBuilder SARL

     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without


@@ -33,10 +33,6 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 /**************************************************************************/
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 /**************************************************************************/

-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-

 #include "projectconfig.h"
 #include "sysinit.h"
 
 #include "projectconfig.h"
 #include "sysinit.h"
 


@@ -47,28 +43,6 @@
   #include "core/cmd/cmd.h"
 #endif
 
   #include "core/cmd/cmd.h"
 #endif
 

-/**************************************************************************/
-/*! 
-    Approximates a 1 millisecond delay using "nop".  This is less
-    accurate than a dedicated timer, but is useful in certain situations.
-
-    The number of ticks to delay depends on the optimisation level set
-    when compiling (-O).  Depending on the compiler settings, one of the
-    two defined values for 'delay' should be used.
-*/
-/**************************************************************************/
-void delayms(uint32_t ms)
-{
-  uint32_t delay = ms * ((CFG_CPU_CCLK / 100) / 45);      // Release Mode (-Os)
-  // uint32_t delay = ms * ((CFG_CPU_CCLK / 100) / 120);  // Debug Mode (No optimisations)
-
-  while (delay > 0)
-  {
-    __asm volatile ("nop");
-    delay--;
-  }
-}
-

 /**************************************************************************/
 /*! 
     Main program entry point.  After reset, normal code execution will
 /**************************************************************************/
 /*! 
     Main program entry point.  After reset, normal code execution will


@@ -85,19 +59,12 @@ int main(void)
 
   while (1)
   {
 
   while (1)
   {

-    // Toggle LED once per second ... rollover = 136 years :)
+    // Toggle LED once per second

     currentSecond = systickGetSecondsActive();
     if (currentSecond != lastSecond)
     {
       lastSecond = currentSecond;
     currentSecond = systickGetSecondsActive();
     if (currentSecond != lastSecond)
     {
       lastSecond = currentSecond;

-      if (gpioGetValue(CFG_LED_PORT, CFG_LED_PIN) == CFG_LED_OFF)
-      {
-        gpioSetValue (CFG_LED_PORT, CFG_LED_PIN, CFG_LED_ON); 
-      }
-      else
-      {
-        gpioSetValue (CFG_LED_PORT, CFG_LED_PIN, CFG_LED_OFF); 
-      }
+      gpioSetValue(CFG_LED_PORT, CFG_LED_PIN, lastSecond % 2);

     }
 
     // Poll for CLI input if CFG_INTERFACE is enabled in projectconfig.h
     }
 
     // Poll for CLI input if CFG_INTERFACE is enabled in projectconfig.h