Merge branch 'ide-1.5.x' into ide-1.5.x-jssc

Author: Federico Fissore

app/src/processing/app/Base.java

@@ -61,9 +61,9 @@
  * files and images, etc) that comes from that.
  */
 public class Base {
-  public static final int REVISION = 154;
+  public static final int REVISION = 155;
   /** This might be replaced by main() if there's a lib/version.txt file. */
-  static String VERSION_NAME = "0154";
+  static String VERSION_NAME = "0155";
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
 

app/src/processing/app/packages/Library.java

@@ -1,7 +1,6 @@
 package processing.app.packages;
 
-import processing.app.helpers.FileUtils;
-import processing.app.helpers.PreferencesMap;
+import static processing.app.helpers.StringUtils.wildcardMatch;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +9,8 @@
 import java.util.Comparator;
 import java.util.List;
 
-import static processing.app.helpers.StringUtils.wildcardMatch;
+import processing.app.helpers.FileUtils;
+import processing.app.helpers.PreferencesMap;
 
 public class Library {
 
@@ -31,17 +31,12 @@ public class Library {
       .asList(new String[] { "architectures", "author", "core-dependencies",
           "dependencies", "email", "name", "paragraph", "sentence", "url",
           "version" });
-  private static final List<String> OPTIONAL_FOLDERS = Arrays
-      .asList(new String[] { "arch", "examples", "extras", "src" });
-  private static final List<String> OPTIONAL_FILES = Arrays
-      .asList(new String[] { "keywords.txt", "library.properties" });
-
 
   /**
    * Scans inside a folder and create a Library object out of it. Automatically
    * detects pre-1.5 libraries. Automatically fills metadata from
    * library.properties file if found.
-   *
+   * 
    * @param libFolder
    * @return
    */
@@ -74,18 +69,14 @@ private static Library createLibrary(File libFolder) throws IOException {
     if (!srcFolder.exists() || !srcFolder.isDirectory())
       throw new IOException("Missing 'src' folder");
 
-    // 3. check if root folder contains prohibited stuff
+    // 3. Warn if root folder contains development leftovers
     for (File file : libFolder.listFiles()) {
       if (file.isDirectory()) {
         if (FileUtils.isSCCSOrHiddenFile(file)) {
-          System.out.println("WARNING: Ignoring spurious " + file.getName() + " folder in '" + properties.get("name") + "' library");
+          System.out.println("WARNING: Spurious " + file.getName() +
+              " folder in '" + properties.get("name") + "' library");
           continue;
         }
-        if (!OPTIONAL_FOLDERS.contains(file.getName()))
-          throw new IOException("Invalid folder '" + file.getName() + "'.");
-      } else {
-        if (!OPTIONAL_FILES.contains(file.getName()))
-          throw new IOException("Invalid file '" + file.getName() + "'.");
       }
     }
 

build/build.xml

@@ -664,7 +664,8 @@
     </copy>
 
     <!-- Unzip AVR tools -->
-    <unzip dest="windows/work/hardware" src="windows/avr_tools.zip" overwrite="false"/>
+    <get src="http://downloads.arduino.cc/WinAVR-20081205-arduino-2.zip" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />
+    <unzip dest="windows/work/hardware" src="windows/WinAVR-20081205-arduino-2.zip" overwrite="false"/>
 
     <copy todir="windows/work/hardware/tools/avr/avr/include/avr">
       <fileset file="windows/eeprom.h" />

build/shared/revisions.txt

@@ -1,6 +1,10 @@
 
 ARDUINO 1.5.5 BETA
 
+NOTICE:
+The 1.5 library format is under heavy review on the Arduino Developers mailing list.
+We suggest to delay the adoption of the new format until a stable 1.5.x is released.
+
 [ide]
 * Added missing keywords: YunServer, YunClient, pow
 * Improved folder ignore: now hidden, starting with a dot, and SCCS folders are ignored
@@ -11,6 +15,7 @@ ARDUINO 1.5.5 BETA
 * (windows) Upgraded embedded Java runtime to version 7: much faster startup
 * Improved files open/save dialogs
 * Added line numbers, can be enabled/disabled from preferences (Cayci Gorlitsky)
+* Removed check on forbidden file in 1.5 formatted libraries (#1692)
 
 [libraries]
 * avr: Fixed buffer overflow in File::doBuffer() (dreggy)

build/windows/avr_tools.zip

@@ -9,7 +9,7 @@
  */
 
 #include "pins_arduino.h"
-#include "SPI_Class.h"
+#include "SPI.h"
 
 SPIClass SPI;
 

libraries/EEPROM/arch/avr/EEPROM.cpp renamed to hardware/arduino/avr/libraries/EEPROM/EEPROM.cpp

@@ -8,7 +8,7 @@
  * published by the Free Software Foundation.
  */
 
-#include "SPI_Class.h"
+#include "SPI.h"
 
 SPIClass::SPIClass(Spi *_spi, uint32_t _id, void(*_initCb)(void)) :
 	spi(_spi), id(_id), initCb(_initCb), initialized(false)

libraries/EEPROM/src/EEPROM.h renamed to hardware/arduino/avr/libraries/EEPROM/EEPROM.h

@@ -1,5 +1,5 @@
 /*
-  SCP1000 Barometric Pressure Sensor Display
+ SCP1000 Barometric Pressure Sensor Display
 
  Shows the output of a Barometric Pressure Sensor on a
  Uses the SPI library. For details on the sensor, see:
@@ -29,8 +29,9 @@
 const int PRESSURE = 0x1F;      //3 most significant bits of pressure
 const int PRESSURE_LSB = 0x20;  //16 least significant bits of pressure
 const int TEMPERATURE = 0x21;   //16 bit temperature reading
-cont byte READ = 0b00000000;     // SCP1000's read command
+const byte READ = 0b11111100;     // SCP1000's read command
 const byte WRITE = 0b00000010;   // SCP1000's write command
+
 // pins used for the connection with the sensor
 // the other you need are controlled by the SPI library):
 const int dataReadyPin = 6;
@@ -87,13 +88,14 @@ void loop() {
 unsigned int readRegister(byte thisRegister, int bytesToRead ) {
   byte inByte = 0;           // incoming byte from the SPI
   unsigned int result = 0;   // result to return
-
+  Serial.print(thisRegister, BIN);
+  Serial.print("\t");
   // SCP1000 expects the register name in the upper 6 bits
   // of the byte. So shift the bits left by two bits:
   thisRegister = thisRegister << 2;
   // now combine the address and the command into one byte
-  dataToSend = thisRegister & READ;
-
+  byte dataToSend = thisRegister & READ;
+  Serial.println(thisRegister, BIN);
   // take the chip select low to select the device:
   digitalWrite(chipSelectPin, LOW);
   // send the device the register you want to read:
@@ -127,7 +129,7 @@ void writeRegister(byte thisRegister, byte thisValue) {
   // of the byte. So shift the bits left by two bits:
   thisRegister = thisRegister << 2;
   // now combine the register address and the command into one byte:
-  dataToSend = thisRegister | WRITE;
+  byte dataToSend = thisRegister | WRITE;
 
   // take the chip select low to select the device:
   digitalWrite(chipSelectPin, LOW);
@@ -139,5 +141,3 @@ void writeRegister(byte thisRegister, byte thisValue) {
   digitalWrite(chipSelectPin, HIGH);
 }
 
-
-

libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino renamed to hardware/arduino/avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino

@@ -0,0 +1,71 @@
+/*
+  Digital Pot Control
+
+  This example controls an Analog Devices AD5206 digital potentiometer.
+  The AD5206 has 6 potentiometer channels. Each channel's pins are labeled
+  A - connect this to voltage
+  W - this is the pot's wiper, which changes when you set it
+  B - connect this to ground.
+
+ The AD5206 is SPI-compatible,and to command it, you send two bytes,
+ one with the channel number (0 - 5) and one with the resistance value for the
+ channel (0 - 255).
+
+ The circuit:
+  * All A pins  of AD5206 connected to +5V
+  * All B pins of AD5206 connected to ground
+  * An LED and a 220-ohm resisor in series connected from each W pin to ground
+  * CS - to digital pin 10  (SS pin)
+  * SDI - to digital pin 11 (MOSI pin)
+  * CLK - to digital pin 13 (SCK pin)
+
+ created 10 Aug 2010
+ by Tom Igoe
+
+ Thanks to Heather Dewey-Hagborg for the original tutorial, 2005
+
+*/
+
+
+// inslude the SPI library:
+#include <SPI.h>
+
+
+// set pin 10 as the slave select for the digital pot:
+const int slaveSelectPin = 10;
+
+void setup() {
+  // set the slaveSelectPin as an output:
+  pinMode (slaveSelectPin, OUTPUT);
+  // initialize SPI:
+  SPI.begin();
+}
+
+void loop() {
+  // go through the six channels of the digital pot:
+  for (int channel = 0; channel < 6; channel++) {
+    // change the resistance on this channel from min to max:
+    for (int level = 0; level < 255; level++) {
+      digitalPotWrite(channel, level);
+      delay(10);
+    }
+    // wait a second at the top:
+    delay(100);
+    // change the resistance on this channel from max to min:
+    for (int level = 0; level < 255; level++) {
+      digitalPotWrite(channel, 255 - level);
+      delay(10);
+    }
+  }
+
+}
+
+void digitalPotWrite(int address, int value) {
+  // take the SS pin low to select the chip:
+  digitalWrite(slaveSelectPin, LOW);
+  //  send in the address and value via SPI:
+  SPI.transfer(address);
+  SPI.transfer(value);
+  // take the SS pin high to de-select the chip:
+  digitalWrite(slaveSelectPin, HIGH);
+}

libraries/EEPROM/examples/eeprom_read/eeprom_read.ino renamed to hardware/arduino/avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino

@@ -57,9 +57,9 @@ void BridgeClass::begin() {
 
     // Reset the brigde to check if it is running
     uint8_t cmd[] = {'X', 'X', '1', '0', '0'};
-    uint8_t res[1];
+    uint8_t res[4];
     max_retries = 50;
-    uint16_t l = transfer(cmd, 5, res, 1);
+    uint16_t l = transfer(cmd, 5, res, 4);
     if (l == TRANSFER_TIMEOUT) {
       // Bridge didn't start...
       // Maybe the board is starting-up?
@@ -71,6 +71,14 @@ void BridgeClass::begin() {
     if (res[0] != 0)
       while (true);
 
+    // Detect bridge version
+    if (l == 4) {
+      bridgeVersion = (res[1]-'0')*100 + (res[2]-'0')*10 + (res[3]-'0');
+    } else {
+      // Bridge v1.0.0 didn't send any version info
+      bridgeVersion = 100;
+    }
+
     max_retries = 50;
     return;
   }

libraries/EEPROM/examples/eeprom_write/eeprom_write.ino renamed to hardware/arduino/avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino

@@ -61,12 +61,18 @@ class BridgeClass {
       return transfer(buff1, len1, buff2, len2, NULL, 0, rxbuff, rxlen);
     }
 
+    uint16_t getBridgeVersion()
+    {
+      return bridgeVersion;
+    }
+
     static const int TRANSFER_TIMEOUT = 0xFFFF;
 
   private:
     uint8_t index;
     int timedRead(unsigned int timeout);
     void dropAll();
+    uint16_t bridgeVersion;
 
   private:
     void crcUpdate(uint8_t c);

libraries/EEPROM/keywords.txt renamed to hardware/arduino/avr/libraries/EEPROM/keywords.txt

@@ -137,9 +137,35 @@ int File::available() {
 void File::flush() {
 }
 
-//int read(void *buf, uint16_t nbyte)
+int File::read(void *buff, uint16_t nbyte) {
+  uint16_t n = 0;
+  uint8_t *p = reinterpret_cast<uint8_t *>(buff);
+  while (n < nbyte) {
+    if (buffered == 0) {
+      doBuffer();
+      if (buffered == 0)
+        break;
+    }
+    *p++ = buffer[readPos++];
+    buffered--;
+    n++;
+  }
+  return n;
+}
 
-//uint32_t size()
+uint32_t File::size() {
+  if (bridge.getBridgeVersion() < 101)
+	return 0;
+  uint8_t cmd[] = {'t', handle};
+  uint8_t buff[5];
+  bridge.transfer(cmd, 2, buff, 5);
+  //err = res[0]; // First byte is error code
+  uint32_t res = buff[1] << 24;
+  res += buff[2] << 16;
+  res += buff[3] << 8;
+  res += buff[4];
+  return res;
+}
 
 void File::close() {
   if (mode == 255)

libraries/SPI/arch/avr/SPI.cpp renamed to hardware/arduino/avr/libraries/SPI/SPI.cpp

@@ -83,7 +83,7 @@ class FileSystemClass {
     // Methods to determine if the requested file path exists.
     boolean exists(const char *filepath);
 
-    // Create the requested directory heirarchy--if intermediate directories
+    // Create the requested directory hierarchy--if intermediate directories
     // do not exist they will be created.
     boolean mkdir(const char *filepath);