Changeset 17632 for firmware

Timestamp:

03/18/14 16:30:12 (11 years ago)

Author:

dneise

Message:

whitespace changes, using global register

Location:

firmware/FSC/src

Files:

• timer.c (modified) (1 diff)
• timer.h (modified) (1 diff)

firmware/FSC/src/timer.c

@@ -1 @@
-#include "typedefs.h"
+#include "application.h"
 #include <avr/interrupt.h>
 
-
-        volatile U16 milisec = 0;
-        volatile U32 sec = 0;
+// We use the global volatile register!
+// gVolReg.time_sec and 
 
 void timer_init() {
-        // TIMER2 is used as local clock:
-        // configure timer 2
-        TCCR2 = (1<<WGM21); // CTC Modus
-        TCCR2 |= (1<<CS21) | (1<<CS20); // Prescaler 64 --> counts up every 8us
-        OCR2 = 125-1;                                   // --> output compare interrupt occurs every 125 x 8us = 1ms
-        // Compare Interrupt erlauben
-        TIMSK |= (1<<OCIE2);
-        
+    // TIMER2 is used as local clock:
+    // configure timer 2
+    TCCR2 = (1<<WGM21); // CTC Modus
+    TCCR2 |= (1<<CS21) | (1<<CS20); // Prescaler 64 --> counts up every 8us
+    OCR2 = 125-1;                                       // --> output compare interrupt occurs every 125 x 8us = 1ms
+    // Compare Interrupt erlauben
+    TIMSK |= (1<<OCIE2);
 }
 
-ISR (TIMER2_COMP_vect)
-{
-        if (milisec < 999)
-                ++milisec;
-        else {
-                milisec = 0;
-                sec++;
-        }
-                
+ISR (TIMER2_COMP_vect) {
+    if (gVolReg.time_ms < 999)
+        ++gVolReg.time_ms;
+    else {
+        gVolReg.time_ms = 0;
+        gVolReg.time_sec++;
+    }
 }

firmware/FSC/src/timer.h

@@ -2 +2 @@
 #define __TIMER_H
 
-        extern volatile U16 milisec;
-        extern volatile U32 sec;
-        
 void timer_init();
 ISR (TIMER2_COMP_vect);