Skip to content

H
HEV - High Energy Ventilator
Commit 102f4907 authored by Your Name's avatar Your Name
Browse files
Options

updated readings

parent 64250314
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
arduino/hev_prototype_v1/src/BreathingLoop.cpp
View file @ 102f4907
......@@ -187,7 +187,8 @@ void BreathingLoop::updateReadings()
_readings_avgs.pressure_o2_supply = adcToMillibarFloat((_readings_sums.pressure_o2_supply / _readings_N));
_readings_avgs.pressure_o2_regulated = adcToMillibarFloat((_readings_sums.pressure_o2_regulated / _readings_N));
_readings_avgs.pressure_diff_patient = adcToMillibarDPFloat((_readings_sums.pressure_diff_patient / _readings_N),_calib_avgs.pressure_diff_patient) ;
_readings_avgs.o2_percent = adcToO2PercentFloat((_readings_sums.o2_percent / _readings_N));
//_readings_avgs.o2_percent = adcToO2PercentFloat((_readings_sums.o2_percent / _readings_N));
_readings_avgs.o2_percent = adcToO2PercentFloat(static_cast<float>(analogRead(pin_o2_sensor)));
#endif
_pid.process_pressure = _readings_avgs.pressure_inhale; // Update the process pressure independent of the system state
......
arduino/hev_prototype_v1/src/UILoop.cpp
View file @ 102f4907
......@@ -81,7 +81,7 @@ void UILoop::reportFastReadings()
// TO SWITCH BETWEEN RAW AND MILLIBAR DATA UNCOMMENT BELOW
readings<float> readings = _breathing_loop->getReadingAverages();
//readings<int16_t> readings = _breathing_loop->getRawReadings();
//readings<float> readings = _breathing_loop->getRawReadings();
_fast_data.timestamp = static_cast<uint32_t>(readings.timestamp);
_fast_data.fsm_state = _breathing_loop->getFsmState();
......@@ -93,7 +93,8 @@ void UILoop::reportFastReadings()
_fast_data.pressure_patient = readings.pressure_patient;
_fast_data.temperature_buffer = readings.temperature_buffer;
_fast_data.pressure_o2_supply = readings.pressure_o2_supply;
_fast_data.pressure_o2_regulated = readings.pressure_o2_regulated;
//_fast_data.pressure_o2_regulated = readings.pressure_o2_regulated;
_fast_data.pressure_o2_regulated = readings.o2_percent;
_fast_data.pressure_diff_patient = readings.pressure_diff_patient;
pid_variables &pid = _breathing_loop->getPIDVariables();
......
Markdown is supported
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