don't set default adc gain calibration to 0.

Author: markzakharyan

m4/.vscode/settings.json

@@ -7,6 +7,7 @@
         "string": "cpp",
         "string_view": "cpp",
         "deque": "cpp",
-        "vector": "cpp"
+        "vector": "cpp",
+        "thread": "cpp"
     }
 }

m4/src/Peripherals/ADC/ADCBoard.h

@@ -373,13 +373,26 @@ class ADCBoard {
   }
 
   void restoreCalibrationFromFlash() {
+    if (!isCalibrationReady()) {
+      return;
+    }
+
     CalibrationData data;
     m4ReceiveCalibrationData(data);
+
+    if (!data.adcCalibrated) {
+      return;
+    }
+
     int boardIndex = getBoardIndex();
 
     for (int i = 0; i < NUM_CHANNELS_PER_ADC_BOARD; i++) {
       setZeroScaleCalibration(i, data.adc_offset[NUM_CHANNELS_PER_ADC_BOARD * boardIndex + i]);
-      setFullScaleCalibration(i, data.adc_gain[NUM_CHANNELS_PER_ADC_BOARD * boardIndex + i]);
+
+      uint32_t fullScale = data.adc_gain[NUM_CHANNELS_PER_ADC_BOARD * boardIndex + i];
+      if (fullScale != 0) {
+        setFullScaleCalibration(i, fullScale);
+      }
     }
   }
 

m4/src/Peripherals/God.h

@@ -26,6 +26,7 @@ class God {
     registerMemberFunctionVector(timeSeriesAdcRead, "TIME_SERIES_ADC_READ");
     registerMemberFunction(dacChannelCalibration, "DAC_CH_CAL");
     registerMemberFunctionVector(boxcarAverageRamp, "BOXCAR_BUFFER_RAMP");
+    registerMemberFunction(hardResetCalibrationToDefaults, "HARD_RESET_CALIBRATION");
   }
 
   inline static OperationResult initialize() {
@@ -34,6 +35,21 @@ class God {
     return OperationResult::Success("INITIALIZATION COMPLETE");
   }
 
+  inline static OperationResult hardResetCalibrationToDefaults() {
+    CalibrationData calibrationData;
+    m4ReceiveCalibrationData(calibrationData);
+    for (int i = 0; i < NUM_DAC_CHANNELS; i++) {
+      calibrationData.gain[i] = 1.0f;
+      calibrationData.offset[i] = 0.0f;
+      calibrationData.adc_offset[i] = 0x800000; // Default ADC offset
+      calibrationData.adc_gain[i] = 0x200000; // Default ADC gain
+    }
+    calibrationData.adcCalibrated = false;
+    m4SendCalibrationData(calibrationData);
+
+    return OperationResult::Success("Calibration data reset to defaults");
+  }
+
 
   struct BoardUsage {
     uint8_t numBoards;          // how many distinct boards are in use

m4/src/Utils/CalibrationData.h

@@ -1,10 +1,21 @@
 #pragma once
 
+#define NUM_CHANNELS 16
+
 struct CalibrationData {
-  float gain[16];
-  float offset[16];
+  float gain[NUM_CHANNELS];
+  float offset[NUM_CHANNELS];
+
+  bool adcCalibrated;
+  uint32_t adc_offset[NUM_CHANNELS];
+  uint32_t adc_gain[NUM_CHANNELS];
 
-  bool adcCalibrated = false;
-  uint32_t adc_offset[16];
-  uint32_t adc_gain[16];
+  CalibrationData() : adcCalibrated(false) {
+    for (int i = 0; i < NUM_CHANNELS; ++i) {
+      gain[i] = 1.0f;
+      offset[i] = 0.0f;
+      adc_offset[i] = 0x800000u; // Default ADC offset
+      adc_gain[i] = 0x200000u;   // Default ADC gain
+    }
+  }
 };

m4/src/main.cpp

@@ -84,7 +84,11 @@ void setup() {
   } else {
     for (int i=0; i<NUM_ADC_BOARDS * NUM_CHANNELS_PER_ADC_BOARD; i++) {
       ADCController::setChZeroScaleCalibration(i, calibrationData.adc_offset[i]);
-      ADCController::setChFullScaleCalibration(i, calibrationData.adc_gain[i]);
+
+      if (calibrationData.adc_gain[i] != 0) {
+        ADCController::setChFullScaleCalibration(i, calibrationData.adc_gain[i]);
+      }
+
     }
   }
 }

m7/src/Utils/CalibrationData.h

@@ -1,10 +1,21 @@
 #pragma once
 
+#define NUM_CHANNELS 16
+
 struct CalibrationData {
-  float gain[16];
-  float offset[16];
+  float gain[NUM_CHANNELS];
+  float offset[NUM_CHANNELS];
+
+  bool adcCalibrated;
+  uint32_t adc_offset[NUM_CHANNELS];
+  uint32_t adc_gain[NUM_CHANNELS];
 
-  bool adcCalibrated = false; // Flag to indicate if ADC calibration is done
-  uint32_t adc_offset[16];
-  uint32_t adc_gain[16];
+  CalibrationData() : adcCalibrated(false) {
+    for (int i = 0; i < NUM_CHANNELS; ++i) {
+      gain[i] = 1.0f;
+      offset[i] = 0.0f;
+      adc_offset[i] = 0x800000u; // Default ADC offset
+      adc_gain[i] = 0x200000u;   // Default ADC gain
+    }
+  }
 };