replace DuinOS IDE 0018 patched files with DuinOS IDE 0021 patched files

yannick.le.ny.56 · yannick.le.ny.56 · commit 370367788d29 · 2010-12-19T19:59:20.000Z
git-svn-id: http://duinos.googlecode.com/svn/trunk@9 542b9b23-42aa-b9a1-add2-148d3e16e5b3
diff --git a/arduino.DuinOS/WProgram.h b/arduino.DuinOS/WProgram.h
@@ -9,10 +9,11 @@
 
 #include "wiring.h"
 
-// DiunOS is include here, because it's part of the core:
+// DuinOS is include here, because it's part of the core:
 #include "DuinOS.h"
 
 #ifdef __cplusplus
+#include "WString.h"
 #include "HardwareSerial.h"
 
 uint16_t makeWord(uint16_t w);
@@ -30,6 +31,35 @@ long random(long);
 long random(long, long);
 void randomSeed(unsigned int);
 long map(long, long, long, long, long);
+
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+const static uint8_t A0 = 54;
+const static uint8_t A1 = 55;
+const static uint8_t A2 = 56;
+const static uint8_t A3 = 57;
+const static uint8_t A4 = 58;
+const static uint8_t A5 = 59;
+const static uint8_t A6 = 60;
+const static uint8_t A7 = 61;
+const static uint8_t A8 = 62;
+const static uint8_t A9 = 63;
+const static uint8_t A10 = 64;
+const static uint8_t A11 = 65;
+const static uint8_t A12 = 66;
+const static uint8_t A13 = 67;
+const static uint8_t A14 = 68;
+const static uint8_t A15 = 69;
+#else
+const static uint8_t A0 = 14;
+const static uint8_t A1 = 15;
+const static uint8_t A2 = 16;
+const static uint8_t A3 = 17;
+const static uint8_t A4 = 18;
+const static uint8_t A5 = 19;
+const static uint8_t A6 = 20;
+const static uint8_t A7 = 21;
+#endif
+
 #endif
 
 #endif
diff --git a/arduino.DuinOS/main.cpp b/arduino.DuinOS/main.cpp
@@ -1,4 +1,5 @@
 #include <WProgram.h>
+// add DuinOS support
 #include "DuinOS.h"
 
 unsigned portBASE_TYPE mainLoopPriority;
diff --git a/arduino.DuinOS/wiring.c b/arduino.DuinOS/wiring.c
@@ -19,7 +19,7 @@
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
 
-  $Id: wiring.c 808 2009-12-18 17:44:08Z dmellis $
+  $Id$
 */
 
 #include "wiring_private.h"
@@ -96,13 +96,18 @@ unsigned long micros() {
 }
 
 // DuinOS overrides this function with a macro (DuinOS.h)
-/*void delay(unsigned long ms)
+/* void delay(unsigned long ms)
 {
-	unsigned long start = millis();
-	
-	while (millis() - start <= ms)
-		;
-}*/
+	uint16_t start = (uint16_t)micros();
+
+	while (ms > 0) {
+		if (((uint16_t)micros() - start) >= 1000) {
+			ms--;
+			start += 1000;
+		}
+	}
+}
+*/
 
 /* Delay for the given number of microseconds.  Assumes a 8 or 16 MHz clock. */
 void delayMicroseconds(unsigned int us)
@@ -182,20 +187,22 @@ void init()
 	sbi(TIMSK0, TOIE0);
 #endif
 
-// DuinOS: This commented code is the only difference with the standard init() function
-// (DuinOS uses the timer 1 for the preemptive kernel):
-/*
 	// timers 1 and 2 are used for phase-correct hardware pwm
 	// this is better for motors as it ensures an even waveform
 	// note, however, that fast pwm mode can achieve a frequency of up
 	// 8 MHz (with a 16 MHz clock) at 50% duty cycle
+        
+        // DuinOS: This commented code is the only difference with the standard init() function
+	// (DuinOS uses the timer 1 for the preemptive kernel):
+	/* TCCR1B = 0;
 
 	// set timer 1 prescale factor to 64
 	sbi(TCCR1B, CS11);
 	sbi(TCCR1B, CS10);
 	// put timer 1 in 8-bit phase correct pwm mode
-	sbi(TCCR1A, WGM10);
-*/
+	sbi(TCCR1A, WGM10); */
+	
+
 	// set timer 2 prescale factor to 64
 #if defined(__AVR_ATmega8__)
 	sbi(TCCR2, CS22);
@@ -209,7 +216,7 @@ void init()
 	sbi(TCCR2A, WGM20);
 #endif
 
-#if defined(__AVR_ATmega1280__)
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
 	// set timer 3, 4, 5 prescale factor to 64
 	sbi(TCCR3B, CS31);	sbi(TCCR3B, CS30);
 	sbi(TCCR4B, CS41);	sbi(TCCR4B, CS40);
diff --git a/arduino.DuinOS/wiring.h b/arduino.DuinOS/wiring.h
@@ -19,13 +19,14 @@
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
 
-  $Id: wiring.h 804 2009-12-18 16:05:52Z dmellis $
+  $Id$
 */
 
 #ifndef Wiring_h
 #define Wiring_h
 
 #include <avr/io.h>
+#include <stdlib.h>
 #include "binary.h"
 
 #ifdef __cplusplus
@@ -57,7 +58,12 @@ extern "C"{
 #define FALLING 2
 #define RISING 3
 
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#define INTERNAL1V1 2
+#define INTERNAL2V56 3
+#else
 #define INTERNAL 3
+#endif
 #define DEFAULT 1
 #define EXTERNAL 0
 
@@ -106,12 +112,6 @@ int analogRead(uint8_t);
 void analogReference(uint8_t mode);
 void analogWrite(uint8_t, int);
 
-void beginSerial(long);
-void serialWrite(unsigned char);
-int serialAvailable(void);
-int serialRead(void);
-void serialFlush(void);
-
 unsigned long millis(void);
 unsigned long micros(void);
 
@@ -123,7 +123,8 @@ void delay(unsigned long);
 void delayMicroseconds(unsigned int us);
 unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
 
-void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, byte val);
+void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
+uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
 
 void attachInterrupt(uint8_t, void (*)(void), int mode);
 void detachInterrupt(uint8_t);
diff --git a/arduino.DuinOS/wiring_analog.c b/arduino.DuinOS/wiring_analog.c
@@ -39,16 +39,20 @@ int analogRead(uint8_t pin)
 {
 	uint8_t low, high;
 
-	// set the analog reference (high two bits of ADMUX) and select the
-	// channel (low 4 bits).  this also sets ADLAR (left-adjust result)
-	// to 0 (the default).
-	ADMUX = (analog_reference << 6) | (pin & 0x07);
-  
-#if defined(__AVR_ATmega1280__)
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+	if (pin >= 54) pin -= 54; // allow for channel or pin numbers
+
 	// the MUX5 bit of ADCSRB selects whether we're reading from channels
 	// 0 to 7 (MUX5 low) or 8 to 15 (MUX5 high).
 	ADCSRB = (ADCSRB & ~(1 << MUX5)) | (((pin >> 3) & 0x01) << MUX5);
+#else
+	if (pin >= 14) pin -= 14; // allow for channel or pin numbers
 #endif
+  
+	// set the analog reference (high two bits of ADMUX) and select the
+	// channel (low 4 bits).  this also sets ADLAR (left-adjust result)
+	// to 0 (the default).
+	ADMUX = (analog_reference << 6) | (pin & 0x07);
 
 	// without a delay, we seem to read from the wrong channel
 	//delay(1);
@@ -84,19 +88,19 @@ void analogWrite(uint8_t pin, int val)
 	pinMode(pin, OUTPUT);
 	
 	if (digitalPinToTimer(pin) == TIMER1A) {
-/* DuinOS uses the timer 1 for its kernel:
+	/* Because DuinOS uses the timer 1 for its kernel, disable this part:  
 		// connect pwm to pin on timer 1, channel A
 		sbi(TCCR1A, COM1A1);
 		// set pwm duty
 		OCR1A = val;
-*/
+	*/
 	} else if (digitalPinToTimer(pin) == TIMER1B) {
-/* DuinOS uses the timer 1 for its kernel:
+	/* Because DuinOS uses the timer 1 for its kernel, disable this part:  
 		// connect pwm to pin on timer 1, channel B
 		sbi(TCCR1A, COM1B1);
 		// set pwm duty
 		OCR1B = val;
-*/
+	*/
 #if defined(__AVR_ATmega8__)
 	} else if (digitalPinToTimer(pin) == TIMER2) {
 		// connect pwm to pin on timer 2, channel B
@@ -133,7 +137,7 @@ void analogWrite(uint8_t pin, int val)
 		// set pwm duty
 		OCR2B = val;
 #endif
-#if defined(__AVR_ATmega1280__)
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
 	// XXX: need to handle other timers here
 	} else if (digitalPinToTimer(pin) == TIMER3A) {
 		// connect pwm to pin on timer 3, channel A

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include <WProgram.h>`
	`2`	`+// add DuinOS support`
`2`	`3`	`#include "DuinOS.h"`
`3`	`4`
`4`	`5`	`unsigned portBASE_TYPE mainLoopPriority;`