rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Code Issues Releases Activity

Merge branch 'master' of github.com:arduino/Arduino into new-extension

Browse Source
This commit is contained in:
Zach Eveland 2012-01-10 12:02:27 -05:00
commit 2622ad5580
13 changed files with 92 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
app/bin/
app/pde.jar
build/macosx/work/
core/bin/
core/core.jar

1
build/shared/lib/keywords.txt
View File

@ -3,6 +3,7 @@
HIGH LITERAL1 Constants HIGH LITERAL1 Constants
LOW LITERAL1 Constants LOW LITERAL1 Constants
INPUT LITERAL1 Constants INPUT LITERAL1 Constants
INPUT_PULLUP LITERAL1 Constants
OUTPUT LITERAL1 Constants OUTPUT LITERAL1 Constants
DEC LITERAL1 Serial_Print DEC LITERAL1 Serial_Print
BIN LITERAL1 Serial_Print BIN LITERAL1 Serial_Print

2
hardware/arduino/boards.txt
View File

@ -1,3 +1,5 @@
# See: http://code.google.com/p/arduino/wiki/Platforms
############################################################## ##############################################################
uno.name=Arduino Uno uno.name=Arduino Uno

1
hardware/arduino/cores/arduino/Arduino.h
View File

@ -20,6 +20,7 @@ extern "C"{
#define INPUT 0x0 #define INPUT 0x0
#define OUTPUT 0x1 #define OUTPUT 0x1
#define INPUT_PULLUP 0x2
#define true 0x1 #define true 0x1
#define false 0x0 #define false 0x0

18
hardware/arduino/cores/arduino/Stream.cpp
View File

@ -101,23 +101,25 @@ bool Stream::findUntil(char *target, size_t targetLen, char *terminator, size_t
int c; int c;
if( *target == 0) if( *target == 0)
return true; // return true if target is a null string return true; // return true if target is a null string
while( (c = timedRead()) > 0){ while( (c = timedRead()) > 0){
if(c != target[index])
index = 0; // reset index if any char does not match
if( c == target[index]){ if( c == target[index]){
//////Serial.print("found "); Serial.write(c); Serial.print("index now"); Serial.println(index+1); //////Serial.print("found "); Serial.write(c); Serial.print("index now"); Serial.println(index+1);
if(++index >= targetLen){ // return true if all chars in the target match if(++index >= targetLen){ // return true if all chars in the target match
return true; return true;
} }
} }
else{
index = 0; // reset index if any char does not match
}
if(termLen > 0 && c == terminator[termIndex]){ if(termLen > 0 && c == terminator[termIndex]){
if(++termIndex >= termLen) if(++termIndex >= termLen)
return false; // return false if terminate string found before target string return false; // return false if terminate string found before target string
} }
else else
termIndex = 0; termIndex = 0;
} }
return false; return false;
} }

2
hardware/arduino/cores/arduino/WInterrupts.c
View File

@ -32,7 +32,7 @@
#include "wiring_private.h" #include "wiring_private.h"
volatile static voidFuncPtr intFunc[EXTERNAL_NUM_INTERRUPTS]; static volatile voidFuncPtr intFunc[EXTERNAL_NUM_INTERRUPTS];
// volatile static voidFuncPtr twiIntFunc; // volatile static voidFuncPtr twiIntFunc;
void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), int mode) { void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), int mode) {

4
hardware/arduino/cores/arduino/WString.cpp
View File

@ -500,7 +500,7 @@ int String::lastIndexOf( char theChar ) const
int String::lastIndexOf(char ch, unsigned int fromIndex) const int String::lastIndexOf(char ch, unsigned int fromIndex) const
{ {
if (fromIndex >= len || fromIndex < 0) return -1; if (fromIndex >= len) return -1;
char tempchar = buffer[fromIndex + 1]; char tempchar = buffer[fromIndex + 1];
buffer[fromIndex + 1] = '\0'; buffer[fromIndex + 1] = '\0';
char* temp = strrchr( buffer, ch ); char* temp = strrchr( buffer, ch );
@ -516,7 +516,7 @@ int String::lastIndexOf(const String &s2) const
int String::lastIndexOf(const String &s2, unsigned int fromIndex) const int String::lastIndexOf(const String &s2, unsigned int fromIndex) const
{ {
if (s2.len == 0 || len == 0 || s2.len > len || fromIndex < 0) return -1; if (s2.len == 0 || len == 0 || s2.len > len) return -1;
if (fromIndex >= len) fromIndex = len - 1; if (fromIndex >= len) fromIndex = len - 1;
int found = -1; int found = -1;
for (char *p = buffer; p <= buffer + fromIndex; p++) { for (char *p = buffer; p <= buffer + fromIndex; p++) {

10
hardware/arduino/cores/arduino/wiring_digital.c
View File

@ -32,17 +32,25 @@ void pinMode(uint8_t pin, uint8_t mode)
{ {
uint8_t bit = digitalPinToBitMask(pin); uint8_t bit = digitalPinToBitMask(pin);
uint8_t port = digitalPinToPort(pin); uint8_t port = digitalPinToPort(pin);
volatile uint8_t *reg; volatile uint8_t *reg, *out;
if (port == NOT_A_PIN) return; if (port == NOT_A_PIN) return;
// JWS: can I let the optimizer do this? // JWS: can I let the optimizer do this?
reg = portModeRegister(port); reg = portModeRegister(port);
out = portOutputRegister(port);
if (mode == INPUT) { if (mode == INPUT) {
uint8_t oldSREG = SREG; uint8_t oldSREG = SREG;
cli(); cli();
*reg &= ~bit; *reg &= ~bit;
*out &= ~bit;
SREG = oldSREG;
} else if (mode == INPUT_PULLUP) {
uint8_t oldSREG = SREG;
cli();
*reg &= ~bit;
*out |= bit;
SREG = oldSREG; SREG = oldSREG;
} else { } else {
uint8_t oldSREG = SREG; uint8_t oldSREG = SREG;

2
hardware/arduino/programmers.txt
View File

@ -1,3 +1,5 @@
# See: http://code.google.com/p/arduino/wiki/Platforms
avrisp.name=AVR ISP avrisp.name=AVR ISP
avrisp.communication=serial avrisp.communication=serial
avrisp.protocol=stk500v1 avrisp.protocol=stk500v1

36
hardware/arduino/variants/leonardo/pins_arduino.h
View File

@ -35,29 +35,29 @@
#define RXLED0 PORTB |= (1<<0) #define RXLED0 PORTB |= (1<<0)
#define RXLED1 PORTB &= ~(1<<0) #define RXLED1 PORTB &= ~(1<<0)
const static uint8_t SDA = 2; static const uint8_t SDA = 2;
const static uint8_t SCL = 3; static const uint8_t SCL = 3;
// Map SPI port to 'new' pins D14..D17 // Map SPI port to 'new' pins D14..D17
const static uint8_t SS = 17; static const uint8_t SS = 17;
const static uint8_t MOSI = 16; static const uint8_t MOSI = 16;
const static uint8_t MISO = 14; static const uint8_t MISO = 14;
const static uint8_t SCK = 15; static const uint8_t SCK = 15;
// Mapping of analog pins as digital I/O // Mapping of analog pins as digital I/O
// A6-A11 share with digital pins // A6-A11 share with digital pins
const static uint8_t A0 = 18; static const uint8_t A0 = 18;
const static uint8_t A1 = 19; static const uint8_t A1 = 19;
const static uint8_t A2 = 20; static const uint8_t A2 = 20;
const static uint8_t A3 = 21; static const uint8_t A3 = 21;
const static uint8_t A4 = 22; static const uint8_t A4 = 22;
const static uint8_t A5 = 23; static const uint8_t A5 = 23;
const static uint8_t A6 = 24; // D4 static const uint8_t A6 = 24; // D4
const static uint8_t A7 = 25; // D6 static const uint8_t A7 = 25; // D6
const static uint8_t A8 = 26; // D8 static const uint8_t A8 = 26; // D8
const static uint8_t A9 = 27; // D9 static const uint8_t A9 = 27; // D9
const static uint8_t A10 = 28; // D10 static const uint8_t A10 = 28; // D10
const static uint8_t A11 = 29; // D12 static const uint8_t A11 = 29; // D12
// __AVR_ATmega32U4__ has an unusual mapping of pins to channels // __AVR_ATmega32U4__ has an unusual mapping of pins to channels
extern const uint8_t PROGMEM analog_pin_to_channel_PGM[]; extern const uint8_t PROGMEM analog_pin_to_channel_PGM[];

46
hardware/arduino/variants/mega/pins_arduino.h
View File

@ -32,31 +32,31 @@
#define analogInputToDigitalPin(p) ((p < 16) ? (p) + 54 : -1) #define analogInputToDigitalPin(p) ((p < 16) ? (p) + 54 : -1)
#define digitalPinHasPWM(p) (((p) >= 2 && (p) <= 13) || ((p) >= 44 && (p)<= 46)) #define digitalPinHasPWM(p) (((p) >= 2 && (p) <= 13) || ((p) >= 44 && (p)<= 46))
const static uint8_t SS = 53; static const uint8_t SS = 53;
const static uint8_t MOSI = 51; static const uint8_t MOSI = 51;
const static uint8_t MISO = 50; static const uint8_t MISO = 50;
const static uint8_t SCK = 52; static const uint8_t SCK = 52;
const static uint8_t SDA = 20; static const uint8_t SDA = 20;
const static uint8_t SCL = 21; static const uint8_t SCL = 21;
const static uint8_t LED_BUILTIN = 13; static const uint8_t LED_BUILTIN = 13;
const static uint8_t A0 = 54; static const uint8_t A0 = 54;
const static uint8_t A1 = 55; static const uint8_t A1 = 55;
const static uint8_t A2 = 56; static const uint8_t A2 = 56;
const static uint8_t A3 = 57; static const uint8_t A3 = 57;
const static uint8_t A4 = 58; static const uint8_t A4 = 58;
const static uint8_t A5 = 59; static const uint8_t A5 = 59;
const static uint8_t A6 = 60; static const uint8_t A6 = 60;
const static uint8_t A7 = 61; static const uint8_t A7 = 61;
const static uint8_t A8 = 62; static const uint8_t A8 = 62;
const static uint8_t A9 = 63; static const uint8_t A9 = 63;
const static uint8_t A10 = 64; static const uint8_t A10 = 64;
const static uint8_t A11 = 65; static const uint8_t A11 = 65;
const static uint8_t A12 = 66; static const uint8_t A12 = 66;
const static uint8_t A13 = 67; static const uint8_t A13 = 67;
const static uint8_t A14 = 68; static const uint8_t A14 = 68;
const static uint8_t A15 = 69; static const uint8_t A15 = 69;
// A majority of the pins are NOT PCINTs, SO BE WARNED (i.e. you cannot use them as receive pins) // A majority of the pins are NOT PCINTs, SO BE WARNED (i.e. you cannot use them as receive pins)
// Only pins available for RECEIVE (TRANSMIT can be on any pin): // Only pins available for RECEIVE (TRANSMIT can be on any pin):

30
hardware/arduino/variants/standard/pins_arduino.h
View File

@ -37,23 +37,23 @@
#define digitalPinHasPWM(p) ((p) == 3 || (p) == 5 || (p) == 6 || (p) == 9 || (p) == 10 || (p) == 11) #define digitalPinHasPWM(p) ((p) == 3 || (p) == 5 || (p) == 6 || (p) == 9 || (p) == 10 || (p) == 11)
#endif #endif
const static uint8_t SS = 10; static const uint8_t SS = 10;
const static uint8_t MOSI = 11; static const uint8_t MOSI = 11;
const static uint8_t MISO = 12; static const uint8_t MISO = 12;
const static uint8_t SCK = 13; static const uint8_t SCK = 13;
const static uint8_t SDA = 18; static const uint8_t SDA = 18;
const static uint8_t SCL = 19; static const uint8_t SCL = 19;
const static uint8_t LED_BUILTIN = 13; static const uint8_t LED_BUILTIN = 13;
const static uint8_t A0 = 14; static const uint8_t A0 = 14;
const static uint8_t A1 = 15; static const uint8_t A1 = 15;
const static uint8_t A2 = 16; static const uint8_t A2 = 16;
const static uint8_t A3 = 17; static const uint8_t A3 = 17;
const static uint8_t A4 = 18; static const uint8_t A4 = 18;
const static uint8_t A5 = 19; static const uint8_t A5 = 19;
const static uint8_t A6 = 20; static const uint8_t A6 = 20;
const static uint8_t A7 = 21; static const uint8_t A7 = 21;
#define digitalPinToPCICR(p) (((p) >= 0 && (p) <= 21) ? (&PCICR) : ((uint8_t *)0)) #define digitalPinToPCICR(p) (((p) >= 0 && (p) <= 21) ? (&PCICR) : ((uint8_t *)0))
#define digitalPinToPCICRbit(p) (((p) <= 7) ? 2 : (((p) <= 13) ? 0 : 1)) #define digitalPinToPCICRbit(p) (((p) <= 7) ? 2 : (((p) <= 13) ? 0 : 1))

2
libraries/Servo/Servo.cpp
View File

@ -298,7 +298,7 @@ void Servo::writeMicroseconds(int value)
{ {
// calculate and store the values for the given channel // calculate and store the values for the given channel
byte channel = this->servoIndex; byte channel = this->servoIndex;
if( (channel >= 0) && (channel < MAX_SERVOS) ) // ensure channel is valid if( (channel < MAX_SERVOS) ) // ensure channel is valid
{ {
if( value < SERVO_MIN() ) // ensure pulse width is valid if( value < SERVO_MIN() ) // ensure pulse width is valid
value = SERVO_MIN(); value = SERVO_MIN();