Improved speed of frequency sweep.

lib/AD5593R/AD5593R.cpp

@@ -362,7 +362,7 @@ void AD5593R::configure_ADCs(bool *channels)
   }
 }
 
-float AD5593R::read_ADC(byte channel)
+float AD5593R::read_ADC(byte channel, int averages)
 {
   if (config.ADCs[channel] == 0)
   {
@@ -376,8 +376,6 @@ float AD5593R::read_ADC(byte channel)
     AD5593R_PRINTLN("Vref, or ADC_max is not defined");
     return -2;
   }
-  if (_a0 > -1)
-    digitalWrite(_a0, LOW);
 
   Wire.beginTransmission(_i2c_address);
   Wire.write(_ADAC_ADC_SEQUENCE);
@@ -385,20 +383,31 @@ float AD5593R::read_ADC(byte channel)
   Wire.write(byte(1 << channel));
   Wire.endTransmission();
 
+  int sum = 0;
+  for (int i = 0; i < averages; i++)
+  {
+    if (_a0 > -1)
+      gpio_set_level((gpio_num_t)_a0, LOW);
+
     Wire.beginTransmission(_i2c_address);
     Wire.write(_ADAC_ADC_READ);
     Wire.endTransmission();
 
-  unsigned int data_bits = 0;
+    delayMicroseconds(10);
 
     Wire.requestFrom(int(_i2c_address), int(2), int(1));
+    unsigned int data_bits = 0;
     if (Wire.available())
       data_bits = (Wire.read() & 0x0f) << 8;
     if (Wire.available())
       data_bits = data_bits | Wire.read();
+
+    sum += (data_bits);
+
     if (_a0 > -1)
-    digitalWrite(_a0, HIGH);
+      gpio_set_level((gpio_num_t)_a0, HIGH);
-  float data = _ADC_max * (data_bits) / 4095;
+  }
+  float data = _ADC_max * sum / 4095 / averages;
 
   AD5593R_PRINT("Channel ");
   AD5593R_PRINT(channel);

lib/AD5593R/AD5593R.h

@@ -27,8 +27,8 @@ https://github.com/LukasJanavicius
 // and be sure to use Serial.begin() in the setup.
 //  AD5593R_DEBUG
 #pragma once
-//comment this line to disable debugging
+// comment this line to disable debugging
-//#define AD5593R_DEBUG
+// #define AD5593R_DEBUG
 
 #ifdef AD5593R_DEBUG
 #define AD5593R_PRINT(...) Serial.print(__VA_ARGS__)
@@ -43,27 +43,28 @@ https://github.com/LukasJanavicius
 #endif
 #include <Arduino.h>
 
-
 //////Classes//////
-class AD5593R {
+class AD5593R
+{
 public:
-
   // This configuration structure contains arrays of booleans,
   // each array follows the form [channel0,...,channel7]
   // where a  1 indicates the channel should be configured as the name implies
   // for example an array ADCs[8] = {1,1,0,0,0,0,0,0} will configure channels 0 and 1 as ADCs.
   // a declaration of this structure should be defined in your code, and passed into configure().
   // You should not double assign pins, as only the first declaration will be assigned.
-  struct configuration {
+  struct configuration
-    bool ADCs[8]; //ADC pins
+  {
-    bool DACs[8]; //DAC pins
+    bool ADCs[8]; // ADC pins
-    bool GPIs[8]; //input pins
+    bool DACs[8]; // DAC pins
-    bool GPOs[8]; //output pins
+    bool GPIs[8]; // input pins
+    bool GPOs[8]; // output pins
   };
   configuration config;
 
   // This structure contains arrays of
-  struct Read_write_values {
+  struct Read_write_values
+  {
     float ADCs[8];
     float DACs[8];
     bool GPI_reads[8];
@@ -96,42 +97,38 @@ public:
   // or enable the internal reference will mean that any DAC/ADC function call will result in an error!
   void set_Vref(float Vref);
 
-  //configures the selected channel as a DAC
+  // configures the selected channel as a DAC
   void configure_DAC(byte channel);
 
-  void configure_DACs(bool* channels);
+  void configure_DACs(bool *channels);
   // Sets the output voltage value of a given channel, returns 1 if the write is completed
   // if the function returns -1 if the specified channel is not an DAC,
   // if no reference voltage is specified a -2 will be returned,
   // and if the voltage exceeds the maximum allowable voltage a -3 will be returned.
   int write_DAC(byte channel, float voltage);
 
-  void write_DACs(float* voltages);
+  void write_DACs(float *voltages);
 
-  //configures the selected channel as a ADC
+  // configures the selected channel as a ADC
   void configure_ADC(byte channel);
 
-
+  void configure_ADCs(bool *channels);
-  void configure_ADCs(bool* channels);
 
   // Reads the voltage value of a given ADC channel, returns the Voltage if the write is completed
   // if the function returns -1 if the specified channel is not an ADC,
   // and if no reference voltage is specified a -2 will be returned.
-  float read_ADC(byte channel);
+  float read_ADC(byte channel, int averages = 1);
-
-  float* read_ADCs();
 
+  float *read_ADCs();
 
   void configure_GPI(byte channel);
-  void configure_GPIs(bool* channels);
+  void configure_GPIs(bool *channels);
 
   void configure_GPO(byte channel);
-  void configure_GPOs(bool* channels);
+  void configure_GPOs(bool *channels);
-
-  bool* read_GPIs();
-  void write_GPOs(bool* pin_states);
-
 
+  bool *read_GPIs();
+  void write_GPOs(bool *pin_states);
 
   /*
 
@@ -172,12 +169,11 @@ private:
   // These structures are adapted from
   // https://github.com/MikroElektronika/HEXIWEAR/blob/master/SW/Click%20Examples%20mikroC/examples/ADAC/library/__ADAC_Driver.h
 
-
   int _num_of_channels = 8;
 
   int _a0;
 
-  //general purpose control register data Bytes
+  // general purpose control register data Bytes
   byte _GPRC_msbs;
   byte _GPRC_lsbs;
 
@@ -190,18 +186,18 @@ private:
   byte _GPI_config;
   byte _GPO_config;
 
-  //default address of the AD5593R, multiple devices are handled by setting the desired device's a0 to LOW
+  // default address of the AD5593R, multiple devices are handled by setting the desired device's a0 to LOW
-  //by default the a0 pin will be pulled high, effectively changing its address. For more information on the addressing please
+  // by default the a0 pin will be pulled high, effectively changing its address. For more information on the addressing please
-  //refer to the data sheet in the introduction
+  // refer to the data sheet in the introduction
   byte _i2c_address = 0x10;
 
-  //Value of the reference voltage, if none is specified then all ADC/DAC functions will throw errors
+  // Value of the reference voltage, if none is specified then all ADC/DAC functions will throw errors
   float _Vref = -1;
 
-  //flag for 2xVref mode
+  // flag for 2xVref mode
   bool _ADC_2x_mode = 0;
 
-  //flag for 2xVref mode
+  // flag for 2xVref mode
   bool _DAC_2x_mode = 0;
 
   float _ADC_max = -1;

src/Utilities.cpp

@@ -121,19 +121,12 @@ void setFrequency(uint32_t frequency)
 
 int readReflection(int averages)
 {
-  int reflection = 0;
+  return (adac.read_ADC(MAGNITUDE, averages) * 1000);
-  for (int i = 0; i < averages; i++)
-    // We multiply by 1000 to get the result in millivolts
-    reflection += (adac.read_ADC(0) * 1000);
-  return reflection / averages;
 }
 
 int readPhase(int averages)
 {
-  int phase = 0;
+  return (adac.read_ADC(PHASE, averages) * 1000);
-  for (int i = 0; i < averages; i++)
-    phase += (adac.read_ADC(1) * 1000);
-  return phase / averages;
 }
 
 int sumReflectionAroundFrequency(uint32_t center_frequency)