Merge branch 'master' of https://github.com/firmata/arduino

Author: pgrawehr

Boards.h

@@ -689,7 +689,7 @@ writePort(port, value, bitmask):  Write an 8 bit port.
 // Sanguino/Melzi, e.g. Creality Ender-3
 #elif defined(__AVR_ATmega1284P__)
 #define TOTAL_ANALOG_PINS       8
-#define TOTAL_PINS              32 
+#define TOTAL_PINS              32
 #define VERSION_BLINK_PIN       13
 #define PIN_SERIAL1_RX          8 //PD0
 #define PIN_SERIAL1_TX          9 //PD1
@@ -1013,6 +1013,31 @@ writePort(port, value, bitmask):  Write an 8 bit port.
 #define PIN_TO_PWM(p)           PIN_TO_DIGITAL(p)
 #define PIN_TO_SERVO(p)         (p) // deprecated since v2.4
 
+//Arduino Uno Wifi Rev2
+#elif defined(__AVR_ATmega4809__)
+#define TOTAL_ANALOG_PINS       NUM_ANALOG_INPUTS //6
+#define TOTAL_PINS              41 // 14 digital + 6 analog + 6 reserved + 10 internal used + 2 I2C + 3 SPI
+#define TOTAL_PORTS             3
+#define VERSION_BLINK_PIN       LED_BUILTIN //25
+#define PIN_SERIAL1_RX          0
+#define PIN_SERIAL1_TX          1
+#define PIN_SERIAL2_RX          23
+#define PIN_SERIAL2_TX          24
+#define PIN_SERIAL0_RX          26
+#define PIN_SERIAL0_TX          27
+#define IS_PIN_DIGITAL(p)       (((p) >= 0 && (p) < 20) || (p) == 25)
+#define IS_PIN_ANALOG(p)        ((p) >= 14 && (p) < 19)
+#define IS_PIN_PWM(p)           digitalPinHasPWM(p)
+#define IS_PIN_SERVO(p)         ((p) >= 0 && (p) < MAX_SERVOS)
+#define IS_PIN_I2C(p)           ((p) == 20 || (p) == 21)
+#define IS_PIN_SPI(p)           ((p) == SS || (p) == MOSI || (p) == MISO || (p) == SCK)
+#define IS_PIN_SERIAL(p)        ((p) == 23 || (p) == 24 || (p) == 26 || (p) == 27)
+#define PIN_TO_DIGITAL(p)       (p)
+#define PIN_TO_ANALOG(p)        ((p) - 14)
+#define PIN_TO_PWM(p)           PIN_TO_DIGITAL(p)
+#define PIN_TO_SERVO(p)         (p)
+
+
 // anything else
 #else
 #error "Please edit Boards.h with a hardware abstraction for this board"

utility/SerialFirmata.h

@@ -48,9 +48,9 @@
 //    a) continuous streaming at higher baud rates: enable but set to 0 (receive buffer store & forward)
 //    b) messages: set to a value below min. inter message delay (message store & forward)
 //    c) continuous streaming at lower baud rates or random characters: undefine or set to -1 (disable)
-// 3) Smaller delays may not have the desired effect, especially with less powerful CPUs, 
+// 3) Smaller delays may not have the desired effect, especially with less powerful CPUs,
 //    if set to a value near or below the average Firmata main loop duration.
-// 4) The Firmata stream write buffer size must be equal or greater than the max. 
+// 4) The Firmata stream write buffer size must be equal or greater than the max.
 //    serial buffer/message size and the Firmata frame size (4 bytes) to prevent fragmentation
 //    on the transport layer.
 //#define FIRMATA_SERIAL_RX_DELAY 50 // [ms]
@@ -78,6 +78,8 @@
 #define SERIAL_READ_ARR_LEN         12
 
 // map configuration query response resolution value to serial pin type
+#define RES_RX0                     0x00
+#define RES_TX0                     0x01
 #define RES_RX1                     0x02
 #define RES_TX1                     0x03
 #define RES_RX2                     0x04
@@ -121,6 +123,10 @@ namespace {
   #if defined(PIN_SERIAL_RX)
     // TODO when use of HW_SERIAL0 is enabled
   #endif
+  #if defined(PIN_SERIAL0_RX)
+    if (pin == PIN_SERIAL0_RX) return RES_RX0;
+    if (pin == PIN_SERIAL0_TX) return RES_TX0;
+  #endif
   #if defined(PIN_SERIAL1_RX)
     if (pin == PIN_SERIAL1_RX) return RES_RX1;
     if (pin == PIN_SERIAL1_TX) return RES_TX1;
@@ -163,6 +169,12 @@ namespace {
         //   // TODO when use of HW_SERIAL0 is enabled
         //   break;
   #endif
+  #if defined(PIN_SERIAL0_RX)
+      case HW_SERIAL0:
+        pins.rx = PIN_SERIAL0_RX;
+        pins.tx = PIN_SERIAL0_TX;
+        break;
+  #endif
   #if defined(PIN_SERIAL1_RX)
       case HW_SERIAL1:
         pins.rx = PIN_SERIAL1_RX;