Merge pull request #43 from sandeepmistry/uno-wifi-rev2-updater

Add firmware updater supporter for Uno WiFi Rev2

Author: facchinm

.travis.yml

@@ -5,6 +5,7 @@ env:
   matrix:
     - BOARD="arduino:samd:mkrwifi1010"
     - BOARD="arduino:samd_beta:mkrvidor4000"
+    - BOARD="arduino:megaavr:uno2018"
 before_install:
   - wget http://downloads.arduino.cc/arduino-$IDE_VERSION-linux64.tar.xz
   - tar xf arduino-$IDE_VERSION-linux64.tar.xz
@@ -17,6 +18,9 @@ before_install:
       arduino --install-boards arduino:samd_beta;
       arduino --install-library VidorPeripherals;
     fi
+  - if [[ "$BOARD" =~ "arduino:megaavr:" ]]; then
+      arduino --install-boards arduino:megaavr;
+    fi
   - buildExampleSketch() { arduino --verbose-build --verify --board $BOARD $PWD/examples/$1/$1.ino; }
   - buildExampleToolsSketch() { arduino --verbose-build --verify --board $BOARD $PWD/examples/Tools/$1/$1.ino; }
 install:
@@ -38,8 +42,6 @@ script:
   - buildExampleSketch WiFiWebClient
   - buildExampleSketch WiFiWebClientRepeating
   - buildExampleSketch WiFiWebServer
-  - if [[ "$BOARD" =~ "arduino:samd:" ]]; then
-      buildExampleToolsSketch CheckFirmwareVersion
-      buildExampleToolsSketch FirmwareUpdater;
-      buildExampleToolsSketch SerialNINAPassthrough;
-    fi
+  - buildExampleToolsSketch CheckFirmwareVersion
+  - buildExampleToolsSketch FirmwareUpdater;
+  - buildExampleToolsSketch SerialNINAPassthrough;

examples/Tools/FirmwareUpdater/ESP32BootROM.cpp

@@ -53,6 +53,20 @@ int ESP32BootROMClass::begin(unsigned long baudrate)
   delay(10);
   FPGA.digitalWrite(_resetnPin, HIGH);
   delay(100);
+
+#elif defined(ARDUINO_AVR_UNO_WIFI_REV2)
+  _serial->begin(119400);
+
+  pinMode(_gpio0Pin, OUTPUT);
+  pinMode(_resetnPin, OUTPUT);
+
+  digitalWrite(_gpio0Pin, LOW);
+
+  digitalWrite(_resetnPin, LOW);
+  delay(100);
+  digitalWrite(_resetnPin, HIGH);
+  delay(100);
+  digitalWrite(_resetnPin, LOW);
 #else
   _serial->begin(115200);
 
@@ -77,7 +91,7 @@ int ESP32BootROMClass::begin(unsigned long baudrate)
     return 0;
   }
 
-#ifdef ARDUINO_SAMD_MKRVIDOR4000
+#if defined(ARDUINO_SAMD_MKRVIDOR4000) || defined(ARDUINO_AVR_UNO_WIFI_REV2)
   (void)baudrate;
 #else
   if (baudrate != 115200) {
@@ -245,14 +259,14 @@ void ESP32BootROMClass::command(int opcode, const void* data, uint16_t length)
 #endif
 }
 
-int ESP32BootROMClass::response(int opcode, unsigned int timeout, void* body)
+int ESP32BootROMClass::response(int opcode, unsigned long timeout, void* body)
 {
   uint8_t data[10 + 256];
   uint16_t index = 0;
 
   uint8_t responseLength = 4;
 
-  for (unsigned long start = millis(); (index < (10 + responseLength)) && (millis() - start) < timeout;) {
+  for (unsigned long start = millis(); (index < (uint16_t)(10 + responseLength)) && (millis() - start) < timeout;) {
     if (_serial->available()) {
       data[index] = _serial->read();
 
@@ -280,7 +294,7 @@ int ESP32BootROMClass::response(int opcode, unsigned int timeout, void* body)
   }
 #endif
 
-  if (index != (10 + responseLength)) {
+  if (index != (uint16_t)(10 + responseLength)) {
     return -1;
   }
 

examples/Tools/FirmwareUpdater/ESP32BootROM.h

@@ -40,7 +40,7 @@ class ESP32BootROMClass {
     int spiAttach();
 
     void command(int opcode, const void* data, uint16_t length);
-    int response(int opcode, unsigned int timeout, void* body = NULL);
+    int response(int opcode, unsigned long timeout, void* body = NULL);
 
     void writeEscapedBytes(const uint8_t* data, uint16_t length);
 

examples/Tools/FirmwareUpdater/FirmwareUpdater.ino

@@ -40,7 +40,7 @@ static const int MAX_PAYLOAD_SIZE = 1024;
 #define CMD_HELLO             0x99
 
 void setup() {
-  Serial.begin(115200);
+  Serial.begin(1000000);
 
   if (!ESP32BootROM.begin(921600)) {
     Serial.println("Unable to communicate with ESP32 boot ROM!");

examples/Tools/SerialNINAPassthrough/SerialNINAPassthrough.ino

@@ -31,7 +31,7 @@ int rts = -1;
 int dtr = -1;
 
 void setup() {
-  SerialUSB.begin(baud);
+  Serial.begin(baud);
 
 #ifdef ARDUINO_SAMD_MKRVIDOR4000
   FPGA.begin();
@@ -46,43 +46,58 @@ void setup() {
   pinMode(NINA_GPIO0, OUTPUT);
   pinMode(NINA_RESETN, OUTPUT);
 #endif
+
+#ifdef ARDUINO_AVR_UNO_WIFI_REV2
+  // manually put the NINA in upload mode
+  digitalWrite(NINA_GPIO0, LOW);
+
+  digitalWrite(NINA_RESETN, LOW);
+  delay(100);
+  digitalWrite(NINA_RESETN, HIGH);
+  delay(100);
+  digitalWrite(NINA_RESETN, LOW);
+#endif
 }
 
 void loop() {
-  if (rts != SerialUSB.rts()) {
+#ifndef ARDUINO_AVR_UNO_WIFI_REV2
+  if (rts != Serial.rts()) {
 #ifdef ARDUINO_SAMD_MKRVIDOR4000
-    FPGA.digitalWrite(FPGA_SPIWIFI_RESET, (SerialUSB.rts() == 1) ? LOW : HIGH);
+    FPGA.digitalWrite(FPGA_SPIWIFI_RESET, (Serial.rts() == 1) ? LOW : HIGH);
 #else
-    digitalWrite(NINA_RESETN, SerialUSB.rts());
+    digitalWrite(NINA_RESETN, Serial.rts());
 #endif
-    rts = SerialUSB.rts();
+    rts = Serial.rts();
   }
 
-  if (dtr != SerialUSB.dtr()) {
+  if (dtr != Serial.dtr()) {
 #ifdef ARDUINO_SAMD_MKRVIDOR4000
-    FPGA.digitalWrite(FPGA_NINA_GPIO0, (SerialUSB.dtr() == 1) ? HIGH : LOW);
+    FPGA.digitalWrite(FPGA_NINA_GPIO0, (Serial.dtr() == 1) ? HIGH : LOW);
 #else
-    digitalWrite(NINA_GPIO0, (SerialUSB.dtr() == 0) ? HIGH : LOW);
+    digitalWrite(NINA_GPIO0, (Serial.dtr() == 0) ? HIGH : LOW);
 #endif
-    dtr = SerialUSB.dtr();
+    dtr = Serial.dtr();
   }
+#endif
 
-  if (SerialUSB.available()) {
-    SerialNina.write(SerialUSB.read());
+  if (Serial.available()) {
+    SerialNina.write(Serial.read());
   }
 
   if (SerialNina.available()) {
-    SerialUSB.write(SerialNina.read());
+    Serial.write(SerialNina.read());
   }
 
+#ifndef ARDUINO_AVR_UNO_WIFI_REV2
   // check if the USB virtual serial wants a new baud rate
-  if (SerialUSB.baud() != baud) {
+  if (Serial.baud() != baud) {
     rts = -1;
     dtr = -1;
 
-    baud = SerialUSB.baud();
+    baud = Serial.baud();
 #ifndef ARDUINO_SAMD_MKRVIDOR4000
     SerialNina.begin(baud);
 #endif
   }
+#endif
 }