Mercurial > public > ostc4
comparison Discovery/Src/simulation.c @ 446:f1257a32f2d4 minor_improvments
Introduced configuration header for variant managment:
At the moment several defines are distributed across the code allowing special SW builds (e.g. logging simulated dives). To make these options more transparent and easier to configurate a separate header has been added. With this header an new option for an optical pressure sensor was introduced.
author | ideenmodellierer |
---|---|
date | Thu, 05 Mar 2020 22:31:50 +0100 |
parents | 1203255481e4 |
children | b2f8a39c11ea |
comparison
equal
deleted
inserted
replaced
445:ee1434824c3f | 446:f1257a32f2d4 |
---|---|
126 if(checkOncePerSecond) | 126 if(checkOncePerSecond) |
127 { | 127 { |
128 pDiveState->lifeData.temperature_celsius = stateRealGetPointer()->lifeData.temperature_celsius; | 128 pDiveState->lifeData.temperature_celsius = stateRealGetPointer()->lifeData.temperature_celsius; |
129 pDiveState->lifeData.compass_heading = stateRealGetPointer()->lifeData.compass_heading; | 129 pDiveState->lifeData.compass_heading = stateRealGetPointer()->lifeData.compass_heading; |
130 pDiveState->lifeData.battery_charge = stateRealGetPointer()->lifeData.battery_charge; | 130 pDiveState->lifeData.battery_charge = stateRealGetPointer()->lifeData.battery_charge; |
131 | 131 #ifdef ENABLE_BOTTLE_SENSOR |
132 pDiveState->lifeData.bottle_bar[pDiveState->lifeData.actualGas.GasIdInSettings] = stateRealGetPointer()->lifeData.bottle_bar[stateRealGetPointer()->lifeData.actualGas.GasIdInSettings]; | |
133 pDiveState->lifeData.bottle_bar_age_MilliSeconds[pDiveState->lifeData.actualGas.GasIdInSettings] = stateRealGetPointer()->lifeData.bottle_bar_age_MilliSeconds[stateRealGetPointer()->lifeData.actualGas.GasIdInSettings]; | |
134 #endif | |
132 int now = current_second(); | 135 int now = current_second(); |
133 if( last_second == now) | 136 if( last_second == now) |
134 return; | 137 return; |
135 last_second = now; | 138 last_second = now; |
136 | 139 |