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

Cleanup: introduce function to set pressure values

Browse source 
Instead of assigning the the lvalue of the SENSOR_PRESSURE
macro, introduce a general function to set pressure values.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-07-05 23:23:20 +02:00 • committed by Dirk Hohndel
parent 68147c4225
commit 39ede7e9e8
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/gaspressures.c
View file

@ -445,7 +445,7 @@ void populate_pressure_information(struct dive *dive, struct divecomputer *dc, s
// until we get back to this cylinder. // until we get back to this cylinder.
if (cyl != sensor) { if (cyl != sensor) {
current = NULL; current = NULL;
SENSOR_PRESSURE(entry, sensor) = 0; set_plot_pressure_data(entry, SENSOR_PR, sensor, 0);
continue; continue;
} }

6
core/profile.c
View file

@ -597,9 +597,9 @@ static void populate_plot_entries(struct dive *dive, struct divecomputer *dc, st
entry->pressures.o2 = sample->setpoint.mbar / 1000.0; entry->pressures.o2 = sample->setpoint.mbar / 1000.0;
} }
if (sample->pressure[0].mbar) if (sample->pressure[0].mbar)
SENSOR_PRESSURE(entry, sample->sensor[0]) = sample->pressure[0].mbar; set_plot_pressure_data(entry, SENSOR_PR, sample->sensor[0], sample->pressure[0].mbar);
if (sample->pressure[1].mbar) if (sample->pressure[1].mbar)
SENSOR_PRESSURE(entry, sample->sensor[1]) = sample->pressure[1].mbar; set_plot_pressure_data(entry, SENSOR_PR, sample->sensor[1], sample->pressure[1].mbar);
if (sample->temperature.mkelvin) if (sample->temperature.mkelvin)
entry->temperature = lasttemp = sample->temperature.mkelvin; entry->temperature = lasttemp = sample->temperature.mkelvin;
else else
@ -821,7 +821,7 @@ static void add_plot_pressure(struct plot_info *pi, int time, int cyl, pressure_
if (entry->sec >= time) if (entry->sec >= time)
break; break;
} }
SENSOR_PRESSURE(entry, cyl) = p.mbar; set_plot_pressure_data(entry, SENSOR_PR, cyl, p.mbar);
} }
static void setup_gas_sensor_pressure(const struct dive *dive, const struct divecomputer *dc, struct plot_info *pi) static void setup_gas_sensor_pressure(const struct dive *dive, const struct divecomputer *dc, struct plot_info *pi)

6
core/profile.h
View file

@ -97,13 +97,17 @@ int get_maxdepth(struct plot_info *pi);
#define SENSOR_PR 0 #define SENSOR_PR 0
#define INTERPOLATED_PR 1 #define INTERPOLATED_PR 1
#define SENSOR_PRESSURE(_entry,_idx) (_entry)->pressure[_idx][SENSOR_PR]
static inline int get_plot_pressure_data(const struct plot_data *entry, int sensor, int idx) static inline int get_plot_pressure_data(const struct plot_data *entry, int sensor, int idx)
{ {
return entry->pressure[idx][sensor]; return entry->pressure[idx][sensor];
} }
static inline void set_plot_pressure_data(struct plot_data *entry, int sensor, int idx, int value)
{
entry->pressure[idx][sensor] = value;
}
static inline int get_plot_sensor_pressure(const struct plot_data *entry, int idx) static inline int get_plot_sensor_pressure(const struct plot_data *entry, int idx)
{ {
return get_plot_pressure_data(entry, SENSOR_PR, idx); return get_plot_pressure_data(entry, SENSOR_PR, idx);