Skip to content

Commit fd1dbae

Browse files
committed
ready to rock version of firmware
1 parent e695359 commit fd1dbae

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

m4/src/Peripherals/ADC/ADCController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ class ADCController {
183183

184184
int x = 0;
185185

186-
float adcConversionTime = getConversionTimeFloat(adcChannels[0]);
186+
float adcConversionTime = numAdcChannels * getConversionTimeFloat(adcChannels[0]);
187187

188188
for (int i = 1; i < numAdcChannels; i++) {
189189
if (getConversionTimeFloat(adcChannels[i]) != adcConversionTime) {

m4/src/Peripherals/God.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class God {
165165
convTimeSum[board_num] += ADCController::getConversionTimeFloat(adcChannels[i]);
166166
}
167167
float maxConvTime = *std::max_element(std::begin(convTimeSum), std::end(convTimeSum));
168-
if(maxConvTime + 150 >= adc_interval_us) {
168+
if(maxConvTime + 300 >= adc_interval_us) {
169169
return OperationResult::Failure("ADC delay time is too short, please increase it");
170170
}
171171

m4/src/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,11 @@ void setup() {
5858
// Wait for calibration data to be sent
5959
while (!isCalibrationReady());
6060

61+
//load calibration data from Flash
6162
CalibrationData calibrationData;
6263
m4ReceiveCalibrationData(calibrationData);
6364

65+
// Set calibrations for DAC
6466
for (int i=0; i<NUM_DAC_CHANNELS; i++) {
6567
DACController::setCalibration(i, calibrationData.offset[i], calibrationData.gain[i]);
6668
}

0 commit comments

Comments
 (0)