Merge pull request #278 from jnsbyr/esp

soundanalogous · soundanalogous · commit ee5d5f5e8cbd · 2016-04-03T11:03:18.000-07:00
pin functions based on board depended defaults
diff --git a/Boards.h b/Boards.h
@@ -665,22 +665,26 @@ writePort(port, value, bitmask):  Write an 8 bit port.
 #define PIN_TO_PWM(p)           PIN_TO_DIGITAL(p)
 #define PIN_TO_SERVO(p)         ((p) - 2)
 
-// ESP8266 generic
+// ESP8266
+// note: boot mode GPIOs 0, 2 and 15 can be used as outputs, GPIOs 6-11 are in use for flash IO
 #elif defined(ESP8266)
-#define TOTAL_ANALOG_PINS       0
-#define TOTAL_PINS              17
-#define VERSION_BLINK_PIN       4
-// #define IS_PIN_DIGITAL(p)       ((p) == 0 || (p) == 1 || (p) == 2 || (p) == 3 || (p) == 4 || (p) == 5 || (p) == 12 || (p) == 13 || (p) == 14 || (p) == 15 || (p) == 16) //for wifi dont protect serial pins because these things only have 2 pins otherwise
-#define IS_PIN_DIGITAL(p)       ((p) == 0 || (p) == 2 || (p) == 4 || (p) == 5 || (p) == 12 || (p) == 13 || (p) == 14 || (p) == 15 || (p) == 16)
-#define IS_PIN_ANALOG(p)        (false)
-#define IS_PIN_PWM(p)           (false)
-#define IS_PIN_SERVO(p)         ((p) >= 0 && (p) < MAX_SERVOS)
-#define IS_PIN_I2C(p)           (false)
-#define IS_PIN_SPI(p)           (false)
+#define TOTAL_ANALOG_PINS       NUM_ANALOG_INPUTS
+#define TOTAL_PINS              A0 + NUM_ANALOG_INPUTS
+#define PIN_SERIAL_RX           3
+#define PIN_SERIAL_TX           1
+#define IS_PIN_DIGITAL(p)       (((p) >= 0 && (p) <= 5) || ((p) >= 12 && (p) < A0))
+#define IS_PIN_ANALOG(p)        ((p) >= A0 && (p) < A0 + NUM_ANALOG_INPUTS)
+#define IS_PIN_PWM(p)           digitalPinHasPWM(p)
+#define IS_PIN_SERVO(p)         (IS_PIN_DIGITAL(p) && (p) < MAX_SERVOS)
+#define IS_PIN_I2C(p)           ((p) == SDA || (p) == SCL)
+#define IS_PIN_SPI(p)           ((p) == SS || (p) == MOSI || (p) == MISO || (p) == SCK)
+#define IS_PIN_INTERRUPT(p)     (digitalPinToInterrupt(p) > NOT_AN_INTERRUPT)
+#define IS_PIN_SERIAL(p)        ((p) == PIN_SERIAL_RX || (p) == PIN_SERIAL_TX)
 #define PIN_TO_DIGITAL(p)       (p)
-#define PIN_TO_ANALOG(p)        ((p) - 17)
+#define PIN_TO_ANALOG(p)        ((p) - A0)
 #define PIN_TO_PWM(p)           PIN_TO_DIGITAL(p)
-#define PIN_TO_SERVO(p)         p
+#define PIN_TO_SERVO(p)         (p)
+#define DEFAULT_PWM_RESOLUTION  10
 
  
 // anything else
@@ -697,6 +701,9 @@ writePort(port, value, bitmask):  Write an 8 bit port.
 #define IS_PIN_SERIAL(p)        0
 #endif
 
+#ifndef DEFAULT_PWM_RESOLUTION
+#define DEFAULT_PWM_RESOLUTION  8
+#endif
 
 /*==============================================================================
  * readPort() - Read an 8 bit port
diff --git a/examples/StandardFirmata/StandardFirmata.ino b/examples/StandardFirmata/StandardFirmata.ino
@@ -615,7 +615,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
         }
         if (IS_PIN_PWM(pin)) {
           Firmata.write(PIN_MODE_PWM);
-          Firmata.write(8); // 8 = 8-bit resolution
+          Firmata.write(DEFAULT_PWM_RESOLUTION);
         }
         if (IS_PIN_DIGITAL(pin)) {
           Firmata.write(PIN_MODE_SERVO);
diff --git a/examples/StandardFirmataChipKIT/StandardFirmataChipKIT.ino b/examples/StandardFirmataChipKIT/StandardFirmataChipKIT.ino
@@ -616,7 +616,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
         }
         if (IS_PIN_PWM(pin)) {
           Firmata.write(PIN_MODE_PWM);
-          Firmata.write(8); // 8 = 8-bit resolution
+          Firmata.write(DEFAULT_PWM_RESOLUTION);
         }
         if (IS_PIN_DIGITAL(pin)) {
           Firmata.write(PIN_MODE_SERVO);
diff --git a/examples/StandardFirmataEthernet/StandardFirmataEthernet.ino b/examples/StandardFirmataEthernet/StandardFirmataEthernet.ino
@@ -672,7 +672,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
         }
         if (IS_PIN_PWM(pin)) {
           Firmata.write(PIN_MODE_PWM);
-          Firmata.write(8); // 8 = 8-bit resolution
+          Firmata.write(DEFAULT_PWM_RESOLUTION);
         }
         if (IS_PIN_DIGITAL(pin)) {
           Firmata.write(PIN_MODE_SERVO);
diff --git a/examples/StandardFirmataEthernetPlus/StandardFirmataEthernetPlus.ino b/examples/StandardFirmataEthernetPlus/StandardFirmataEthernetPlus.ino
@@ -680,7 +680,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
         }
         if (IS_PIN_PWM(pin)) {
           Firmata.write(PIN_MODE_PWM);
-          Firmata.write(8); // 8 = 8-bit resolution
+          Firmata.write(DEFAULT_PWM_RESOLUTION);
         }
         if (IS_PIN_DIGITAL(pin)) {
           Firmata.write(PIN_MODE_SERVO);
diff --git a/examples/StandardFirmataPlus/StandardFirmataPlus.ino b/examples/StandardFirmataPlus/StandardFirmataPlus.ino
@@ -635,7 +635,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
         }
         if (IS_PIN_PWM(pin)) {
           Firmata.write(PIN_MODE_PWM);
-          Firmata.write(8); // 8 = 8-bit resolution
+          Firmata.write(DEFAULT_PWM_RESOLUTION);
         }
         if (IS_PIN_DIGITAL(pin)) {
           Firmata.write(PIN_MODE_SERVO);
diff --git a/examples/StandardFirmataWiFi/StandardFirmataWiFi.ino b/examples/StandardFirmataWiFi/StandardFirmataWiFi.ino
@@ -692,7 +692,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
         }
         if (IS_PIN_PWM(pin)) {
           Firmata.write(PIN_MODE_PWM);
-          Firmata.write(8); // 8 = 8-bit resolution
+          Firmata.write(DEFAULT_PWM_RESOLUTION);
         }
         if (IS_PIN_DIGITAL(pin)) {
           Firmata.write(PIN_MODE_SERVO);

Original file line number	Diff line number	Diff line change
`@@ -615,7 +615,7 @@ void sysexCallback(byte command, byte argc, byte *argv)`
`615`	`615`	`}`
`616`	`616`	`if (IS_PIN_PWM(pin)) {`
`617`	`617`	`Firmata.write(PIN_MODE_PWM);`
`618`		`- Firmata.write(8); // 8 = 8-bit resolution`
	`618`	`+ Firmata.write(DEFAULT_PWM_RESOLUTION);`
`619`	`619`	`}`
`620`	`620`	`if (IS_PIN_DIGITAL(pin)) {`
`621`	`621`	`Firmata.write(PIN_MODE_SERVO);`
Original file line number	Diff line number	Diff line change
`@@ -616,7 +616,7 @@ void sysexCallback(byte command, byte argc, byte *argv)`
`616`	`616`	`}`
`617`	`617`	`if (IS_PIN_PWM(pin)) {`
`618`	`618`	`Firmata.write(PIN_MODE_PWM);`
`619`		`- Firmata.write(8); // 8 = 8-bit resolution`
	`619`	`+ Firmata.write(DEFAULT_PWM_RESOLUTION);`
`620`	`620`	`}`
`621`	`621`	`if (IS_PIN_DIGITAL(pin)) {`
`622`	`622`	`Firmata.write(PIN_MODE_SERVO);`
Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,7 @@ void sysexCallback(byte command, byte argc, byte *argv)`
`672`	`672`	`}`
`673`	`673`	`if (IS_PIN_PWM(pin)) {`
`674`	`674`	`Firmata.write(PIN_MODE_PWM);`
`675`		`- Firmata.write(8); // 8 = 8-bit resolution`
	`675`	`+ Firmata.write(DEFAULT_PWM_RESOLUTION);`
`676`	`676`	`}`
`677`	`677`	`if (IS_PIN_DIGITAL(pin)) {`
`678`	`678`	`Firmata.write(PIN_MODE_SERVO);`
Original file line number	Diff line number	Diff line change
`@@ -680,7 +680,7 @@ void sysexCallback(byte command, byte argc, byte *argv)`
`680`	`680`	`}`
`681`	`681`	`if (IS_PIN_PWM(pin)) {`
`682`	`682`	`Firmata.write(PIN_MODE_PWM);`
`683`		`- Firmata.write(8); // 8 = 8-bit resolution`
	`683`	`+ Firmata.write(DEFAULT_PWM_RESOLUTION);`
`684`	`684`	`}`
`685`	`685`	`if (IS_PIN_DIGITAL(pin)) {`
`686`	`686`	`Firmata.write(PIN_MODE_SERVO);`
Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,7 @@ void sysexCallback(byte command, byte argc, byte *argv)`
`635`	`635`	`}`
`636`	`636`	`if (IS_PIN_PWM(pin)) {`
`637`	`637`	`Firmata.write(PIN_MODE_PWM);`
`638`		`- Firmata.write(8); // 8 = 8-bit resolution`
	`638`	`+ Firmata.write(DEFAULT_PWM_RESOLUTION);`
`639`	`639`	`}`
`640`	`640`	`if (IS_PIN_DIGITAL(pin)) {`
`641`	`641`	`Firmata.write(PIN_MODE_SERVO);`
Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,7 @@ void sysexCallback(byte command, byte argc, byte *argv)`
`692`	`692`	`}`
`693`	`693`	`if (IS_PIN_PWM(pin)) {`
`694`	`694`	`Firmata.write(PIN_MODE_PWM);`
`695`		`- Firmata.write(8); // 8 = 8-bit resolution`
	`695`	`+ Firmata.write(DEFAULT_PWM_RESOLUTION);`
`696`	`696`	`}`
`697`	`697`	`if (IS_PIN_DIGITAL(pin)) {`
`698`	`698`	`Firmata.write(PIN_MODE_SERVO);`