adding license

Author: AndyEngland521

Arduino Sketch/main/BLE.cpp

@@ -1,14 +1,9 @@
-/*
-  Copyright (c) 2019 Andy England
-  Header: BLE.h
-*/
-
 #include "BLE.h"
 
 #define SERVICE_UUID_ESPOTA        "d804b643-6ce7-4e81-9f8a-ce0f699085eb"
 #define CHARACTERISTIC_UUID_ID           "d804b644-6ce7-4e81-9f8a-ce0f699085eb"
 
-#define SERVICE_UUID_OTA                    "c8659210-af91-4ad3-a995-a58d6fd26145"
+#define SERVICE_UUID_OTA                    "c8659210-af91-4ad3-a995-a58d6fd26145" // UART service UUID
 #define CHARACTERISTIC_UUID_FW              "c8659211-af91-4ad3-a995-a58d6fd26145"
 #define CHARACTERISTIC_UUID_HW_VERSION      "c8659212-af91-4ad3-a995-a58d6fd26145"
 
@@ -40,6 +35,7 @@ void otaCallback::onWrite(BLECharacteristic *pCharacteristic)
         esp_ota_end(otaHandler);
         Serial.println("EndOTA");
         if (ESP_OK == esp_ota_set_boot_partition(esp_ota_get_next_update_partition(NULL))) {
+          delay(2000);
           esp_restart();
         }
         else {
@@ -50,6 +46,7 @@ void otaCallback::onWrite(BLECharacteristic *pCharacteristic)
   }
 
   uint8_t txData[5] = {1, 2, 3, 4, 5};
+  //delay(1000);
   pCharacteristic->setValue((uint8_t*)txData, 5);
   pCharacteristic->notify();
 }

Arduino Sketch/main/BLE.h

@@ -1,13 +1,3 @@
-/*
-  Copyright (c) 2019 Andy England
-
-  A BLE driver for Over the Air Updates
-
-  Built on top of the BLE utilities by Neil Kolban
-  https://github.com/nkolban/esp32-snippets/blob/master/cpp_utils/tests/BLE%20Tests/SampleNotify.cpp
-*/
-
-
 #ifndef _BLE_H_
 #define _BLE_H_
 

WebApp/src/App.js

@@ -1,4 +1,12 @@
-import React from 'react';
+  
+/*************************************************** 
+ This is a React WebApp written to Flash an ESP32 via BLE
+ 
+ Written by Andrew England (SparkFun)
+ BSD license, all text above must be included in any redistribution.
+ *****************************************************/
+ 
+ import React from 'react';
 import Popup from 'react-popup';
 import './App.css';
 
@@ -36,9 +44,7 @@ function BTConnect(){
     optionalServices: [otaServiceUuid]
   })
   .then(device => {
-    esp32Device = device;
-    esp32Device.addEventListener('gattserverdisconnected', onDisconnected);
-    return esp32Device.gatt.connect()
+    return device.gatt.connect()
   })
   .then(server => server.getPrimaryService(otaServiceUuid))
   .then(service => {
@@ -90,6 +96,8 @@ function CheckVersion(){
   .then(value => {
     currentHardwareVersion = 'v' + value.getUint8(0) + '.' + value.getUint8(1);
     softwareVersion = 'v' + value.getUint8(2) + '.' + value.getUint8(3) + '.' + value.getUint8(4);
+    document.getElementById('hw_version').innerHTML = "Hardware: " + currentHardwareVersion;
+    document.getElementById('sw_version').innerHTML = "Software: " + softwareVersion;
   })
   //Grab our version numbers from Github
   .then(_ => fetch('https://raw.githubusercontent.com/sparkfun/ESP32_OTA_BLE_React_WebApp_Demo/master/GithubRepo/version.json'))
@@ -99,8 +107,6 @@ function CheckVersion(){
   })
   .then(function (data) {
     // JSON should be formatted so that 0'th entry is the newest version
-    document.getElementById('hw_version').innerHTML = "Hardware: " + currentHardwareVersion;
-    document.getElementById('sw_version').innerHTML = "Software: " + softwareVersion;
     if (latestCompatibleSoftware === softwareVersion)
     {
       //Software is updated, do nothing.
@@ -109,10 +115,10 @@ function CheckVersion(){
       var softwareVersionCount = 0;
       latestCompatibleSoftware = data.firmware[softwareVersionCount]['software'];
       versionFindLoop:
-        while (latestCompatibleSoftware !=='undefined') {
+        while (latestCompatibleSoftware !== undefined) {
           var compatibleHardwareVersion = "N/A"
           var hardwareVersionCount = 0;
-          while (compatibleHardwareVersion !== 'undefined') {
+          while (compatibleHardwareVersion !== undefined) {
             compatibleHardwareVersion = data.firmware[softwareVersionCount]['hardware'][hardwareVersionCount++];
             if (compatibleHardwareVersion === currentHardwareVersion)
             {
@@ -212,12 +218,6 @@ function SendBufferedData() {
     console.log("remaining: " + remaining);
     esp32Service.getCharacteristic(fileCharacteristicUuid)
       .then(characteristic => RecursiveSend(characteristic, dataToSend))
-      .then(_ => {
-        if (remaining === 0)
-        {
-          esp32Device.gatt.disconnect()
-        }
-      })
       .then(_ => {
         return document.getElementById('completion').innerHTML = (100 * (currentPosition/totalSize)).toPrecision(3) + '%';
       })