From 8b37d595e06352663992d3cb1dfb9dc6843ca30a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Fagundes?= <antonio.fagundes@eclo.solutions>
Date: Tue, 20 Sep 2022 12:28:28 +0100
Subject: [PATCH] Miscelaneous improvements (#2)

---
 nanoFramework.GiantGecko.Adc/AdcChannel.cs    | 11 ++---
 nanoFramework.GiantGecko.Adc/AdcController.cs |  6 +--
 .../ReferenceVoltage.cs                       | 49 ++++++++++++++++---
 3 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/nanoFramework.GiantGecko.Adc/AdcChannel.cs b/nanoFramework.GiantGecko.Adc/AdcChannel.cs
index c6da97e..fbd790b 100644
--- a/nanoFramework.GiantGecko.Adc/AdcChannel.cs
+++ b/nanoFramework.GiantGecko.Adc/AdcChannel.cs
@@ -26,7 +26,6 @@ public class AdcChannel : AdcChannelBase, IDisposable
         [System.Diagnostics.DebuggerBrowsable(System.Diagnostics.DebuggerBrowsableState.Never)]
         private readonly int _channelNumber;
         private readonly AdcChannelConfiguration _adcChannelConfiguration;
-        private int _averageCount;
 #pragma warning restore IDE0052 // Remove unread private members
 
         /// <summary>
@@ -71,9 +70,7 @@ public override int ReadValue()
                 }
 
                 // set average count to 1 for single sample
-                _averageCount = 1;
-
-                return NativeReadValue();
+                return NativeReadValue(1);
             }
         }
 
@@ -88,9 +85,7 @@ public override int ReadValueAveraged(int count)
                     throw new ObjectDisposedException();
                 }
 
-                _averageCount = count;
-
-                return NativeReadValue();
+                return NativeReadValue(count);
             }
         }
 
@@ -138,7 +133,7 @@ public void Dispose()
         #region Native Calls
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        private extern int NativeReadValue();
+        private extern int NativeReadValue(int count);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
         private extern void NativeDisposeChannel();
diff --git a/nanoFramework.GiantGecko.Adc/AdcController.cs b/nanoFramework.GiantGecko.Adc/AdcController.cs
index 35651d0..d580795 100644
--- a/nanoFramework.GiantGecko.Adc/AdcController.cs
+++ b/nanoFramework.GiantGecko.Adc/AdcController.cs
@@ -26,7 +26,7 @@ public class AdcController : AdcControllerBase
         private int _averageCount;
         private bool _continuousSamplingStarted;
 
-        private readonly AdcConfiguration _acdConfiguration;
+        private readonly AdcConfiguration _adcConfiguration;
 
         /// <inheritdoc/>
         public override int ChannelCount
@@ -49,7 +49,7 @@ public override SampleResolution[] SupportedResolutionsInBits
         /// <summary>
         /// Initialization configuration for <see cref="AdcController"/>.
         /// </summary>
-        public AdcConfiguration AcdConfiguration => _acdConfiguration;
+        public AdcConfiguration AcdConfiguration => _adcConfiguration;
 
         /// <summary>
         /// Gets an array with the last samples from an ongoing scan operation.
@@ -101,7 +101,7 @@ public AdcController(AdcConfiguration acdInitialization)
             // check if this device is already opened
             if (_syncLock == null)
             {
-                _acdConfiguration = acdInitialization;
+                _adcConfiguration = acdInitialization;
 
                 // call native init to allow HAL/PAL inits related with ADC hardware
                 // this is also used to check if the requested ADC actually exists
diff --git a/nanoFramework.GiantGecko.Adc/ReferenceVoltage.cs b/nanoFramework.GiantGecko.Adc/ReferenceVoltage.cs
index 786aefa..e8a9bca 100644
--- a/nanoFramework.GiantGecko.Adc/ReferenceVoltage.cs
+++ b/nanoFramework.GiantGecko.Adc/ReferenceVoltage.cs
@@ -15,36 +15,71 @@ public enum ReferenceVoltage
         /// <summary>
         /// Internal 1.25 V reference.
         /// </summary>
-        Internal1_25V,
+        Internal1_25V = 0,
 
         /// <summary>
         /// Internal 2.5 V reference.
         /// </summary>
-        Internal2_5V,
+        Internal2_5V = 1,
 
         /// <summary>
         /// Buffered VDD.
         /// </summary>
-        BufferedVdd,
+        BufferedVdd = 2,
 
         /// <summary>
         /// Internal differential 5 V reference.
         /// </summary>
-        InternalDifferencial_5V,
+        InternalDifferencial_5V = 3,
 
         /// <summary>
         /// Single-ended external reference from pin 6.
         /// </summary>
-        SingleEndedExternalPin6,
+        SingleEndedExternalPin6 = 4,
 
         /// <summary>
         /// Differential external reference from pin 6 and 7.
         /// </summary>
-        DiffExternalPin6And7,
+        DiffExternalPin6And7 = 5,
 
         /// <summary>
         /// Unbuffered 2xVDD.
         /// </summary>
-        Unbuffered2Vdd,
+        Unbuffered2Vdd = 6,
+
+        /// <summary>
+        /// Internal Bandgap reference. Custom VFS.
+        /// </summary>
+        InternalBandgap = 128,
+
+        /// <summary>
+        /// Scaled AVDD: AVDD * VREFATT.
+        /// </summary>
+        ScaledAvdd = 129,
+
+        /// <summary>
+        /// Scaled singled ended external reference from pin 6: VREFP * VREFATT.
+        /// </summary>
+        ScaledSingleEndedExternalPin6 = 130,
+
+        /// <summary>
+        /// Raw single-ended external reference from pin 6. 
+        /// </summary>
+        RawSingleEndedExternalPin6 = 131,
+
+        /// <summary>
+        /// Special mode for entropy generation. 
+        /// </summary>
+        EntropyGeneration = 132,
+
+        /// <summary>
+        /// Scaled differential external Vref from pin 6 and 7: (VREFP - VREFN) * VREFATT.
+        /// </summary>
+        ScaledExternalPin6And7 = 133,
+
+        /// <summary>
+        /// Raw differential external Vref from pin 6 and 7: VREFP - VREFN.
+        /// </summary>
+        RawExternalPin6And7 = 134
     }
 }