update file after Servo lib patched and adding ServoTimer2 lib

yannick.le.ny.56 · yannick.le.ny.56 · commit fa013d7905f8 · 2010-12-20T22:30:50.000Z
git-svn-id: http://duinos.googlecode.com/svn/trunk@24 542b9b23-42aa-b9a1-add2-148d3e16e5b3
diff --git a/howto-new-duinos-release.txt b/howto-new-duinos-release.txt
@@ -35,7 +35,7 @@ heap_3.c
 c) from FreeRTOSVx.x.x/Source/portable/GCC/ATMega323/ 
 port.c
 portmacro.h
-dont port.c a été mis à jour pour supporter les microcontroleurs Atmel
+port.c (file updated to add support for Atmel AtMega chips
 
 3) Now you need to patch DuinOS_v0.X/arduino.DuinOS/DuinOS/port.c with the following patch :
 
@@ -532,6 +532,145 @@ and copy them in DuinOS_v0.X/arduino.DuinOS folder.
 +NORMAL_PRIORITY        LITERAL1
 +HIGH_PRIORITY  LITERAL1
 
+9) Copy arduino-00xx/libraries/Servo/Servo.h in DuinOS_v0.x/libraries/Servo folder and patch it with the following patch :
+Disable Timer1 because DuinOS uses the timer 1 for its kernel in this file
+
+--- Servo.h.ORI 2010-10-02 22:17:42.000000000 +0200
++++ Servo.h     2010-12-20 22:52:10.000000000 +0100
+@@ -59,29 +59,38 @@
+ // Say which 16 bit timers can be used and in what order
+ #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+ #define _useTimer5
+-#define _useTimer1 
++/* Disable Timer1 because DuinOS uses the timer 1 for its kernel
++#define _useTimer1 */
+ #define _useTimer3
+-#define _useTimer4 
+-typedef enum { _timer5, _timer1, _timer3, _timer4, _Nbr_16timers } timer16_Sequence_t ;
++#define _useTimer4
++/* Disable Timer1 because DuinOS uses the timer 1 for its kernel
++typedef enum { _timer5, _timer1, _timer3, _timer4, _Nbr_16timers } timer16_Sequence_t ; */
++typedef enum { _timer5, _timer3, _timer4, _Nbr_16timers } timer16_Sequence_t ;
+ 
+ #elif defined(__AVR_ATmega32U4__)  
+ #define _useTimer3
++/* Disable Timer1 because DuinOS uses the timer 1 for its kernel
+ #define _useTimer1 
+-typedef enum { _timer3, _timer1, _Nbr_16timers } timer16_Sequence_t ;
++typedef enum { _timer3, _timer1, _Nbr_16timers } timer16_Sequence_t ; */
++typedef enum { _timer3, _Nbr_16timers } timer16_Sequence_t ;
+ 
+ #elif defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__)
+ #define _useTimer3
+-#define _useTimer1
+-typedef enum { _timer3, _timer1, _Nbr_16timers } timer16_Sequence_t ;
++/* Disable Timer1 because DuinOS uses the timer 1 for its kernel
++#define _useTimer1 
++typedef enum { _timer3, _timer1, _Nbr_16timers } timer16_Sequence_t ; */
++typedef enum { _timer3, _Nbr_16timers } timer16_Sequence_t ;
+ 
+ #elif defined(__AVR_ATmega128__) ||defined(__AVR_ATmega1281__)||defined(__AVR_ATmega2561__)
+ #define _useTimer3
++/* Disable Timer1 because DuinOS uses the timer 1 for its kernel
+ #define _useTimer1
++typedef enum { _timer3, _timer1, _Nbr_16timers } timer16_Sequence_t ; */
+ typedef enum { _timer3, _timer1, _Nbr_16timers } timer16_Sequence_t ;
+ 
+ #else  // everything else
+-#define _useTimer1
+-typedef enum { _timer1, _Nbr_16timers } timer16_Sequence_t ;                  
++/* Disable Timer1 because DuinOS uses the timer 1 for its kernel
++typedef enum { _timer1, _Nbr_16timers } timer16_Sequence_t ; */                 
+ #endif
+ 
+ #define Servo_VERSION           2      // software version of this library
+
+
+10) Copy arduino-00xx/libraries/Servo/Servo.cpp in DuinOS_v0.x/libraries/Servo folder and patch it with the following patch :
+Disable Timer1 because DuinOS uses the timer 1 for its kernel in this file
+
+--- Servo.cpp.ORI       2010-10-02 22:17:42.000000000 +0200
++++ Servo.cpp   2010-12-20 22:57:04.000000000 +0100
+@@ -99,12 +99,13 @@
+ 
+ #ifndef WIRING // Wiring pre-defines signal handlers so don't define any if compiling for the Wiring platform
+ // Interrupt handlers for Arduino 
++/* Disable Timer1 because DuinOS uses the timer 1 for its kernel
+ #if defined(_useTimer1)
+ SIGNAL (TIMER1_COMPA_vect) 
+ { 
+   handle_interrupts(_timer1, &TCNT1, &OCR1A); 
+ }
+-#endif
++#endif */
+ 
+ #if defined(_useTimer3)
+ SIGNAL (TIMER3_COMPA_vect) 
+@@ -128,13 +129,15 @@
+ #endif
+ 
+ #elif defined WIRING
+-// Interrupt handlers for Wiring 
++// Interrupt handlers for Wiring
++/* Disable Timer1 because DuinOS uses the timer 1 for its kernel
+ #if defined(_useTimer1)
+ void Timer1Service() 
+ { 
+   handle_interrupts(_timer1, &TCNT1, &OCR1A); 
+ }
+ #endif
++*/
+ #if defined(_useTimer3)
+ void Timer3Service() 
+ { 
+@@ -145,7 +148,8 @@
+ 
+ 
+ static void initISR(timer16_Sequence_t timer)
+-{  
++{
++/* Disable Timer1 because DuinOS uses the timer 1 for its kernel  
+ #if defined (_useTimer1)
+   if(timer == _timer1) {
+     TCCR1A = 0;             // normal counting mode 
+@@ -163,7 +167,7 @@
+     timerAttach(TIMER1OUTCOMPAREA_INT, Timer1Service); 
+ #endif
+   } 
+-#endif  
++#endif */ 
+ 
+ #if defined (_useTimer3)
+   if(timer == _timer3) {
+@@ -208,6 +212,7 @@
+ {
+     //disable use of the given timer
+ #if defined WIRING   // Wiring
++  /* Disable Timer1 because DuinOS uses the timer 1 for its kernel
+   if(timer == _timer1) {
+     #if defined(__AVR_ATmega1281__)||defined(__AVR_ATmega2561__)
+     TIMSK1 &=  ~_BV(OCIE1A) ;  // disable timer 1 output compare interrupt
+@@ -216,7 +221,8 @@
+     #endif
+     timerDetach(TIMER1OUTCOMPAREA_INT); 
+   }
+-  else if(timer == _timer3) {     
++  else if(timer == _timer3) { */
++  if(timer == _timer3) {
+     #if defined(__AVR_ATmega1281__)||defined(__AVR_ATmega2561__)
+     TIMSK3 &= ~_BV(OCIE3A);    // disable the timer3 output compare A interrupt
+     #else
+
+11) Because with some chips as AtMega 168 and 328, Timer1 is disabled because DuinOS uses the timer 1 for its kernel.
+and we don't have now a 16 bit timer to use Servo lib that need it.
+Then we add ServoTimer2 lib (http://code.google.com/p/tricopter/source/browse/trunk/arduino/#arduino%2Flibraries%2FServoTimer2 )
+that use the 8 bits timer 2 for Servo.
+
+Copy the following files from this website 
+ServoTimer2.cpp, ServoTimer2.h, keywords.txt
+in DuinOS_v0.x/libraries/ServoTimer2 folder
+
+
 
 
 
