flaneth

@@ -5,6 +5,7 @@

 #include <avr/io.h>

 #include <avr/interrupt.h>

+#include <util/atomic.h>

 #include "arp.h"

 #include "cf.h"

@@ -17,6 +18,9 @@

 #include "timing.h"

 #include "udp.h"

+// global timer in ms

+volatile unsigned long TimingMs = 0;

+

 // 2ms tick counter to generate 20ms ticks

 volatile unsigned char Timing2_10 = 0;

@@ -32,6 +36,8 @@ unsigned char Timing20_10 = 0;

 // 2ms interrupt (timer 0 compare match)

 SIGNAL(SIG_OUTPUT_COMPARE0)

 {

+  // advance global timer

+  TimingMs += 2;

   // set flag every 20ms

   Timing2_10++;

   if (Timing2_10 >= 10) {

@@ -55,10 +61,16 @@ void TimingInit(void)   // (extern)

   // configure timer 1 to count cycles

   TCCR1A = 0 << WGM11 | 0 << WGM10;           // normal mode

-  TCCR1B = 0 << WGM13 | 0 << WGM12 | 0 << CS12 | 0 << CS11 | 1 << CS10; // normal 

-                                                                        // mode, 

-                                                                        // no 

-                                                                        // prescaler

+  TCCR1B = 0 << WGM13 | 0 << WGM12 |          // normale mode

+           0 << CS12 | 0 << CS11 | 1 << CS10; // no prescaler

+}

+

+// get time in milliseconds

+void TimingGetMs(unsigned long *ms) // (extern)

+{

+  ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {

+    *ms = TimingMs;

+  }

 }

 // provide curent time stamp as entropy to random number generator

@@ -9,6 +9,9 @@

 // initialize

 extern void TimingInit(void);

+// get time in milliseconds

+extern void TimingGetMs(unsigned long *ms);

+

 // provide curent time stamp as entropy to random number generator

 extern void TimingEntropy(void);