diff --git a/m4/src/Peripherals/God.h b/m4/src/Peripherals/God.h index db111a8..3111d92 100644 --- a/m4/src/Peripherals/God.h +++ b/m4/src/Peripherals/God.h @@ -19,9 +19,9 @@ class God { registerMemberFunctionVector(dacLedBufferRampWrapper, "DAC_LED_BUFFER_RAMP"); registerMemberFunction(dacChannelCalibration, "DAC_CH_CAL"); - registerMemberFunctionVector(boxcarAverageRamp, "BOXCAR_AVERAGE_RAMP"); + registerMemberFunctionVector(boxcarAverageRamp, "BOXCAR_BUFFER_RAMP"); registerMemberFunctionVector(boxcarAverageRampDebug, - "BOXCAR_AVERAGE_RAMP_DEBUG"); + "BOXCAR_BUFFER_RAMP_DEBUG"); } // args: @@ -408,7 +408,7 @@ class God { } uint32_t dacPeriod_us = (numAdcMeasuresPerDacStep + numAdcConversionSkips) * - actualConversionTime_us; + actualConversionTime_us + 10*numAdcChannels; setStopFlag(false); @@ -436,10 +436,10 @@ class God { int adcGetsSinceLastDacSet = 0; // for debugging: - float dacPeriodFloat = static_cast(dacPeriod_us); - m4SendFloat(&dacPeriodFloat, 1); - float adcPeriodFloat = static_cast(actualConversionTime_us); - m4SendFloat(&adcPeriodFloat, 1); + // float dacPeriodFloat = static_cast(dacPeriod_us); + // m4SendFloat(&dacPeriodFloat, 1); + // float adcPeriodFloat = static_cast(actualConversionTime_us); + // m4SendFloat(&adcPeriodFloat, 1); for (int i = 0; i < numAdcChannels; ++i) { ADCController::startContinuousConversion(adcChannels[i]); @@ -462,7 +462,7 @@ class God { ADCController::getVoltageDataNoTransaction(adcChannels[i]); packets[i] = v; } - // m4SendVoltage(packets, numAdcChannels); + m4SendVoltage(packets, numAdcChannels); delete[] packets; x++; } @@ -601,10 +601,10 @@ class God { bool isHighSet = false; // For debugging: - float dacPeriodFloat = static_cast(dacPeriod_us); - m4SendFloat(&dacPeriodFloat, 1); - float adcPeriodFloat = static_cast(actualConversionTime_us); - m4SendFloat(&adcPeriodFloat, 1); + // float dacPeriodFloat = static_cast(dacPeriod_us); + // m4SendFloat(&dacPeriodFloat, 1); + // float adcPeriodFloat = static_cast(actualConversionTime_us); + // m4SendFloat(&adcPeriodFloat, 1); for (int i = 0; i < numAdcChannels; ++i) { ADCController::startContinuousConversion(adcChannels[i]); diff --git a/m4/src/UserIOHandler.h b/m4/src/UserIOHandler.h index 03cf407..6654aca 100644 --- a/m4/src/UserIOHandler.h +++ b/m4/src/UserIOHandler.h @@ -90,10 +90,10 @@ struct UserIOHandler { } break; case FunctionRegistry::ExecuteResult::ArgumentError: - m4SendChar("Error: Argument error", 22); + m4SendChar("FAILURE: Argument error", 24); break; case FunctionRegistry::ExecuteResult::FunctionNotFound: - m4SendChar("Error: Function not found", 26); + m4SendChar("FAILURE: Function not found", 28); break; } }