1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-23 19:21:59 +03:00
Commit Graph

20 Commits

Author SHA1 Message Date
e8789e9cb5 Merge branch 'master' into esp8266
* master: (414 commits)
  Don't export sketch if the underlying core does not support it. Fixes #3171
  RSyntaxTextArea: using a modified version, tracked at https://github.com/arduino/RSyntaxTextArea. Fixes #3099
  Updated keywords.txt
  New editor on MacOSX: since CMD+J is known as "jump to selection" and the editor has no such feature, CMD+J is disabled on mac. See #3098
  Old Preferences class remains for backwards compatibility as a delegate for PreferencesData
  New Preferences window: renders fine on every OS and it's easier to adapt using NetBeans as visual editor. Fixes #3140
  Remove spawn from exec command
  Removed redundant call to File.deleteIfExists()
  Removed buggy redundant check in FileUtils.deleteIfExists()
  Restored current line/current selected lines display on lower left of the IDE. Fixes #3134
  Updated cursor.ino
  New editor on MacOSX: restored CMD+E for finding selected text
  New editor on MacOSX: CMD+UP/DOWN moves cursor to start or end of sketch. See #3098
  New editor on MacOSX: CMD+BACKSPACE deletes current line until cursor position, ALT+BACKSPACE deletes previous word. See #3098
  ArduinoIDE is in the default package. Removed
  Fixes  #2969:
  Fix Uncategorized warning message
  New editor: ALT+ BACKSPACE deletes next word (OSX only). See #3098
  New editor: ALT+ UP/DOWN move current line only if "editor.advanced" (hidden pref) is true. Fixes #3101
  New editor: mark occurrences enable when "editor.advanced" (hidden pref) is true. Fixes #3102
  ...

Conflicts:
	.gitignore
	build/build.xml
	hardware/esp8266com/esp8266/libraries/ESP8266WiFi/keywords.txt
	hardware/esp8266com/esp8266/libraries/ESP8266WiFi/library.properties
	hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h
	libraries/WiFi/README.adoc
	libraries/WiFi/src/WiFi.cpp
	libraries/WiFi/src/WiFiClient.cpp
	libraries/WiFi/src/WiFiClient.h
	libraries/WiFi/src/WiFiServer.cpp
	libraries/WiFi/src/WiFiUdp.cpp
2015-05-18 14:54:06 +03:00
f946821381 fix data types 2015-05-16 16:29:10 +03:00
b40ec2fc35 add info methods to SD class 2015-05-16 16:22:38 +03:00
4ef84f6914 add template methods for stream to stream writes to SD and FS 2015-05-14 12:41:24 +03:00
9e76276fb2 add more NULL prt checks in strtok_r
Conflicts:
	libraries/SD/src/SD.cpp
	libraries/SD/src/SD.h
2015-05-12 17:10:19 +02:00
41d370fb28 Add option to select SPI speed at SD::begin 2015-05-11 22:29:02 +03:00
934434d5f9 SD:
- optimize SPI usage 148% write speed (24kB/s -> 37kB/s) and 127% read speed (121kB/s -> 155kB/s) at 8MHz
 - add clock frequency as parameter for begin(csPin, frequency)
 - SD @80MHz write: 84kB/s read: 231kB/s

SPI add functions:
 - void write32(uint32_t data);
 - void write32(uint32_t data, bool msb);
 - void transferBytes(uint8_t * out, uint8_t * in, uint32_t size);

Adafruit_ILI9341:
 - code clean
2015-05-10 17:34:16 +02:00
c20cfbea87 increase SD Card SPI Speed 2015-05-08 13:22:49 +03:00
b15808e60f fix SPI clock for SD library 2015-05-08 11:44:45 +03:00
83ed3d5d8f Importing my changes 2015-04-30 20:48:50 +03:00
1c25d2432f SD: allow multiple SD instances
The SDClass class makes a reference to "SD.card" instead of just "card". SD is a global instance of SDClass.
This prevents any other instance of SDClass from functioning correctly.
The fix also allows SDClass to be used with an SD card which is removed and replaced, whereas previously, using the global instance SD did not allow this due to the limitation of begin() which cannot be called more than once.
2015-04-27 11:53:02 +02:00
a6be90f983 SD: avoid timeout lock if millis() approaches 2^16
this is a rework of @Timmmm 's PR #1977
2015-03-23 15:28:19 +01:00
c0bc2d22f6 Fix SPI transaction mismatch errors 2014-11-20 18:54:04 -08:00
f7a565de1a Use SPI transactions and SPISettings in SD library 2014-08-01 12:19:51 -07:00
12b706551d SD.c: Fix error in comment for remove()
Comment was duplicated from mkdir() and not updated.
2014-02-19 16:09:30 +01:00
a991f26b8d Sd2Card.cpp: fix compiler warning
All the while() loops that check for the SPI transfer to be complete have the
semi-colon immediately after the closing parenthesis.  This both causes a
compiler warning of "warning: suggest a space before ';' or explicit braces
around empty body in 'while' statement", and is considered a less-than-ideal
programming practice.  This patch breaks the semi-colon on to the next line,
both eliminating the compiler error and making the code more readable.

In all probability the test should be moved into a macro or a inlineable
sub-routine.
2014-02-19 16:09:30 +01:00
88f7504e81 Removed destructor from File.cpp and SD.h as it leads to unexpected close/destructed objects #814 2013-10-15 17:09:20 +02:00
bef7b94ea7 merge 2013-10-14 12:42:42 +02:00
b28104b795 Audio library to the new format 2013-06-27 19:15:53 +02:00
9454816162 Ethernet, SD and LiquidCrystal to the new library format 2013-06-26 19:13:04 +02:00