Merge pull request #8 from edge-ml/feature/dfuFlash

Feature/dfu flash

Author: tk-king

.gitignore

@@ -0,0 +1 @@
+.vscode

src/nicla/Arduino_BHY2.cpp

@@ -9,7 +9,7 @@
 #include "Nicla_System.h"
 #endif
 
-Arduino_BHY2::Arduino_BHY2()
+Arduino_BHY2::Arduino_BHY2() : _pingTime(0)
 {
 }
 
@@ -18,9 +18,14 @@ Arduino_BHY2::~Arduino_BHY2()
 }
 
 bool Arduino_BHY2::begin()
-
 {
-    #if defined(ARDUINO_NICLA)
+#if defined(ARDUINO_NICLA)
+
+  if (!dfuManager.begin())
+  {
+    return false;
+  }
+
   nicla::begin();
   nicla::enable3V3LDO();
   if (!sensortec.begin())
@@ -34,13 +39,54 @@ bool Arduino_BHY2::begin()
   _sensorDataCharacteristic = bleHandler.getSensorDataCharacteristic();
   BoschParser::setSensorDataCharacteristic(_sensorDataCharacteristic);
   return true;
-    #endif
+#endif
+}
+
+void Arduino_BHY2::pingI2C()
+{
+  #if defined(ARDUINO_NICLA)
+  char response = 0xFF;
+  int currTime = millis();
+  if ((currTime - _pingTime) > 30000)
+  {
+    _pingTime = currTime;
+    // Read status reg
+    nicla::readLDOreg();
+  }
+  #endif
 }
 
 void Arduino_BHY2::update()
 {
+  #if defined(ARDUINO_NICLA)
+  pingI2C();
   sensortec.update();
   bleHandler.update();
+
+  // Flash new firmware
+  if (dfuManager.isPending())
+  {
+    while (dfuManager.isPending())
+    {
+      if (bleHandler.bleActive)
+      {
+        bleHandler.update();
+      }
+      pingI2C();
+    }
+    // Wait some time for acknowledgment retrieval
+    if (dfuManager.dfuSource() == bleDFU)
+    {
+      auto timeRef = millis();
+      while (millis() - timeRef < 1000)
+      {
+        bleHandler.update();
+      }
+    }
+    // Reboot after fw update
+    NVIC_SystemReset();
+  }
+  #endif
 }
 
 // Update and then sleep
@@ -52,19 +98,23 @@ void Arduino_BHY2::update(unsigned long ms)
 
 void Arduino_BHY2::delay(unsigned long ms)
 {
+  #if defined(ARDUINO_NICLA)
   unsigned long start = millis();
   unsigned long elapsed = 0;
   while (elapsed < ms)
   {
     bleHandler.poll(ms - elapsed);
     elapsed = millis() - start;
   }
+  #endif
 }
 
 void Arduino_BHY2::debug(Stream &stream)
 {
+  #if defined(ARDUINO_NICLA)
   _debug = &stream;
   BLEHandler::debug(stream);
   sensortec.debug(stream);
   BoschParser::debug(stream);
+  #endif
 }

src/nicla/Arduino_BHY2.h

@@ -10,7 +10,12 @@ class Arduino_BHY2 {
   Arduino_BHY2();
   virtual ~Arduino_BHY2();
 
+
+
   // Necessary API. Update function should be continuously polled 
+  void pingI2C();
+  int _pingTime;
+
   bool begin();
   void update(); // remove this to enforce a sleep
   void update(unsigned long ms); // Update and then sleep

src/nicla/BLEHandler.cpp

@@ -1,3 +1,5 @@
+#if defined(ARDUINO_NICLA)
+
 #include "BLEHandler.h"
 #include "DeviceInfo.h"
 
@@ -10,6 +12,13 @@ auto sensorConfigUuid = "34c2e3bd-34aa-11eb-adc1-0242ac120002";
 BLECharacteristic sensorDataCharacteristic(sensorDataUuid, (BLERead | BLENotify), sizeof(SensorDataPacket));
 BLECharacteristic sensorConfigCharacteristic(sensorConfigUuid, BLEWrite, sizeof(SensorConfigurationPacket));
 
+// DFU channels
+BLEService dfuService("34c2e3b8-34aa-11eb-adc1-0242ac120002");
+auto dfuInternalUuid = "34c2e3b9-34aa-11eb-adc1-0242ac120002";
+auto dfuExternalUuid = "34c2e3ba-34aa-11eb-adc1-0242ac120002";
+BLECharacteristic dfuInternalCharacteristic(dfuInternalUuid, BLEWrite, sizeof(DFUPacket), true);
+BLECharacteristic dfuExternalCharacteristic(dfuExternalUuid, BLEWrite, sizeof(DFUPacket), true);
+
 // Device information channel
 BLEService deviceInfoService("45622510-6468-465a-b141-0b9b0f96b468");
 auto deviceIdentifierUuid = "45622511-6468-465a-b141-0b9b0f96b468";
@@ -67,11 +76,50 @@ bool BLEHandler::begin()
   deviceIdentifierCharacteristic.writeValue(deviceIdentifier);
   deviceGenerationCharacteristic.writeValue(deviceGeneration);
 
-  //
+  // DFU channel
+  BLE.setAdvertisedService(dfuService);
+  dfuService.addCharacteristic(dfuInternalCharacteristic);
+  dfuService.addCharacteristic(dfuExternalCharacteristic);
+  BLE.addService(dfuService);
+  dfuInternalCharacteristic.setEventHandler(BLEWritten, receivedInternalDFU);
+  dfuExternalCharacteristic.setEventHandler(BLEWritten, receivedExternalDFU);
+
+
   BLE.advertise();
   return true;
 }
 
+// DFU channel
+void BLEHandler::processDFUPacket(DFUType dfuType, BLECharacteristic characteristic) 
+{
+  uint8_t data[sizeof(DFUPacket)];
+  characteristic.readValue(data, sizeof(data));
+  if (_debug) {
+    _debug->print("Size of data: ");
+    _debug->println(sizeof(data));
+  }
+  dfuManager.processPacket(bleDFU, dfuType, data);
+
+  if (data[0]) {
+    //Last packet
+    _lastDfuPack = true;
+    dfuManager.closeDfu();
+  }
+}
+
+void BLEHandler::receivedInternalDFU(BLEDevice central, BLECharacteristic characteristic)
+{
+  if (_debug) {
+    _debug->println("receivedInternalDFU");
+  }
+  bleHandler.processDFUPacket(DFU_INTERNAL, characteristic);
+}
+
+void BLEHandler::receivedExternalDFU(BLEDevice central, BLECharacteristic characteristic)
+{
+  bleHandler.processDFUPacket(DFU_EXTERNAL, characteristic);
+}
+
 BLECharacteristic *BLEHandler::getSensorDataCharacteristic()
 {
   return &sensorDataCharacteristic;
@@ -103,3 +151,5 @@ void BLEHandler::debug(Stream &stream)
 }
 
 BLEHandler bleHandler;
+
+#endif

src/nicla/BLEHandler.h

@@ -1,9 +1,13 @@
+#if defined(ARDUINO_NICLA)
+
 #ifndef BLE_HANDLER_H_
 #define BLE_HANDLER_H_
 
 #include "Arduino.h"
 #include "ArduinoBLE.h"
 
+#include "DFUManager.h"
+
 class BLEHandler {
 public:
   BLEHandler();
@@ -22,9 +26,15 @@ class BLEHandler {
   static Stream *_debug;
 
   bool _lastDfuPack;
+
+  void processDFUPacket(DFUType dfuType, BLECharacteristic characteristic);
+  static void receivedInternalDFU(BLEDevice central, BLECharacteristic characteristic);
+  static void receivedExternalDFU(BLEDevice central, BLECharacteristic characteristic);
+
   static void receivedSensorConfig(BLEDevice central, BLECharacteristic characteristic);
 };
 
 extern BLEHandler bleHandler;
 
 #endif
+#endif

src/nicla/BoschParser.cpp

@@ -1,3 +1,5 @@
+#if defined(ARDUINO_NICLA)
+
 #include "BoschParser.h"
 #include "BoschSensortec.h"
 
@@ -50,4 +52,6 @@ void BoschParser::parseData(const struct bhy2_fifo_parse_data_info *fifoData, vo
   }
 
   _sensorDataCharacteristic->writeValue(&sensorData, sizeof(SensorDataPacket));
-}
+}
+
+#endif

src/nicla/BoschParser.h

@@ -1,3 +1,5 @@
+#if defined(ARDUINO_NICLA)
+
 #ifndef BOSCH_PARSER_H_
 #define BOSCH_PARSER_H_
 
@@ -30,3 +32,5 @@ class BoschParser {
 };
 
 #endif
+
+#endif

src/nicla/BoschSensortec.cpp

@@ -1,3 +1,5 @@
+#if defined(ARDUINO_NICLA)
+
 #include "BoschSensortec.h"
 #include "BoschParser.h"
 
@@ -92,23 +94,6 @@ void BoschSensortec::configureSensor(SensorConfigurationPacket &config)
   }
 }
 
-/*
-uint8_t BoschSensortec::availableSensorData()
-{
-  return _sensorQueue.size();
-}
-
-bool BoschSensortec::readSensorData(SensorDataPacket &data)
-{
-  return _sensorQueue.pop(data);
-}
-
-void BoschSensortec::addSensorData(SensorDataPacket &sensorData)
-{
-  // Overwrites oldest data when fifo is full
-  _sensorQueue.push(sensorData);
-}*/
-
 // acknowledgment flag is reset when read
 uint8_t BoschSensortec::acknowledgment()
 {
@@ -120,31 +105,12 @@ uint8_t BoschSensortec::acknowledgment()
 
 void BoschSensortec::update()
 {
-  // Setup timing
-  /*
-  CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
-  DWT->CYCCNT = 0;
-  DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
-  if (ARM_CM_DWT_CTRL != 0)
-  {
-    ARM_CM_DEMCR |= 1 << 24; // Set bit 24
-    ARM_CM_DWT_CYCCNT = 0;
-    ARM_CM_DWT_CTRL |= 1 << 0; // Set bit 0
-  }
-  */
-
-  // Measure time
-  //uint32_t startTime = ARM_CM_DWT_CYCCNT;
-
   if (get_interrupt_status())
   {
     auto ret = bhy2_get_and_process_fifo(_workBuffer, WORK_BUFFER_SIZE, &_bhy2);
     if (_debug)
       _debug->println(get_api_error(ret));
   }
-
-  //uint32_t endTime = ARM_CM_DWT_CYCCNT;
-  //Serial.println(endTime - startTime);
 }
 
 void BoschSensortec::debug(Stream &stream)
@@ -179,3 +145,5 @@ extern "C"
 #endif /*__cplusplus */
 
 BoschSensortec sensortec;
+
+#endif

src/nicla/BoschSensortec.h

@@ -1,3 +1,5 @@
+#if defined(ARDUINO_NICLA)
+
 #ifndef BOSCH_SENSORTEC_H_
 #define BOSCH_SENSORTEC_H_
 
@@ -21,7 +23,6 @@ extern "C"
 }
 #endif
 
-//#define SENSOR_QUEUE_SIZE   10
 #define WORK_BUFFER_SIZE    1024
 
 #define MAX_READ_WRITE_LEN 256
@@ -67,3 +68,5 @@ class BoschSensortec {
 extern BoschSensortec sensortec;
 
 #endif
+
+#endif