diff options
| author |  Joakim Bygdell <j.bygdell@gmail.com> | 2017-02-04 17:55:25 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-02-05 12:29:51 -0800 |
| commit | 0277d5aacc27893220c5914778896d2b4d14aa82 (patch) | |
| tree | bab2fae1f52703d437e7763cdac5e12c2ef0fd7e /core/dive.c | |
| parent | 12c33a038f1e2f33b7b0e09e0394684115e630ea (diff) | |
| download | subsurface-0277d5aacc27893220c5914778896d2b4d14aa82.tar.gz | |
Merge informational_prefs into git_prefs
There is no need to have two variables for the same purpose.
[Dirk Hohndel: changed to keep the two separate functions as otherwise
we no longer parse existing repos successfully]
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/dive.c')
| -rw-r--r-- | core/dive.c | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/core/dive.c b/core/dive.c index 38ed10761..ec6d66e92 100644 --- a/core/dive.c +++ b/core/dive.c @@ -3406,38 +3406,39 @@ void set_userid(char *rUserId) void set_informational_units(char *units) { if (strstr(units, "METRIC")) { - informational_prefs.unit_system = METRIC; + git_prefs.unit_system = METRIC; } else if (strstr(units, "IMPERIAL")) { - informational_prefs.unit_system = IMPERIAL; + git_prefs.unit_system = IMPERIAL; } else if (strstr(units, "PERSONALIZE")) { - informational_prefs.unit_system = PERSONALIZE; + git_prefs.unit_system = PERSONALIZE; if (strstr(units, "METERS")) - informational_prefs.units.length = METERS; + git_prefs.units.length = METERS; if (strstr(units, "FEET")) - informational_prefs.units.length = FEET; + git_prefs.units.length = FEET; if (strstr(units, "LITER")) - informational_prefs.units.volume = LITER; + git_prefs.units.volume = LITER; if (strstr(units, "CUFT")) - informational_prefs.units.volume = CUFT; + git_prefs.units.volume = CUFT; if (strstr(units, "BAR")) - informational_prefs.units.pressure = BAR; + git_prefs.units.pressure = BAR; if (strstr(units, "PSI")) - informational_prefs.units.pressure = PSI; + git_prefs.units.pressure = PSI; if (strstr(units, "PASCAL")) - informational_prefs.units.pressure = PASCAL; + git_prefs.units.pressure = PASCAL; if (strstr(units, "CELSIUS")) - informational_prefs.units.temperature = CELSIUS; + git_prefs.units.temperature = CELSIUS; if (strstr(units, "FAHRENHEIT")) - informational_prefs.units.temperature = FAHRENHEIT; + git_prefs.units.temperature = FAHRENHEIT; if (strstr(units, "KG")) - informational_prefs.units.weight = KG; + git_prefs.units.weight = KG; if (strstr(units, "LBS")) - informational_prefs.units.weight = LBS; + git_prefs.units.weight = LBS; if (strstr(units, "SECONDS")) - informational_prefs.units.vertical_speed_time = SECONDS; + git_prefs.units.vertical_speed_time = SECONDS; if (strstr(units, "MINUTES")) - informational_prefs.units.vertical_speed_time = MINUTES; + git_prefs.units.vertical_speed_time = MINUTES; } + } void set_git_prefs(char *prefs) @@ -3446,6 +3447,12 @@ void set_git_prefs(char *prefs) git_prefs.tankbar = 1; if (strstr(prefs, "DCCEILING")) git_prefs.dcceiling = 1; + if (strstr(prefs, "SHOW_SETPOINT")) + git_prefs.show_ccr_setpoint = 1; + if (strstr(prefs, "SHOW_SENSORS")) + git_prefs.show_ccr_sensors = 1; + if (strstr(prefs, "PO2_GRAPH")) + git_prefs.pp_graphs.po2 = 1; } void average_max_depth(struct diveplan *dive, int *avg_depth, int *max_depth) |