SmartScopeAWG: reduce decimation registers to 3

Author: Jasper van Bourgognie

Devices/IWaveGenerator.cs

@@ -13,10 +13,10 @@ public interface IWaveGenerator : IDevice
         byte[] GeneratorDataByte { set; }
         bool GeneratorToAnalogEnabled { set; get; }
         bool GeneratorToDigitalEnabled { set; get; }
-        UInt32 GeneratorStretcherForFrequency(double frequency);
+        Int32 GeneratorStretcherForFrequency(double frequency);
         int GeneratorNumberOfSamplesForFrequency(double frequency);
         int GeneratorNumberOfSamples { set; get; }
-        UInt32 GeneratorStretching { set; get; }
+        Int32 GeneratorStretching { set; get; }
         double GeneratorFrequencyMax { get; }
         double GeneratorFrequencyMin { get; }
         double GeneratorFrequency { get; set;  }

Devices/SmartScopeAwg.cs

@@ -13,7 +13,7 @@ partial class SmartScope
         const double AWG_SAMPLE_PERIOD_0 = 10e-9; //10ns
         const int AWG_SAMPLES_MAX = 2048;
         const int AWG_SAMPLES_MIN = 1;
-        const UInt32 AWG_STRETCHER_MAX = UInt32.MaxValue;
+        const Int32 AWG_STRETCHER_MAX = 256*256*256-1;
         public bool DataOutOfRange { get; private set; }
 
         /// <summary>
@@ -83,7 +83,7 @@ public int GeneratorNumberOfSamples
             }
         }
 
-        public UInt32 GeneratorStretching
+        public Int32 GeneratorStretching
         {
             set
             {
@@ -94,15 +94,13 @@ public UInt32 GeneratorStretching
                 FpgaSettingsMemory[REG.GENERATOR_DECIMATION_B0].Set((byte)(value & 0xFF));
                 FpgaSettingsMemory[REG.GENERATOR_DECIMATION_B1].Set((byte)((value >> 8) & 0xFF));
                 FpgaSettingsMemory[REG.GENERATOR_DECIMATION_B2].Set((byte)((value >> 16) & 0xFF));
-                FpgaSettingsMemory[REG.GENERATOR_DECIMATION_B3].Set((byte)((value >> 24) & 0xFF));
             }
             get
             {
                 return 
-                    (UInt32)(FpgaSettingsMemory[REG.GENERATOR_DECIMATION_B0].GetByte()      ) +
-                    (UInt32)(FpgaSettingsMemory[REG.GENERATOR_DECIMATION_B1].GetByte() <<  8) +
-                    (UInt32)(FpgaSettingsMemory[REG.GENERATOR_DECIMATION_B2].GetByte() << 16) +
-                    (UInt32)(FpgaSettingsMemory[REG.GENERATOR_DECIMATION_B3].GetByte() << 24);
+                    (Int32)(FpgaSettingsMemory[REG.GENERATOR_DECIMATION_B0].GetByte()      ) +
+                    (Int32)(FpgaSettingsMemory[REG.GENERATOR_DECIMATION_B1].GetByte() <<  8) +
+                    (Int32)(FpgaSettingsMemory[REG.GENERATOR_DECIMATION_B2].GetByte() << 16);
             }
         }
 
@@ -150,21 +148,21 @@ public double GeneratorFrequencyMin
                 return 1.0 / ((AWG_SAMPLES_MAX - 1) * AWG_SAMPLE_PERIOD_0 * ((double)(AWG_STRETCHER_MAX) + 1));
             }
         }
-        public UInt32 GeneratorStretcherForFrequency(double frequency)
+        public Int32 GeneratorStretcherForFrequency(double frequency)
         {
             if (frequency > GeneratorFrequencyMax || frequency < GeneratorFrequencyMin)
                 throw new ValidationException(String.Format("AWG frequency {0} out of range [{1},{2}]", frequency, GeneratorFrequencyMin, GeneratorFrequencyMax));
 
             double numberOfSamplesAtFullRate = Math.Floor(1 / (AWG_SAMPLE_PERIOD_0 * frequency));
-            return (UInt32)Math.Floor(numberOfSamplesAtFullRate / AWG_SAMPLES_MAX); ;
+            return (Int32)Math.Floor(numberOfSamplesAtFullRate / AWG_SAMPLES_MAX); ;
         }
         public int GeneratorNumberOfSamplesForFrequency(double frequency)
         {
             if (frequency > GeneratorFrequencyMax || frequency < GeneratorFrequencyMin)
                 throw new ValidationException(String.Format("AWG frequency {0} out of range [{1},{2}]", frequency, GeneratorFrequencyMin, GeneratorFrequencyMax));
 
             double numberOfSamplesAtFullRate = Math.Floor(1 / (AWG_SAMPLE_PERIOD_0 * frequency));
-            UInt32 stretcher = GeneratorStretcherForFrequency(frequency);
+            Int32 stretcher = GeneratorStretcherForFrequency(frequency);
             return (int)Math.Floor(numberOfSamplesAtFullRate / (stretcher + 1));
         }
         public double GeneratorFrequency
@@ -186,7 +184,7 @@ public double GeneratorSamplePeriod
         {
             set {
                 double samples = value / AWG_SAMPLE_PERIOD_0;
-                UInt32 samplesRounded = (UInt32)Math.Floor(samples);
+                Int32 samplesRounded = (Int32)Math.Floor(samples);
                 GeneratorStretching = samplesRounded;
             }
             get {

Memories/ScopeConstants_GEN.cs

@@ -49,9 +49,8 @@ enum REG
 		GENERATOR_DECIMATION_B0 = 34,
 		GENERATOR_DECIMATION_B1 = 35,
 		GENERATOR_DECIMATION_B2 = 36,
-		GENERATOR_DECIMATION_B3 = 37,
-		GENERATOR_SAMPLES_B0 = 38,
-		GENERATOR_SAMPLES_B1 = 39,
+		GENERATOR_SAMPLES_B0 = 37,
+		GENERATOR_SAMPLES_B1 = 38,
     }
 
 #if DEBUG