Skip to content

Commit fe1b39f

Browse files
Links2004Links2004
committed
update AVR src
* java code not tested * Merge remote-tracking branch 'remotes/arduino/master' into esp8266 Conflicts: README.md app/src/processing/app/AbstractMonitor.java arduino-core/src/processing/app/Serial.java libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino libraries/WiFi/library.properties
1 parent e856053 commit fe1b39f

6 files changed

Lines changed: 11 additions & 6 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ hardware/arduino/bootloaders/caterina_LUFA/Caterina.lss
1313
hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
1414
hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
1515
hardware/arduino/bootloaders/caterina_LUFA/.dep/
16-
build/libastylej-*.zip
16+
build/*.zip
1717
build/windows/work/
1818
build/windows/*.zip
1919
build/windows/*.tgz

‎cores/esp8266/Esp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ uint32_t EspClass::getFlashChipSizeByChipId(void) {
291291
String EspClass::getResetInfo(void) {
292292
if(resetInfo.reason != 0) {
293293
char buff[200];
294-
sprintf(&buff[0], "Fatal exception:%d flag:%d (%s) epc1:0x%08x epc2:0x%08x epc3:0x%08x excvaddr:0x%08x depc:0x%08x", resetInfo.exccause, resetInfo.reason, (resetInfo.reason == 0 ? "DEFAULT" : resetInfo.reason == 1 ? "WDT" : resetInfo.reason == 2 ? "EXCEPTION" : resetInfo.reason == 3 ? "SOFT_WDT" : resetInfo.reason == 4 ? "SOFT_RESTART" : resetInfo.reason == 5 ? "DEEP_SLEEP_AWAKE" : "???"), resetInfo.epc1, resetInfo.epc2, resetInfo.epc3, resetInfo.excvaddr, resetInfo.depc);
294+
sprintf(&buff[0], "Fatal exception:%d flag:%d (%s) epc1:0x%08x epc2:0x%08x epc3:0x%08x excvaddr:0x%08x depc:0x%08x", resetInfo.exccause, resetInfo.reason, (resetInfo.reason == 0 ? "DEFAULT" : resetInfo.reason == 1 ? "WDT" : resetInfo.reason == 2 ? "EXCEPTION" : resetInfo.reason == 3 ? "SOFT_WDT" : resetInfo.reason == 4 ? "SOFT_RESTART" : resetInfo.reason == 5 ? "DEEP_SLEEP_AWAKE" : "???"), resetInfo.epc1, resetInfo.epc2, resetInfo.epc3, resetInfo.excvaddr, resetInfo.depc);
295295
return String(buff);
296296
}
297297
return String("flag: 0");

‎libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#undef max
3333
#include <vector>
3434

35-
//#define DEBUG_WIFI_MULTI(...) Serial1.printf( __VA_ARGS__ )
35+
#define DEBUG_WIFI_MULTI(...) Serial1.printf( __VA_ARGS__ )
3636

3737
#ifndef DEBUG_WIFI_MULTI
3838
#define DEBUG_WIFI_MULTI(...)

‎libraries/SD/README.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
The SD library allows for reading from and writing to SD cards.
44

55
For more information about this library please visit us at
6-
http://arduino.cc/en/Reference/SD
6+
http://www.arduino.cc/en/Reference/SD
77

88
== License ==
99

‎libraries/SD/library.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name=SD
2-
version=1.0.4
2+
version=1.0.5
33
author=Arduino, SparkFun
44
maintainer=Arduino <info@arduino.cc>
55
sentence=Enables reading and writing on SD cards. For all Arduino boards.
66
paragraph=Once an SD memory card is connected to the SPI interfare of the Arduino board you are enabled to create files and read/write on them. You can also move through directories on the SD card.
77
category=Data Storage
8-
url=http://arduino.cc/en/Reference/SD
8+
url=http://www.arduino.cc/en/Reference/SD
99
architectures=*

‎libraries/SD/src/SD.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,23 @@ class SDClass {
9393
// write, etc). Returns a File object for interacting with the file.
9494
// Note that currently only one file can be open at a time.
9595
File open(const char *filename, uint8_t mode = FILE_READ);
96+
File open(const String &filename, uint8_t mode = FILE_READ) { return open( filename.c_str(), mode ); }
9697

9798
// Methods to determine if the requested file path exists.
9899
boolean exists(char *filepath);
100+
boolean exists(const String &filepath) { return exists(filepath.c_str()); }
99101

100102
// Create the requested directory heirarchy--if intermediate directories
101103
// do not exist they will be created.
102104
boolean mkdir(char *filepath);
105+
boolean mkdir(const String &filepath) { return mkdir(filepath.c_str()); }
103106

104107
// Delete the file.
105108
boolean remove(char *filepath);
109+
boolean remove(const String &filepath) { return remove(filepath.c_str()); }
106110

107111
boolean rmdir(char *filepath);
112+
boolean rmdir(const String &filepath) { return rmdir(filepath.c_str()); }
108113

109114
uint8_t type(){ return card.type(); }
110115
uint8_t fatType(){ return volume.fatType(); }

0 commit comments

Comments
 (0)