diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/gaspressures.c | 11 | ||||
| -rw-r--r-- | core/profile.c | 4 | ||||
| -rw-r--r-- | core/profile.h | 17 |
3 files changed, 14 insertions, 18 deletions
diff --git a/core/gaspressures.c b/core/gaspressures.c index bb55ecb88..880c4dbdb 100644 --- a/core/gaspressures.c +++ b/core/gaspressures.c @@ -350,10 +350,8 @@ static inline int calc_pressure_time(struct dive *dive, struct plot_data *a, str static void debug_print_pressures(struct plot_info *pi) { int i; - for (i = 0; i < pi->nr; i++) { - struct plot_data *entry = pi->entry + i; - printf("%5d |%9d | %9d |\n", i, get_plot_sensor_pressure(entry), get_plot_interpolated_pressure(entry)); - } + for (i = 0; i < pi->nr; i++) + printf("%5d |%9d | %9d |\n", i, get_plot_sensor_pressure(pi, i), get_plot_interpolated_pressure(pi, i)); } #endif @@ -386,8 +384,7 @@ void populate_pressure_information(struct dive *dive, struct divecomputer *dc, s /* Get a rough range of where we have any pressures at all */ first = last = -1; for (int i = 0; i < pi->nr; i++) { - struct plot_data *entry = pi->entry + i; - int pressure = get_plot_sensor_pressure(entry, sensor); + int pressure = get_plot_sensor_pressure(pi, i, sensor); if (!pressure) continue; @@ -416,7 +413,7 @@ void populate_pressure_information(struct dive *dive, struct divecomputer *dc, s for (int i = first; i <= last; i++) { struct plot_data *entry = pi->entry + i; - int pressure = get_plot_sensor_pressure(entry, sensor); + int pressure = get_plot_sensor_pressure(pi, i, sensor); int time = entry->sec; while (ev && ev->time.seconds <= time) { // Find 1st gaschange event after diff --git a/core/profile.c b/core/profile.c index df8a8f3ef..413b1abde 100644 --- a/core/profile.c +++ b/core/profile.c @@ -1322,8 +1322,8 @@ static void debug_print_profiledata(struct plot_info *pi) fprintf(f1, "id t1 gas gasint t2 t3 dil dilint t4 t5 setpoint sensor1 sensor2 sensor3 t6 po2 fo2\n"); for (i = 0; i < pi->nr; i++) { entry = pi->entry + i; - fprintf(f1, "%d gas=%8d %8d ; dil=%8d %8d ; o2_sp= %d %d %d %d PO2= %f\n", i, get_plot_sensor_pressure(entry), - get_plot_interpolated_pressure(entry), O2CYLINDER_PRESSURE(entry), INTERPOLATED_O2CYLINDER_PRESSURE(entry), + fprintf(f1, "%d gas=%8d %8d ; dil=%8d %8d ; o2_sp= %d %d %d %d PO2= %f\n", i, get_plot_sensor_pressure(pi, i), + get_plot_interpolated_pressure(pi, i), O2CYLINDER_PRESSURE(entry), INTERPOLATED_O2CYLINDER_PRESSURE(entry), entry->o2pressure.mbar, entry->o2sensor[0].mbar, entry->o2sensor[1].mbar, entry->o2sensor[2].mbar, entry->pressures.o2); } fclose(f1); diff --git a/core/profile.h b/core/profile.h index 32b255689..070da1f23 100644 --- a/core/profile.h +++ b/core/profile.h @@ -102,9 +102,9 @@ extern int get_maxtime(struct plot_info *pi); * partial pressure graphs */ extern int get_maxdepth(struct plot_info *pi); -static inline int get_plot_pressure_data(const struct plot_data *entry, enum plot_pressure sensor, int idx) +static inline int get_plot_pressure_data(const struct plot_info *pi, int idx, enum plot_pressure sensor, int cylinder) { - return entry->pressure[idx][sensor]; + return pi->entry[idx].pressure[cylinder][sensor]; } static inline void set_plot_pressure_data(struct plot_data *entry, enum plot_pressure sensor, int idx, int value) @@ -112,21 +112,20 @@ static inline void set_plot_pressure_data(struct plot_data *entry, enum plot_pre 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_info *pi, int idx, int cylinder) { - return get_plot_pressure_data(entry, SENSOR_PR, idx); + return get_plot_pressure_data(pi, idx, SENSOR_PR, cylinder); } -static inline int get_plot_interpolated_pressure(const struct plot_data *entry, int idx) +static inline int get_plot_interpolated_pressure(const struct plot_info *pi, int idx, int cylinder) { - return get_plot_pressure_data(entry, INTERPOLATED_PR, idx); + return get_plot_pressure_data(pi, idx, INTERPOLATED_PR, cylinder); } static inline int get_plot_pressure(const struct plot_info *pi, int idx, int cylinder) { - const struct plot_data *entry = pi->entry + idx; - int res = get_plot_sensor_pressure(entry, cylinder); - return res ? res : get_plot_interpolated_pressure(entry, cylinder); + int res = get_plot_sensor_pressure(pi, idx, cylinder); + return res ? res : get_plot_interpolated_pressure(pi, idx, cylinder); } #ifdef __cplusplus |