Merged Ashish's work

3 files changed, 189 insertions, 44 deletions

diff --git a/src/c/hardware/avr/timer/u16AVRGetTimerValues.c b/src/c/hardware/avr/timer/u16AVRGetTimerValues.c
new file mode 100644
index 00000000..8ef16e8d
--- /dev/null
+++ b/src/c/hardware/avr/timer/u16AVRGetTimerValues.c
@@ -0,0 +1,51 @@
+/* Copyright (C) 2016 - IIT Bombay - FOSSEE
+
+ This file must be used under the terms of the CeCILL.
+ This source file is licensed as described in the file COPYING, which
+ you should have received as part of this distribution.  The terms
+ are also available at
+ http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ Author: Ashish Kamble
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/ 
+//Function selects the clock source and timer with prescaler.
+
+
+#include "AVRPeripheralTimer.h"
+#include <avr/interrupt.h>
+
+
+uint16 u8AVRGetTimerValues(uint16 timer)
+{   
+ uint16_t x;
+ switch(timer)
+ {
+  case 0:
+	{
+         x = TCNT0; 
+         break;
+        }	
+
+ case 1:
+       {
+        unsigned char sreg;
+ 	unsigned int val;
+        sreg = SREG;
+ 	cli();
+        val = TCNT1;
+ 	SREG = sreg;	
+ 	sei();
+        x = val;
+        break;	
+       }
+		
+ case 2:
+       {
+        x = TCNT2;
+  	break;
+       }
+ }	    
+return x;
+}
+
diff --git a/src/c/hardware/avr/timer/u8AVRGetTimerValues.c b/src/c/hardware/avr/timer/u8AVRGetTimerValues.c
index c542c182..e08bb3a6 100644
--- a/src/c/hardware/avr/timer/u8AVRGetTimerValues.c
+++ b/src/c/hardware/avr/timer/u8AVRGetTimerValues.c
@@ -1,3 +1,14 @@
+// Copyright (C) 2017 - IIT Bombay - FOSSEE
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+
+
 // Function to get timer count
 //
 // Calling Sequence
@@ -12,26 +23,41 @@
 //
 //
 // Authors
-//     Siddhesh Wani
+//     Ashish Kamble
 //
 
 
 #include "AVRPeripheralTimer.h"
+#include <avr/interrupt.h>
 
 
-uint8 u8AVRGetTimerValues(uint8 timer)
-{
+uint16 u8AVRGetTimerValues(uint16 timer)
+{   uint16_t x;
     switch(timer)
 	{
 		case 0:
-				return TCNT0;
-				
+		     {
+                      x = TCNT0; 
+		      break;
+		     }	
 		case 1:
-				break;
+		    {
+                     unsigned char sreg;
+ 		     unsigned int val;
+ 		     sreg = SREG;
+ 		     cli();
+ 		     val = TCNT1;
+ 		     SREG = sreg;	
+ 		     sei();
+                     x = val;
+                     break;		   
+                    }
 		case 2:
-				return TCNT2;
+		     {
+                      x = TCNT2;
+  		      break;
+		     }
 	}	    
-
-	return 0;
+return x;
 }
 
diff --git a/src/c/hardware/avr/timer/u8AVRTimerSetups.c b/src/c/hardware/avr/timer/u8AVRTimerSetups.c
index 1d93429b..6ee8d2af 100644
--- a/src/c/hardware/avr/timer/u8AVRTimerSetups.c
+++ b/src/c/hardware/avr/timer/u8AVRTimerSetups.c
@@ -1,42 +1,110 @@
-// Function to setup timer on AVR
-//
-// Calling Sequence
-//     u8AVRTimerSetups(timer, prescalar)
-//
-// Parameters
-//     timer: timer to be set up (0,1,2)
-//     prescalar: prescalar to be used for timer (0-7)
-//     ***Refer datasheet for more description about timer
-//              
-// Description
-//     This function sets prescalr for timers. 'timer' decides which of the 
-//     three (0,1,2) timers available to be used. The 'prescalar' is needed for 
-//     deciding timer clock. Select appropriate prescalar depending on MCU clock
-//     and requirement.
-//
-//
-// Authors
-//     Siddhesh Wani
-//
+/* Copyright (C) 2016 - IIT Bombay - FOSSEE
 
+ This file must be used under the terms of the CeCILL.
+ This source file is licensed as described in the file COPYING, which
+ you should have received as part of this distribution.  The terms
+ are also available at
+ http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ Author: Ashish Kamble
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/ 
+//Function selects the clock source and timer with prescaler.
 
 #include "AVRPeripheralTimer.h"
 
-
-uint8 u8AVRTimerSetups(uint8 timer,uint8 prescalar)
+uint8 u8AVRTimerSetups(uint8 timer,uint16 prescaler,uint8 clock_source)
 {
-    switch(timer)
-	{
-		case 0:
-				TCCR0|= (prescalar & 0x07);  //Select clock source
-				break;
-		case 1:
-				break;
-		case 2:
-				TCCR2|= (prescalar & 0x07);  //Select clock source
-				break;
-	}	    
-
-	return 0;
+ 
+ if(clock_source==0)
+ {
+  if(timer==0)
+  {
+   switch(prescaler)
+   {
+    case 1:    TCCR0 |= (1<<CS00);
+               TCNT0 = 0x00;
+    case 8:    TCCR0 |= (1<<CS01);
+	       TCNT0 = 0x00;
+    case 64:   TCCR0 |= (1<<CS00)|(1<<CS01);
+	       TCNT0 = 0x00;
+    case 256:  TCCR0 |= (1<<CS02);
+               TCNT0 = 0x00;
+    case 1024: TCCR0 |= (1<<CS00)|(1<<CS02);
+	       TCNT0 = 0x00;
+    }
+   }
+  else if(timer==2)
+  {
+   switch(prescaler)
+   {
+    case 1:    TCCR2 |= (1<<CS20);
+               TCNT2 = 0x00;
+    case 8:    TCCR2 |= (1<<CS21);
+	       TCNT2 = 0x00;
+    case 64:   TCCR2 |= (1<<CS20)|(1<<CS21);
+	       TCNT2 = 0x00;
+    case 256:  TCCR2 |= (1<<CS22);
+               TCNT2 = 0x00;
+    case 1024: TCCR2 |= (1<<CS20)|(1<<CS22);
+	       TCNT2 = 0x00;
+    }
+   }
+  else if(timer==1)
+  {
+   switch(prescaler)
+   {
+    case 1:    TCCR1B |= (1<<CS10);
+               TCNT1H = 0x00;
+               TCNT1L = 0x00;
+    case 8:    TCCR1B |= (1<<CS11);
+               TCNT1H = 0x00;
+               TCNT1L = 0x00;
+    case 64:   TCCR1B |= (1<<CS10)|(1<<CS11);
+               TCNT1H = 0x00;
+               TCNT1L = 0x00;
+    case 256:  TCCR1B |= (1<<CS12);
+               TCNT1H = 0x00;
+               TCNT1L = 0x00;
+    case 1024: TCCR1B |= (1<<CS10)|(1<<CS12);
+               TCNT1H = 0x00;
+               TCNT1L = 0x00;
+   }
+  }
+  }
+  else if(clock_source==1)
+  { 
+   if(timer==0)
+   {
+    TCCR0 |= (1<<CS00)|(1<<CS01)|(1<<CS02);
+    TCNT0 = 0x00;
+   }
+   else if(timer==2)
+   { 
+    TCCR2 |= (1<<CS20)|(1<<CS21)|(1<<CS22);
+    TCNT2 = 0x00;
+   }
+   else if(timer==1)
+   { 
+    TCCR1B |= (1<<CS10)|(1<<CS11)|(1<<CS12);
+    TCNT1H = 0x00;
+    TCNT1L = 0x00;
+   } 
+  }  
+ return 0;
 }
 
+   
+
+
+
+
+
+
+
+
+
+
+
+
+