Mercurial > public > ostc4
comparison Discovery/Src/data_central.c @ 310:95928ef3986f cleanup-4
Make dive mode detection more advanced
In commit a09b1855d656, a RTE function was factored out, that was
used to detect dive mode vs. surface mode.
In the hunt for the time difference bug between stopwatch and dive time
some progress was made, but its still not totally right. Add some old
logic back, that seems reasonable.
A pool test after this commit shows some improvement, but still there
is some random difference between stopwatch and dive time. Things like
perfectly in sync for 20 min. surface shortly, and descend again in
the same dive. Now, the was a 1 or 2 second difference.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| author | Jan Mulder <jlmulder@xs4all.nl> |
|---|---|
| date | Sun, 26 May 2019 10:09:22 +0200 |
| parents | eba8d1eb5bef |
| children | d784f281833a |
comparison
equal
deleted
inserted
replaced
| 309:b0045281cb2d | 310:95928ef3986f |
|---|---|
| 761 } | 761 } |
| 762 | 762 |
| 763 // This code is also in RTE. Keep it in sync when editing | 763 // This code is also in RTE. Keep it in sync when editing |
| 764 _Bool is_ambient_pressure_close_to_surface(SLifeData *lifeData) | 764 _Bool is_ambient_pressure_close_to_surface(SLifeData *lifeData) |
| 765 { | 765 { |
| 766 if(lifeData->pressure_ambient_bar < (lifeData->pressure_surface_bar + 0.1f)) | 766 if (lifeData->pressure_ambient_bar > 1.16) |
| 767 return false; | |
| 768 else if(lifeData->pressure_ambient_bar < (lifeData->pressure_surface_bar + 0.1f)) | |
| 767 return true; | 769 return true; |
| 768 else | 770 else |
| 769 return false; | 771 return false; |
| 770 } | 772 } |