updated docs, WinFormDemo (laserPowerSetpointMW)

Author: mzieg

Doxyfile

@@ -494,13 +494,13 @@ EXTRACT_PRIVATE        = YES
 # methods of a class will be included in the documentation.
 # The default value is: NO.
 
-EXTRACT_PRIV_VIRTUAL   = NO
+EXTRACT_PRIV_VIRTUAL   = YES
 
 # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
 # The default value is: NO.
 
-EXTRACT_PACKAGE        = NO
+EXTRACT_PACKAGE        = YES
 
 # If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
 # included in the documentation.
@@ -522,7 +522,7 @@ EXTRACT_LOCAL_CLASSES  = YES
 # included.
 # The default value is: NO.
 
-EXTRACT_LOCAL_METHODS  = NO
+EXTRACT_LOCAL_METHODS  = YES
 
 # If this flag is set to YES, the members of anonymous namespaces will be
 # extracted and appear in the documentation as a namespace called
@@ -531,7 +531,7 @@ EXTRACT_LOCAL_METHODS  = NO
 # are hidden.
 # The default value is: NO.
 
-EXTRACT_ANON_NSPACES   = NO
+EXTRACT_ANON_NSPACES   = YES
 
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
 # undocumented members inside documented classes or files. If set to NO these

README_CHANGELOG.md

@@ -1,5 +1,9 @@
 # Wasatch.NET Changelog
 
+- 2021-05-28 2.3.29
+    - updated docs
+    - strengthened EEPROM.hasLaserPowerCalibration
+    - updated WinFormDemo with tabbed controls and laserPowerMW
 - 2021-05-18 2.3.28
 	- added user configurable field to control how long temperatures are cached
 - 2021-04-12 2.3.27

WasatchNET/EEPROM.cs

@@ -1654,7 +1654,22 @@ public EEPROMJSON toJSON()
             return json;
         }
 
-
+        /// <summary>
+        /// Reports whether the Spectrometer's EEPROM contains four valid 
+        /// coefficients for converting a requested output power setpoint in 
+        /// milliWatts into the calibrated fractional PWM duty cycle as a 
+        /// percentage of full (continuous) power.
+        /// </summary>
+        ///
+        /// <remarks>
+        /// All this does is confirm that four floating-point values were 
+        /// successfully demarshalled from the appropriate 16 bytes of the EEPROM
+        /// page, and that at least one of them is non-zero and positive.  It 
+        /// does not guarantee that the floats together represent an accurate 
+        /// laser power calibration for the current spectrometer.
+        /// </remarks>
+        ///
+        /// <returns>whether a seeming-valid calibration was found</returns>
         public bool hasLaserPowerCalibration()
         {
             if (maxLaserPowerMW <= 0)
@@ -1663,11 +1678,14 @@ public bool hasLaserPowerCalibration()
             if (laserPowerCoeffs is null || laserPowerCoeffs.Length < 4)
                 return false;
 
+            bool onePos = false;
             foreach (double d in laserPowerCoeffs)
                 if (Double.IsNaN(d))
                     return false;
+                else if (d > 0)
+                    onePos = true;
 
-            return true;
+            return onePos;
         }
 
         protected void enforceReasonableDefaults()

WinFormDemo/Form1.Designer.cs

@@ -192,10 +192,22 @@ void updateCurrentSpectrometer()
                 numericUpDownLaserPowerPerc.Enabled =
                 checkBoxLaserEnable.Enabled = true;
                 checkBoxLaserEnable.Checked = currentSpectrometer.laserEnabled;
+
+                if (currentSpectrometer.eeprom.hasLaserPowerCalibration())
+                {
+                    numericUpDownLaserPowerMW.Enabled = true;
+                    numericUpDownLaserPowerMW.Maximum = (decimal)currentSpectrometer.eeprom.maxLaserPowerMW;
+                    numericUpDownLaserPowerMW.Minimum = (decimal)currentSpectrometer.eeprom.minLaserPowerMW;
+                }
+                else
+                {
+                    numericUpDownLaserPowerMW.Enabled = false;
+                }
             }
             else
             {
                 numericUpDownLaserPowerPerc.Enabled =
+                numericUpDownLaserPowerMW.Enabled =
                 checkBoxLaserEnable.Enabled =
                 checkBoxLaserEnable.Checked = false;
             }
@@ -622,6 +634,12 @@ private void numericUpDownLaserPowerPerc_ValueChanged(object sender, EventArgs e
                 currentSpectrometer.setLaserPowerPercentage(((float)numericUpDownLaserPowerPerc.Value) / 100.0f);
         }
 
+        private void numericUpDownLaserPowerMW_ValueChanged(object sender, EventArgs e)
+        {
+            if (currentSpectrometer != null)
+                currentSpectrometer.laserPowerSetpointMW = (float)numericUpDownLaserPowerMW.Value;
+        }
+
         private void numericUpDownDetectorSetpointDegC_ValueChanged(object sender, EventArgs e)
         {
             if (currentSpectrometer != null)
@@ -894,5 +912,6 @@ void doComplete(Spectrometer spectrometer)
                     logger.debug("shutdown still pending %s", string.Join(", ", waitList));
             }
         }
+
     }
 }