Skip to content
Snippets Groups Projects
Commit d81c0adc authored by Karol Hennessy's avatar Karol Hennessy
Browse files

fix to calib

parent b992f9a2
No related merge requests found
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
const int pin_valve_air_in = 25; // DAC1 // A18 const int pin_valve_air_in = 25; // DAC1 // A18
const int pin_valve_o2_in = 5; // STRAPPING PIN (prefer as output / high-Z) const int pin_valve_o2_in = 5; // STRAPPING PIN (prefer as output / high-Z)
const int pin_valve_purge = 18; const int pin_valve_purge = 18;
const int pin_spare_1 = 26;// DAC2; // A19 // spare const int pin_spare_1 = 26;// DAC2; // A19 // spare
// pwm pins // pwm pins
const int pin_valve_inhale = 21; // formerly valve_out const int pin_valve_inhale = 21; // formerly valve_out
......
...@@ -75,16 +75,16 @@ void BreathingLoop::updateReadings() ...@@ -75,16 +75,16 @@ void BreathingLoop::updateReadings()
resetReadingSums(); resetReadingSums();
} else if (tnow - _readings_avgs_time > _readings_avgs_timeout) { } else if (tnow - _readings_avgs_time > _readings_avgs_timeout) {
_readings_avgs.timestamp = static_cast<uint32_t>(_readings_sums.timestamp); _readings_avgs.timestamp = static_cast<uint32_t>(_readings_sums.timestamp);
_readings_avgs.pressure_air_supply = adcToMillibar((_readings_sums.pressure_air_supply / _readings_N), _calib_avgs.pressure_air_supply ); _readings_avgs.pressure_air_supply = adcToMillibar((_readings_sums.pressure_air_supply / _readings_N));
_readings_avgs.pressure_air_regulated = adcToMillibar((_readings_sums.pressure_air_regulated / _readings_N), _calib_avgs.pressure_air_regulated); _readings_avgs.pressure_air_regulated = adcToMillibar((_readings_sums.pressure_air_regulated / _readings_N));
_readings_avgs.pressure_buffer = adcToMillibar((_readings_sums.pressure_buffer / _readings_N), _calib_avgs.pressure_buffer ); _readings_avgs.pressure_buffer = adcToMillibar((_readings_sums.pressure_buffer / _readings_N), _calib_avgs.pressure_buffer );
_readings_avgs.pressure_inhale = adcToMillibar((_readings_sums.pressure_inhale / _readings_N), _calib_avgs.pressure_inhale ); _readings_avgs.pressure_inhale = adcToMillibar((_readings_sums.pressure_inhale / _readings_N), _calib_avgs.pressure_inhale );
_readings_avgs.pressure_patient = adcToMillibar((_readings_sums.pressure_patient / _readings_N), _calib_avgs.pressure_patient ); _readings_avgs.pressure_patient = adcToMillibar((_readings_sums.pressure_patient / _readings_N), _calib_avgs.pressure_patient );
_readings_avgs.temperature_buffer = adcToMillibar((_readings_sums.temperature_buffer / _readings_N), _calib_avgs.temperature_buffer ); _readings_avgs.temperature_buffer = adcToMillibar((_readings_sums.temperature_buffer / _readings_N), _calib_avgs.temperature_buffer );
#ifdef HEV_FULL_SYSTEM #ifdef HEV_FULL_SYSTEM
_readings_avgs.pressure_o2_supply = adcToMillibar((_readings_sums.pressure_o2_supply / _readings_N), _calib_avgs.pressure_o2_supply ); _readings_avgs.pressure_o2_supply = adcToMillibar((_readings_sums.pressure_o2_supply / _readings_N));
_readings_avgs.pressure_o2_regulated = adcToMillibar((_readings_sums.pressure_o2_regulated / _readings_N), _calib_avgs.pressure_o2_regulated ); _readings_avgs.pressure_o2_regulated = adcToMillibar((_readings_sums.pressure_o2_regulated / _readings_N));
_readings_avgs.pressure_diff_patient = adcToMillibar((_readings_sums.pressure_diff_patient / _readings_N), _calib_avgs.pressure_diff_patient ); _readings_avgs.pressure_diff_patient = (_readings_sums.pressure_diff_patient / _readings_N) ;
#endif #endif
resetReadingSums(); resetReadingSums();
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment