mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

More CCR code cleanup

Browse source 
Random constants are bad. Let's use the indices that we already calculated
(and true and false if we mean boolean values).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-11-17 07:23:20 +00:00
parent 675646dd2f
commit fa181d1ded
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gaspressures.c
View file

@ -264,8 +264,9 @@ static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi,
entry = pi->entry + i;
if (diluent_flag) { // Find the cylinder index (cyl) ..
cyl = DILUENT_CYLINDER; // .. as well as the cylinder pressure
if (diluent_flag) {
// Find the cylinder index (cyl) and pressure
cyl = dive->diluent_cylinder_index;
pressure = DILUENT_PRESSURE(entry);
save_pressure = &(entry->diluentpressure[SENSOR_PR]);
save_interpolated = &(entry->diluentpressure[INTERPOLATED_PR]);
@ -362,7 +363,7 @@ void populate_pressure_information(struct dive *dive, struct divecomputer *dc, s
unsigned pressure;
if (diluent_flag) { // if this is a diluent cylinder:
pressure = DILUENT_PRESSURE(entry);
cylinderid = DILUENT_CYLINDER;
cylinderid = dive->diluent_cylinder_index;
} else {
pressure = SENSOR_PRESSURE(entry);
cylinderid = entry->cylinderindex;
@ -379,7 +380,7 @@ void populate_pressure_information(struct dive *dive, struct divecomputer *dc, s
/* track the segments per cylinder and their pressure/time integral */
if (cylinderid != cylinderindex) {
if (diluent_flag) // For CCR dives:
cylinderindex = DILUENT_CYLINDER; // indicate diluent cylinder
cylinderindex = dive->diluent_cylinder_index; // indicate diluent cylinder
else
cylinderindex = entry->cylinderindex;
current = pr_track_alloc(pressure, entry->sec);

12
profile.c
View file

@ -1015,13 +1015,13 @@ void create_plot_info_new(struct dive *dive, struct divecomputer *dc, struct plo
}
last_pi_entry_new = populate_plot_entries(dive, dc, pi);
check_gas_change_events(dive, dc, pi); /* Populate the gas index from the gas change events */
setup_gas_sensor_pressure(dive, dc, pi); /* Try to populate our gas pressure knowledge */
populate_pressure_information(dive, dc, pi, NONDILUENT); /* .. calculate missing pressure entries for all gasses except diluent */
if (dc->dctype == CCR) /* For CCR dives.. */
populate_pressure_information(dive, dc, pi, DILUENT); /* .. calculate missing diluent gas pressure entries */
check_gas_change_events(dive, dc, pi); /* Populate the gas index from the gas change events */
setup_gas_sensor_pressure(dive, dc, pi); /* Try to populate our gas pressure knowledge */
populate_pressure_information(dive, dc, pi, false); /* .. calculate missing pressure entries for all gasses except diluent */
if (dc->dctype == CCR) /* For CCR dives.. */
populate_pressure_information(dive, dc, pi, true); /* .. calculate missing diluent gas pressure entries */
fill_o2_values(dc, pi, dive); /* .. and insert the O2 sensor data having 0 values. */
fill_o2_values(dc, pi, dive); /* .. and insert the O2 sensor data having 0 values. */
calculate_sac(dive, pi); /* Calculate sac */
calculate_deco_information(dive, dc, pi, false); /* and ceiling information, using gradient factor values in Preferences) */
calculate_gas_information_new(dive, pi); /* Calculate gas partial pressures */

3
profile.h
View file

@ -88,9 +88,6 @@ int get_maxtime(struct plot_info *pi);
* partial pressure graphs */
int get_maxdepth(struct plot_info *pi);
#define DILUENT_CYLINDER 1
#define DILUENT 1
#define NONDILUENT 0
#define SENSOR_PR 0
#define INTERPOLATED_PR 1
#define SENSOR_PRESSURE(_entry) (_entry)->pressure[SENSOR_PR]