From 29522814918e6e72c5c98201f42b09696fcfe090 Mon Sep 17 00:00:00 2001 From: Joakim Bygdell Date: Thu, 9 Apr 2015 17:41:41 +0200 Subject: [PATCH 2/3] Recmode: Allow the user to specify gas reserve. Since most regulators have an intermediate pressure of 10bar the minimum value is 10 while the max is 99. Signed-off-by: Joakim Bygdell --- planner.c | 5 +---- pref.h | 1 + qt-ui/diveplanner.cpp | 10 ++++++++++ qt-ui/diveplanner.h | 1 + qt-ui/plannerSettings.ui | 44 +++++++++++++++++++++++++++++++++++--------- subsurfacestartup.c | 1 + 6 files changed, 49 insertions(+), 13 deletions(-) diff --git a/planner.c b/planner.c index bd34f17..bc7f9c4 100644 --- a/planner.c +++ b/planner.c @@ -17,8 +17,6 @@ #define TIMESTEP 3 /* second */ #define DECOTIMESTEP 60 /* seconds. Unit of deco stop times */ -#define RESERVE 40000 /* Remaining gas in recreational mode */ - int decostoplevels[] = { 0, 3000, 6000, 9000, 12000, 15000, 18000, 21000, 24000, 27000, 30000, 33000, 36000, 39000, 42000, 45000, 48000, 51000, 54000, 57000, 60000, 63000, 66000, 69000, 72000, 75000, 78000, 81000, 84000, 87000, @@ -845,13 +843,12 @@ bool trial_ascent(int trial_depth, int stoplevel, int avg_depth, int bottom_time bool enough_gas(int current_cylinder) { cylinder_t *cyl; - cyl = &displayed_dive.cylinder[current_cylinder]; if (!cyl->start.mbar) return true; if (cyl->type.size.mliter) - return (float) (cyl->end.mbar - RESERVE) * cyl->type.size.mliter / 1000.0 > (float) cyl->deco_gas_used.mliter; + return (float) (cyl->end.mbar - prefs.reserve_gas) * cyl->type.size.mliter / 1000.0 > (float) cyl->deco_gas_used.mliter; else return true; } diff --git a/pref.h b/pref.h index 14cc57c..afc5373 100644 --- a/pref.h +++ b/pref.h @@ -80,6 +80,7 @@ struct preferences { bool display_transitions; bool recreational_mode; bool safetystop; + int reserve_gas; int bottomsac; int decosac; int o2consumption; // ml per min diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 40ec398..b21f7f9 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -395,6 +395,7 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) prefs.display_transitions = s.value("display_transitions", prefs.display_transitions).toBool(); prefs.recreational_mode = s.value("recreational_mode", prefs.recreational_mode).toBool(); prefs.safetystop = s.value("safetystop", prefs.safetystop).toBool(); + prefs.reserve_gas = s.value("reserve_gas", prefs.reserve_gas).toInt(); prefs.ascrate75 = s.value("ascrate75", prefs.ascrate75).toInt(); prefs.ascrate50 = s.value("ascrate50", prefs.ascrate50).toInt(); prefs.ascratestops = s.value("ascratestops", prefs.ascratestops).toInt(); @@ -418,6 +419,7 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) ui.display_transitions->setChecked(prefs.display_transitions); ui.recreational_mode->setChecked(prefs.recreational_mode); ui.safetystop->setChecked(prefs.safetystop); + ui.reserve_gas->setValue(prefs.reserve_gas / 1000); ui.bottompo2->setValue(prefs.bottompo2 / 1000.0); ui.decopo2->setValue(prefs.decopo2 / 1000.0); ui.backgasBreaks->setChecked(prefs.doo2breaks); @@ -433,6 +435,7 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) connect(ui.display_transitions, SIGNAL(toggled(bool)), plannerModel, SLOT(setDisplayTransitions(bool))); connect(ui.safetystop, SIGNAL(toggled(bool)), plannerModel, SLOT(setSafetyStop(bool))); connect(ui.recreational_mode, SIGNAL(toggled(bool)), plannerModel, SLOT(setRecreationalMode(bool))); + connect(ui.reserve_gas, SIGNAL(valueChanged(int)), plannerModel, SLOT(setReserveGas(int))); connect(ui.ascRate75, SIGNAL(valueChanged(int)), this, SLOT(setAscRate75(int))); connect(ui.ascRate75, SIGNAL(valueChanged(int)), plannerModel, SLOT(emitDataChanged())); connect(ui.ascRate50, SIGNAL(valueChanged(int)), this, SLOT(setAscRate50(int))); @@ -482,6 +485,7 @@ PlannerSettingsWidget::~PlannerSettingsWidget() s.setValue("display_transitions", prefs.display_transitions); s.setValue("recreational_mode", prefs.recreational_mode); s.setValue("safetystop", prefs.safetystop); + s.setValue("reserve_gas", prefs.reserve_gas); s.setValue("ascrate75", prefs.ascrate75); s.setValue("ascrate50", prefs.ascrate50); s.setValue("ascratestops", prefs.ascratestops); @@ -881,6 +885,12 @@ void DivePlannerPointsModel::setSafetyStop(bool value) emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS -1)); } +void DivePlannerPointsModel::setReserveGas(int reserve) +{ + prefs.reserve_gas = reserve * 1000; + emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); +} + void DivePlannerPointsModel::setDropStoneMode(bool value) { prefs.drop_stone_mode = value; diff --git a/qt-ui/diveplanner.h b/qt-ui/diveplanner.h index a4752b5..6cfcc5e 100644 --- a/qt-ui/diveplanner.h +++ b/qt-ui/diveplanner.h @@ -93,6 +93,7 @@ slots: void loadFromDive(dive *d); void emitDataChanged(); void setRebreatherMode(int mode); + void setReserveGas(int reserve); signals: void planCreated(); diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui index 961dce9..02d829c 100644 --- a/qt-ui/plannerSettings.ui +++ b/qt-ui/plannerSettings.ui @@ -262,21 +262,21 @@ 2 - + GF high - + Plan backgas breaks - + % @@ -289,14 +289,14 @@ - + Last stop at 6m - + @@ -306,7 +306,7 @@ - + % @@ -319,14 +319,14 @@ - + Drop to first depth - + Qt::Vertical @@ -339,7 +339,7 @@ - + GF low @@ -363,6 +363,32 @@ + + + + Reserve gas + + + + + + + bar + + + + + + 10 + + + 99 + + + 40 + + + diff --git a/subsurfacestartup.c b/subsurfacestartup.c index a5415c7..d7a7ede 100644 --- a/subsurfacestartup.c +++ b/subsurfacestartup.c @@ -54,6 +54,7 @@ struct preferences default_prefs = { .safetystop = true, .bottomsac = 20000, .decosac = 17000, + .reserve_gas=40000, .o2consumption = 720, .pscr_ratio = 100, .show_pictures_in_profile = true, -- 1.9.5 (Apple Git-50.3)