Skip to content

Commit 96c292c

Browse files
cmagliecmaglie
committed
Merged 1.0.5
Still missing: - updates to WiFi lib for sam. - updates to examples of Ehternet and WiFi for sam. Merge remote-tracking branch 'arduino/master' into ide-1.5.x Conflicts: app/src/processing/app/Base.java app/src/processing/app/Editor.java app/src/processing/app/helpers/FileUtils.java app/src/processing/app/i18n/Resources_fr.po app/src/processing/app/i18n/Resources_fr.properties build/shared/revisions.txt hardware/arduino/avr/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.ino hardware/arduino/avr/libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino hardware/arduino/avr/libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino hardware/arduino/avr/libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino hardware/arduino/avr/libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino hardware/arduino/avr/libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino hardware/arduino/avr/libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino hardware/arduino/avr/libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino hardware/arduino/avr/libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino libraries/WiFi/examples/WiFiChatServer/WiFiChatServer.ino libraries/WiFi/examples/WiFiPachubeClient/WiFiPachubeClient.ino libraries/WiFi/examples/WiFiPachubeClientString/WiFiPachubeClientString.ino libraries/WiFi/examples/WiFiTwitterClient/WiFiTwitterClient.ino libraries/WiFi/examples/WiFiUdpSendReceiveString/WiFiUdpSendReceiveString.ino libraries/WiFi/examples/WiFiWebClient/WiFiWebClient.ino libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino libraries/WiFi/examples/WiFiWebServer/WiFiWebServer.ino libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino
2 parents a4d497a + 7a6856e commit 96c292c

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

‎hardware/arduino/avr/cores/arduino/Arduino.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void yield(void);
4848
#define EXTERNAL 1
4949
#define INTERNAL 2
5050
#else
51-
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644P__)
51+
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644__) || defined(__AVR_ATmega644A__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__)
5252
#define INTERNAL1V1 2
5353
#define INTERNAL2V56 3
5454
#else

‎hardware/arduino/avr/cores/arduino/Stream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ readBytesBetween( pre_string, terminator, buffer, length)
3737

3838
class Stream : public Print
3939
{
40-
private:
40+
protected:
4141
unsigned long _timeout; // number of milliseconds to wait for the next char before aborting timed read
4242
unsigned long _startMillis; // used for timeout measurement
4343
int timedRead(); // private method to read stream with timeout

‎hardware/arduino/avr/cores/arduino/WString.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ class String
147147
void getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index=0) const;
148148
void toCharArray(char *buf, unsigned int bufsize, unsigned int index=0) const
149149
{getBytes((unsigned char *)buf, bufsize, index);}
150+
const char * c_str() const { return buffer; }
150151

151152
// search
152153
int indexOf( char ch ) const;

‎hardware/arduino/avr/cores/arduino/wiring_analog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ int analogRead(uint8_t pin)
4545
if (pin >= 54) pin -= 54; // allow for channel or pin numbers
4646
#elif defined(__AVR_ATmega32U4__)
4747
if (pin >= 18) pin -= 18; // allow for channel or pin numbers
48-
#elif defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644P__)
48+
#elif defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644__) || defined(__AVR_ATmega644A__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__)
4949
if (pin >= 24) pin -= 24; // allow for channel or pin numbers
5050
#elif defined(analogPinToChannel) && (defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__))
5151
pin = analogPinToChannel(pin);

‎hardware/arduino/avr/cores/arduino/wiring_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ extern "C"{
5454

5555
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
5656
#define EXTERNAL_NUM_INTERRUPTS 8
57-
#elif defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644P__)
57+
#elif defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644__) || defined(__AVR_ATmega644A__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__)
5858
#define EXTERNAL_NUM_INTERRUPTS 3
5959
#elif defined(__AVR_ATmega32U4__)
6060
#define EXTERNAL_NUM_INTERRUPTS 4

‎hardware/arduino/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ void loop() {
6060

6161
}
6262

63-
int digitalPotWrite(int address, int value) {
63+
void digitalPotWrite(int address, int value) {
6464
// take the SS pin low to select the chip:
6565
digitalWrite(slaveSelectPin,LOW);
6666
// send in the address and value via SPI:
6767
SPI.transfer(address);
6868
SPI.transfer(value);
6969
// take the SS pin high to de-select the chip:
7070
digitalWrite(slaveSelectPin,HIGH);
71-
}
71+
}

0 commit comments

Comments
 (0)