Mercurial > public > ostc4
annotate Small_CPU/Src/pressure.c @ 479:4b9427ae0a65 Improve_Button_Sleep
Bugfix unintended else condition:
Most likely copy past error in preparation of last commit...
| author | ideenmodellierer |
|---|---|
| date | Wed, 13 May 2020 21:27:30 +0200 |
| parents | 4be72d55b09a |
| children | 3fe9cc747c5c |
| rev | line source |
|---|---|
| 38 | 1 /** |
| 2 ****************************************************************************** | |
| 3 * @file pressure.c | |
| 4 * @author heinrichs weikamp gmbh | |
| 5 * @date 2014 | |
| 6 * @version V0.0.2 | |
| 7 * @since 20-Oct-2016 | |
| 8 * @brief | |
| 9 * | |
| 10 @verbatim | |
| 11 ============================================================================== | |
| 12 ##### How to use ##### | |
| 13 ============================================================================== | |
| 14 V0.0.2 18-Oct-2016 pressure_calculation_AN520_004_mod_MS5803_30BA__09_2015 | |
| 15 | |
| 16 @endverbatim | |
| 17 ****************************************************************************** | |
| 18 * @attention | |
| 19 * | |
| 20 * <h2><center>© COPYRIGHT(c) 2016 heinrichs weikamp</center></h2> | |
| 21 * | |
| 22 ****************************************************************************** | |
| 23 */ | |
| 24 | |
| 25 | |
| 26 | |
| 27 /* surface time | |
| 28 the last 30 minutes will be saved once per minute in a endless loop | |
| 29 at the beginning of a dive the oldest value will be used | |
| 30 */ | |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
31 #include "math.h" |
|
241
2b9775f71e30
cleanup: factor out I2C1_Status() and cleanup type
Jan Mulder <jlmulder@xs4all.nl>
parents:
186
diff
changeset
|
32 #include "scheduler.h" |
| 38 | 33 #include "pressure.h" |
| 34 #include "i2c.h" | |
| 35 #include "rtc.h" | |
| 36 | |
| 37 #define CMD_RESET 0x1E // ADC reset command | |
| 38 #define CMD_ADC_READ 0x00 // ADC read command | |
| 39 #define CMD_ADC_CONV 0x40 // ADC conversion command | |
| 40 #define CMD_ADC_D1 0x00 // ADC D1 conversion | |
| 41 #define CMD_ADC_D2 0x10 // ADC D2 conversion | |
| 42 #define CMD_ADC_256 0x00 // ADC OSR=256 | |
| 43 #define CMD_ADC_512 0x02 // ADC OSR=512 | |
| 44 #define CMD_ADC_1024 0x04 // ADC OSR=1024 | |
| 45 #define CMD_ADC_2048 0x06 // ADC OSR=2056 | |
| 46 #define CMD_ADC_4096 0x08 // ADC OSR=4096 | |
| 47 #define CMD_PROM_RD 0xA0 // Prom read command | |
| 48 | |
| 352 | 49 /* remove comment to use a predefined profile for pressure changes instead of real world data */ |
| 50 /* #define SIMULATE_PRESSURE */ | |
| 51 | |
| 52 #define PRESSURE_SURFACE_MAX_MBAR (1030.0f) /* It is unlikely that pressure at surface is greater than this value => clip to it */ | |
| 53 #define PRESSURE_HISTORY_SIZE (8u) | |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
54 |
| 352 | 55 #define PRESSURE_SURFACE_QUE (30u) /* history buffer [minutes] for past pressure measurements */ |
| 56 #define PRESSURE_SURFACE_EVA_WINDOW (15u) /* Number of entries evaluated during instability test. Used to avoid detection while dive enters water */ | |
| 57 #define PRESSURE_SURFACE_STABLE_LIMIT (10u) /* Define pressure as stable if delta (mBar) is below this value */ | |
| 58 #define PRESSURE_SURFACE_DETECT_STABLE_CNT (5u) /* Event count to detect stable condition */ | |
| 59 #define PRESSURE_SURFACE_UNSTABLE_LIMIT (50u) /* Define pressure as not stable if delta (mBar) is larger than this value */ | |
| 60 #define PRESSURE_SURFACE_DETECT_UNSTABLE_CNT (3u) /* Event count to detect unstable condition */ | |
| 61 | |
|
335
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
62 |
| 356 | 63 static uint8_t PRESSURE_ADDRESS = DEVICE_PRESSURE_MS5803; /* Default Address */ |
| 64 | |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
65 static uint16_t get_ci_by_coef_num(uint8_t coef_num); |
|
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
66 //void pressure_calculation_new(void); |
|
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
67 //void pressure_calculation_old(void); |
|
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
68 static void pressure_calculation_AN520_004_mod_MS5803_30BA__09_2015(void); |
| 356 | 69 //static uint8_t crc4(uint16_t n_prom[]); |
| 38 | 70 |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
71 static HAL_StatusTypeDef pressure_sensor_get_data(void); |
|
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
72 static uint32_t get_adc(void); |
| 38 | 73 uint8_t pressureSensorInitSuccess = 0; |
| 74 | |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
75 static uint16_t C[8] = { 1 }; |
|
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
76 static uint32_t D1 = 1; |
|
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
77 static uint32_t D2 = 1; |
| 356 | 78 //static uint8_t n_crc; |
| 38 | 79 |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
80 static int64_t C5_x_2p8 = 1; |
|
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
81 static int64_t C2_x_2p16 = 1; |
|
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
82 static int64_t C1_x_2p15 = 1; |
| 38 | 83 |
| 84 /* | |
| 85 short C2plus10000 = -1; | |
| 86 short C3plus200 = -1; | |
| 87 short C4minus250 = -1; | |
| 88 short UT1 = -1; | |
| 89 short C6plus100 = -1; | |
| 90 */ | |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
91 static float pressure_offset = 0.0; /* Offset value which may be specified by the user via PC Software */ |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
92 static float temperature_offset = 0.0; /* Offset value which may be specified by the user via PC Software */ |
| 38 | 93 |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
94 static float ambient_temperature = 0; |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
95 static float ambient_pressure_mbar = 1000.0; |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
96 static float surface_pressure_mbar = 1000.0; |
|
335
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
97 static float surface_ring_mbar[PRESSURE_SURFACE_QUE] = { 0 }; |
| 38 | 98 |
| 352 | 99 static uint8_t surface_pressure_writeIndex = 0; |
| 100 static float surface_pressure_stable_value = 0; | |
| 101 static uint8_t surface_pressure_stable = 0; | |
| 102 | |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
103 static float pressure_history_mbar[PRESSURE_HISTORY_SIZE]; |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
104 |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
105 static uint8_t secondCounterSurfaceRing = 0; |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
106 static uint8_t avgCount = 0; |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
107 static float runningAvg = 0; |
| 38 | 108 |
| 109 float get_temperature(void) | |
| 110 { | |
| 111 return ambient_temperature; | |
| 112 } | |
| 113 | |
| 114 float get_pressure_mbar(void) | |
| 115 { | |
| 116 return ambient_pressure_mbar; | |
| 117 } | |
| 118 | |
| 119 float get_surface_mbar(void) | |
| 120 { | |
| 121 return surface_pressure_mbar; | |
| 122 } | |
| 123 | |
| 124 | |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
125 void init_surface_ring(uint8_t force) |
| 38 | 126 { |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
127 if((surface_ring_mbar[0] == 0) || (force)) /* only initialize once. Keep value in place in case of an i2c recovery */ |
|
335
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
128 { |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
129 secondCounterSurfaceRing = 0; /* restart calculation */ |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
130 avgCount = 0; |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
131 runningAvg = 0; |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
132 |
|
335
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
133 for(int i=0; i<PRESSURE_SURFACE_QUE; i++) |
|
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
134 surface_ring_mbar[i] = ambient_pressure_mbar; |
|
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
135 surface_pressure_mbar = ambient_pressure_mbar; |
| 352 | 136 surface_pressure_writeIndex = 0; /* index of the oldest value in the ring buffer */ |
|
335
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
137 } |
| 38 | 138 } |
| 139 | |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
140 void init_pressure_history(void) |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
141 { |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
142 for(int i=0; i<PRESSURE_HISTORY_SIZE; i++) |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
143 { |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
144 pressure_history_mbar[i] = 1000.0; |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
145 } |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
146 } |
| 38 | 147 |
| 352 | 148 uint8_t is_surface_pressure_stable(void) |
| 149 { | |
| 150 return surface_pressure_stable; | |
| 151 } | |
|
335
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
152 |
| 352 | 153 float set_last_surface_pressure_stable(void) |
| 154 { | |
| 155 surface_pressure_mbar = surface_pressure_stable_value; | |
| 156 return surface_pressure_stable_value; | |
| 157 } | |
| 158 | |
| 159 /* iterate backward through the history memory and evaluate the changes pressure changes during the last 30 minutes */ | |
| 160 void evaluate_surface_pressure() | |
| 161 { | |
| 162 uint8_t index; | |
| 163 float lastvalue; | |
| 164 uint8_t stablecnt = 0; | |
| 165 uint8_t unstablecnt = 0; | |
| 166 uint8_t EvaluationWindow = PRESSURE_SURFACE_QUE - PRESSURE_SURFACE_EVA_WINDOW; /* do not use the latest 15 values to avoid unstable condition due to something like fin handling */ | |
| 167 uint8_t EvaluatedValues = 0; | |
| 168 | |
| 169 lastvalue = surface_ring_mbar[surface_pressure_writeIndex]; | |
| 170 surface_pressure_stable_value = surface_ring_mbar[surface_pressure_writeIndex]; /* default: if no stable value is found return the oldest value */ | |
| 171 index = surface_pressure_writeIndex; | |
| 172 surface_pressure_stable = 1; | |
| 173 | |
| 174 if(index == 0) | |
| 175 { | |
| 176 index = PRESSURE_SURFACE_QUE - 1; | |
| 177 } | |
| 178 else | |
| 179 { | |
| 180 index = index - 1; | |
| 181 } | |
| 182 do | |
| 183 { | |
| 184 if((EvaluatedValues < EvaluationWindow) && | |
| 185 (fabs(surface_pressure_stable_value - surface_ring_mbar[index]) > PRESSURE_SURFACE_UNSTABLE_LIMIT)) /* unusual change during last 30 minutes */ | |
| 186 { | |
| 187 unstablecnt++; | |
| 188 if(unstablecnt > PRESSURE_SURFACE_DETECT_UNSTABLE_CNT) | |
| 189 { | |
| 190 surface_pressure_stable = 0; | |
| 191 } | |
| 192 } | |
| 193 /* search for a value which does not change for several iterations */ | |
| 194 if (fabs(lastvalue - surface_ring_mbar[index]) < PRESSURE_SURFACE_STABLE_LIMIT) | |
| 195 { | |
| 196 stablecnt++; | |
| 197 } | |
| 198 else | |
| 199 { | |
| 200 stablecnt = 0; | |
| 201 } | |
| 202 if ((stablecnt >= PRESSURE_SURFACE_DETECT_STABLE_CNT) && (surface_pressure_stable == 0)&&(surface_pressure_stable_value == surface_ring_mbar[surface_pressure_writeIndex])) /* pressure is unstable => search for new stable value */ | |
| 203 { | |
| 204 surface_pressure_stable_value = surface_ring_mbar[index]; | |
| 205 unstablecnt = 0; | |
| 206 } | |
| 207 | |
| 208 lastvalue = surface_ring_mbar[index]; | |
| 209 | |
| 210 if(index == 0) | |
| 211 { | |
| 212 index = PRESSURE_SURFACE_QUE - 1; | |
| 213 } | |
| 214 else | |
| 215 { | |
| 216 index = index - 1; | |
| 217 } | |
| 218 EvaluatedValues++; | |
| 219 } while (index != surface_pressure_writeIndex); | |
| 220 } | |
| 38 | 221 void update_surface_pressure(uint8_t call_rhythm_seconds) |
| 222 { | |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
223 if(is_init_pressure_done()) |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
224 { |
|
335
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
225 runningAvg = (runningAvg * avgCount + ambient_pressure_mbar) / (avgCount +1); |
|
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
226 avgCount++; |
|
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
227 secondCounterSurfaceRing += call_rhythm_seconds; |
| 38 | 228 |
|
335
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
229 if(secondCounterSurfaceRing >= 60) |
|
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
230 { |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
231 if(runningAvg < PRESSURE_SURFACE_MAX_MBAR) |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
232 { |
| 352 | 233 surface_ring_mbar[surface_pressure_writeIndex] = runningAvg; |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
234 } |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
235 else |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
236 { |
| 352 | 237 surface_ring_mbar[surface_pressure_writeIndex] = PRESSURE_SURFACE_MAX_MBAR; |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
238 } |
| 352 | 239 surface_pressure_writeIndex++; /* the write index is now pointing to the oldest value in the buffer which will be overwritten next time */ |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
240 |
| 352 | 241 if(surface_pressure_writeIndex == PRESSURE_SURFACE_QUE) |
|
335
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
242 { |
| 352 | 243 surface_pressure_writeIndex = 0; |
|
335
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
244 } |
|
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
245 |
| 352 | 246 surface_pressure_mbar = surface_ring_mbar[surface_pressure_writeIndex]; /* 30 minutes old measurement */ |
|
335
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
247 |
|
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
248 secondCounterSurfaceRing = 0; |
|
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
249 avgCount = 1; /* use the current value as starting point but restart the weight decrement of the measurements */ |
|
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
250 } |
| 352 | 251 evaluate_surface_pressure(); |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
252 } |
| 38 | 253 } |
| 254 | |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
255 #ifdef DEMOMODE |
| 38 | 256 float demo_modify_temperature_helper(float bottom_mbar_diff_to_surface) |
| 257 { | |
| 258 const float temperature_surface = 31.0; | |
| 259 const float temperature_bottom = 14.0; | |
| 260 | |
| 261 const float temperature_difference = temperature_bottom - temperature_surface; | |
| 262 | |
| 263 // range 0.0 - 1.0 | |
| 264 float position_now = (ambient_pressure_mbar - surface_pressure_mbar) / bottom_mbar_diff_to_surface; | |
| 265 | |
| 266 if(position_now <= 0) | |
| 267 return temperature_surface; | |
| 268 | |
| 269 if(position_now >= 1) | |
| 270 return temperature_bottom; | |
| 271 | |
| 272 return temperature_surface + (temperature_difference * position_now); | |
| 273 } | |
| 274 | |
| 275 | |
| 276 uint32_t demo_modify_temperature_and_pressure(int32_t divetime_in_seconds, uint8_t subseconds, float ceiling_mbar) | |
| 277 { | |
| 278 | |
| 279 const float descent_rate = 4000/60; | |
| 280 const float ascent_rate = 1000/60; | |
| 281 const uint32_t seconds_descend = (1 * 60) + 30; | |
| 282 const uint32_t turbo_seconds_at_bottom_start = (0 * 60) + 0; | |
| 283 const uint32_t seconds_descend_and_bottomtime = seconds_descend + turbo_seconds_at_bottom_start + (2 * 60) + 0; | |
| 284 uint32_t time_elapsed_in_seconds; | |
| 285 static float ambient_pressure_mbar_memory = 0; | |
| 286 static uint32_t time_last_call = 0; | |
| 287 | |
| 288 if(divetime_in_seconds <= seconds_descend) | |
| 289 { | |
| 290 ambient_pressure_mbar = (divetime_in_seconds * descent_rate) + ((float)(subseconds) * descent_rate) + surface_pressure_mbar; | |
| 291 ambient_temperature = demo_modify_temperature_helper(descent_rate * seconds_descend); | |
| 292 | |
| 293 time_last_call = divetime_in_seconds; | |
| 294 return 0; | |
| 295 } | |
| 296 else | |
| 297 if(divetime_in_seconds <= seconds_descend + turbo_seconds_at_bottom_start) | |
| 298 { | |
| 299 ambient_pressure_mbar = (seconds_descend * descent_rate) + surface_pressure_mbar; | |
| 300 ambient_temperature = demo_modify_temperature_helper(descent_rate * seconds_descend); | |
| 301 ambient_pressure_mbar_memory = ambient_pressure_mbar; | |
| 302 time_last_call = divetime_in_seconds; | |
| 303 return turbo_seconds_at_bottom_start; | |
| 304 } | |
| 305 else | |
| 306 if(divetime_in_seconds <= seconds_descend_and_bottomtime) | |
| 307 { | |
| 308 ambient_pressure_mbar = (seconds_descend * descent_rate) + surface_pressure_mbar; | |
| 309 ambient_temperature = demo_modify_temperature_helper(descent_rate * seconds_descend); | |
| 310 ambient_pressure_mbar_memory = ambient_pressure_mbar; | |
| 311 time_last_call = divetime_in_seconds; | |
| 312 return 0; | |
| 313 } | |
| 314 else | |
| 315 { | |
| 316 time_elapsed_in_seconds = divetime_in_seconds - time_last_call; | |
| 317 ambient_pressure_mbar = ambient_pressure_mbar_memory - time_elapsed_in_seconds * ascent_rate; | |
| 318 | |
| 319 if(ambient_pressure_mbar < surface_pressure_mbar) | |
| 320 ambient_pressure_mbar = surface_pressure_mbar; | |
| 321 else if(ambient_pressure_mbar < ceiling_mbar) | |
| 322 ambient_pressure_mbar = ceiling_mbar; | |
| 323 | |
| 324 ambient_temperature = demo_modify_temperature_helper(descent_rate * seconds_descend); | |
| 325 ambient_pressure_mbar_memory = ambient_pressure_mbar; | |
| 326 time_last_call = divetime_in_seconds; | |
| 327 return 0; | |
| 328 } | |
| 329 } | |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
330 #endif |
| 38 | 331 |
| 332 uint8_t is_init_pressure_done(void) | |
| 333 { | |
| 334 return pressureSensorInitSuccess; | |
| 335 } | |
| 336 | |
| 337 uint8_t init_pressure(void) | |
| 338 { | |
| 339 uint8_t buffer[1]; | |
| 356 | 340 buffer[0] = 0x1E; // Reset Command |
| 38 | 341 uint8_t retValue = 0xFF; |
| 342 | |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
343 pressureSensorInitSuccess = false; |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
344 init_pressure_history(); |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
345 |
| 356 | 346 /* Probe new sensor first */ |
| 347 retValue = I2C_Master_Transmit( DEVICE_PRESSURE_MS5837, buffer, 1); | |
| 348 if(retValue != HAL_OK) | |
| 349 { | |
| 350 PRESSURE_ADDRESS = DEVICE_PRESSURE_MS5803; // use old sensor | |
| 351 HAL_Delay(100); | |
| 352 MX_I2C1_Init(); | |
| 353 if (global.I2C_SystemStatus != HAL_OK) | |
| 354 { | |
| 355 if (MX_I2C1_TestAndClear() == GPIO_PIN_RESET) { | |
| 356 MX_I2C1_TestAndClear(); // do it a second time | |
| 357 } | |
| 358 MX_I2C1_Init(); | |
| 359 } | |
| 360 } | |
| 361 else | |
| 362 { | |
| 363 PRESSURE_ADDRESS = DEVICE_PRESSURE_MS5837; // Success, use new sensor | |
| 364 } | |
| 365 HAL_Delay(3); //2.8ms according to datasheet | |
| 366 | |
| 367 buffer[0] = 0x1E; // Reset Command | |
| 368 retValue = 0xFF; | |
| 369 | |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
370 /* Send reset request to pressure sensor */ |
| 356 | 371 retValue = I2C_Master_Transmit( PRESSURE_ADDRESS, buffer, 1); |
| 38 | 372 if(retValue != HAL_OK) |
| 373 { | |
| 374 return (HAL_StatusTypeDef)retValue; | |
| 375 } | |
| 356 | 376 HAL_Delay(3); //2.8ms according to datasheet |
| 38 | 377 |
| 356 | 378 for(uint8_t i=0;i<7;i++) |
| 38 | 379 { |
| 380 C[i] = get_ci_by_coef_num(i); | |
| 381 } | |
| 356 | 382 // n_crc = crc4(C); // no evaluation at the moment hw 151026 |
| 38 | 383 |
| 384 C5_x_2p8 = C[5] * 256; | |
| 385 C2_x_2p16 = C[2] * 65536; | |
| 386 C1_x_2p15 = C[1] * 32768; | |
| 387 | |
|
241
2b9775f71e30
cleanup: factor out I2C1_Status() and cleanup type
Jan Mulder <jlmulder@xs4all.nl>
parents:
186
diff
changeset
|
388 if(global.I2C_SystemStatus == HAL_OK) |
| 38 | 389 { |
| 390 pressureSensorInitSuccess = 1; | |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
391 retValue = pressure_update(); |
| 38 | 392 } |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
393 return retValue; |
| 38 | 394 } |
| 395 | |
| 396 | |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
397 static uint32_t get_adc(void) |
| 38 | 398 { |
| 399 uint8_t buffer[1]; | |
| 400 uint8_t resivebuf[4]; | |
|
474
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
401 uint32_t answer = 0xFFFFFFFF; |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
402 |
| 38 | 403 buffer[0] = 0x00; // Get ADC |
|
474
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
404 if(I2C_Master_Transmit( PRESSURE_ADDRESS, buffer, 1) == HAL_OK) |
|
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
405 { |
|
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
406 if(I2C_Master_Receive( PRESSURE_ADDRESS, resivebuf, 4) == HAL_OK) |
|
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
407 { |
|
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
408 resivebuf[3] = 0; |
|
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
409 answer = 256*256 *(uint32_t)resivebuf[0] + 256 * (uint32_t)resivebuf[1] + (uint32_t)resivebuf[2]; |
|
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
410 } |
|
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
411 } |
| 38 | 412 return answer; |
| 413 } | |
| 414 | |
| 415 | |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
416 static uint16_t get_ci_by_coef_num(uint8_t coef_num) |
| 38 | 417 { |
| 418 uint8_t resivebuf[2]; | |
| 419 | |
| 420 uint8_t cmd = CMD_PROM_RD+coef_num*2; | |
| 356 | 421 I2C_Master_Transmit( PRESSURE_ADDRESS, &cmd, 1); |
| 422 I2C_Master_Receive( PRESSURE_ADDRESS, resivebuf, 2); | |
| 38 | 423 return (256*(uint16_t)resivebuf[0]) + (uint16_t)resivebuf[1]; |
| 424 } | |
| 425 | |
| 426 | |
| 427 | |
| 428 uint8_t pressure_update(void) | |
| 429 { | |
| 430 HAL_StatusTypeDef statusReturn = HAL_TIMEOUT; | |
| 431 | |
| 432 statusReturn = pressure_sensor_get_data(); | |
| 433 pressure_calculation(); | |
| 434 return (uint8_t)statusReturn; | |
| 435 } | |
| 436 | |
|
276
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
437 /* Switch between pressure and temperature measurement with every successful read operation */ |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
438 void pressure_update_alternating(void) |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
439 { |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
440 static uint8_t getTemperature= 0; |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
441 |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
442 if(getTemperature) |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
443 { |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
444 if(pressure_sensor_get_temperature_raw() == HAL_OK) |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
445 { |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
446 getTemperature = 0; |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
447 } |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
448 } |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
449 else |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
450 { |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
451 if(pressure_sensor_get_pressure_raw() == HAL_OK) |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
452 { |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
453 getTemperature = 1; |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
454 } |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
455 } |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
456 pressure_calculation(); |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
457 return; |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
458 } |
| 38 | 459 |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
460 static uint32_t pressure_sensor_get_one_value(uint8_t cmd, HAL_StatusTypeDef *statusReturn) |
| 38 | 461 { |
| 462 uint8_t command = CMD_ADC_CONV + cmd; | |
|
474
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
463 uint32_t adcValue = 0; |
| 38 | 464 HAL_StatusTypeDef statusReturnTemp = HAL_TIMEOUT; |
| 465 | |
| 356 | 466 statusReturnTemp = I2C_Master_Transmit( PRESSURE_ADDRESS, &command, 1); |
| 38 | 467 |
| 468 if(statusReturn) | |
| 469 { | |
| 470 *statusReturn = statusReturnTemp; | |
| 471 } | |
| 479 | 472 |
| 473 switch (cmd & 0x0f) // wait necessary conversion time | |
| 38 | 474 { |
| 479 | 475 case CMD_ADC_256 : HAL_Delay(1); break; |
| 476 case CMD_ADC_512 : HAL_Delay(3); break; | |
| 477 case CMD_ADC_1024: HAL_Delay(4); break; | |
| 478 case CMD_ADC_2048: HAL_Delay(6); break; | |
| 479 case CMD_ADC_4096: HAL_Delay(10); break; | |
| 480 default: | |
| 481 break; | |
| 482 } | |
| 483 adcValue = get_adc(); | |
| 484 if(adcValue == 0xFFFFFFFF) | |
| 485 { | |
| 486 if(statusReturn) | |
|
474
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
487 { |
|
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
488 *statusReturn = HAL_ERROR; |
|
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
489 } |
|
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
490 } |
|
4be72d55b09a
Added error detection for reading of ADC values in sleep mode:
ideenmodellierer
parents:
403
diff
changeset
|
491 return adcValue; |
| 38 | 492 } |
| 493 | |
| 494 | |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
495 static HAL_StatusTypeDef pressure_sensor_get_data(void) |
| 38 | 496 { |
|
276
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
497 uint32_t requestedValue = 0; |
| 38 | 498 HAL_StatusTypeDef statusReturn1 = HAL_TIMEOUT; |
| 499 HAL_StatusTypeDef statusReturn2 = HAL_TIMEOUT; | |
| 500 | |
|
276
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
501 |
| 38 | 502 |
|
276
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
503 requestedValue = pressure_sensor_get_one_value(CMD_ADC_D2 + CMD_ADC_1024, &statusReturn2); |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
504 if (statusReturn2 == HAL_OK) |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
505 { |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
506 D2 = requestedValue; |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
507 } |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
508 |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
509 requestedValue = pressure_sensor_get_one_value(CMD_ADC_D1 + CMD_ADC_1024, &statusReturn1); |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
510 if (statusReturn1 == HAL_OK) |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
511 { |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
512 D1 = requestedValue; |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
513 } |
| 38 | 514 if(statusReturn2 > statusReturn1) // if anything is not HAL_OK (0x00) or worse |
| 515 return statusReturn2; | |
| 516 else | |
| 517 return statusReturn1; | |
| 518 } | |
| 519 | |
| 520 | |
|
276
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
521 HAL_StatusTypeDef pressure_sensor_get_pressure_raw(void) |
| 38 | 522 { |
|
276
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
523 uint32_t requestedValue = 0; |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
524 HAL_StatusTypeDef statusReturn = HAL_TIMEOUT; |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
525 |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
526 requestedValue = pressure_sensor_get_one_value(CMD_ADC_D1 + CMD_ADC_1024, &statusReturn); |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
527 if (statusReturn == HAL_OK) |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
528 { |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
529 D1 = requestedValue; |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
530 } |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
531 |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
532 return statusReturn; |
| 38 | 533 } |
| 534 | |
| 535 | |
|
276
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
536 HAL_StatusTypeDef pressure_sensor_get_temperature_raw(void) |
| 38 | 537 { |
|
276
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
538 uint32_t requestedValue = 0; |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
539 HAL_StatusTypeDef statusReturn = HAL_TIMEOUT; |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
540 |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
541 requestedValue = pressure_sensor_get_one_value(CMD_ADC_D2 + CMD_ADC_1024, &statusReturn); |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
542 if (statusReturn == HAL_OK) |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
543 { |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
544 D2 = requestedValue; |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
545 } |
|
8e9c502c0b06
Rework pressure/ temperature data aquisition
ideenmodellierer
parents:
241
diff
changeset
|
546 return statusReturn; |
| 38 | 547 } |
| 548 | |
| 549 | |
| 352 | 550 #ifdef SIMULATE_PRESSURE |
| 551 void pressure_simulation() | |
| 552 { | |
| 553 static uint32_t tickstart = 0; | |
| 554 static float pressure_sim_mbar = 0; | |
| 555 static uint32_t passedSecond = 0; | |
| 556 static uint32_t secondtick = 0; | |
| 557 | |
| 558 uint32_t lasttick = 0; | |
| 559 | |
| 560 | |
| 561 | |
| 562 if( tickstart == 0) | |
| 563 { | |
| 564 tickstart = HAL_GetTick(); /* init time stamp */ | |
| 565 secondtick = tickstart; | |
| 566 pressure_sim_mbar = 1000; | |
| 567 } | |
| 568 | |
| 569 lasttick = HAL_GetTick(); | |
| 570 if(time_elapsed_ms(secondtick,lasttick) > 1000) /* one second passed since last tick */ | |
| 571 { | |
| 572 secondtick = lasttick; | |
| 573 passedSecond++; | |
| 574 | |
| 575 #ifdef DIVE_AFTER_LANDING | |
| 576 if(passedSecond < 10) pressure_sim_mbar = 1000.0; /* stay stable for 10 seconds */ | |
| 577 else if(passedSecond < 300) pressure_sim_mbar -= 1.0; /* decrease pressure in 5 minutes target 770mbar => delta 330 */ | |
| 578 else if(passedSecond < 900) pressure_sim_mbar += 0.0; /*stay stable 10 minutes*/ | |
| 579 else if(passedSecond < 1500) pressure_sim_mbar += 0.5; /* return to 1 bar in 10 Minutes*/ | |
| 580 else if(passedSecond < 1800) pressure_sim_mbar += 0.0; /* 5 minutes break */ | |
| 581 else if(passedSecond < 2000) pressure_sim_mbar += 10.0; /* start dive */ | |
| 582 else if(passedSecond < 2300) pressure_sim_mbar += 0.0; /* stay on depth */ | |
| 583 else if(passedSecond < 2500) pressure_sim_mbar -= 10.0; /* return to surface */ | |
| 584 else pressure_sim_mbar = 1000.0; /* final state */ | |
| 585 #else /* short dive */ | |
| 586 if(passedSecond < 10) pressure_sim_mbar = 1000.0; /* stay stable for 10 seconds */ | |
| 587 else if(passedSecond < 180) pressure_sim_mbar += 10.0; /* Start dive */ | |
| 588 else if(passedSecond < 300) pressure_sim_mbar += 0.0; /*stay on depth*/ | |
| 589 else if(passedSecond < 460) pressure_sim_mbar -= 10.0; /* return to surface */ | |
| 590 else if(passedSecond < 600) pressure_sim_mbar += 0.0; /* stay */ | |
| 591 else if(passedSecond < 610) pressure_sim_mbar = 1000.0; /* get ready for second dive */ | |
| 592 else if(passedSecond < 780) pressure_sim_mbar += 10.0; /* Start dive */ | |
| 593 else if(passedSecond < 900) pressure_sim_mbar += 0.0; /*stay on depth*/ | |
| 594 else if(passedSecond < 1060) pressure_sim_mbar -= 10.0; /* return to surface */ | |
| 595 else if(passedSecond < 1200) pressure_sim_mbar += 0.0; /* stay */ | |
| 596 else pressure_sim_mbar = 1000.0; /* final state */ | |
| 597 #endif | |
| 598 } | |
| 599 | |
| 600 | |
| 601 ambient_pressure_mbar = pressure_sim_mbar; | |
| 602 ambient_temperature = 25.0; | |
| 603 return; | |
| 604 } | |
| 605 | |
| 606 #endif | |
| 607 | |
| 38 | 608 void pressure_calculation(void) |
| 609 { | |
|
241
2b9775f71e30
cleanup: factor out I2C1_Status() and cleanup type
Jan Mulder <jlmulder@xs4all.nl>
parents:
186
diff
changeset
|
610 if(global.I2C_SystemStatus != HAL_OK) |
| 38 | 611 return; |
| 352 | 612 |
| 613 #ifdef SIMULATE_PRESSURE | |
| 614 pressure_simulation(); | |
| 615 #else | |
| 38 | 616 pressure_calculation_AN520_004_mod_MS5803_30BA__09_2015(); |
| 352 | 617 #endif |
| 38 | 618 } |
| 619 | |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
620 static uint8_t pressure_plausible(float pressurevalue) |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
621 { |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
622 static uint8_t pressurewriteindex = 0; |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
623 uint8_t retval = 0; |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
624 uint8_t index; |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
625 float pressure_average = 0; |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
626 |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
627 for(index = 0; index < PRESSURE_HISTORY_SIZE; index++) |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
628 { |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
629 pressure_average += pressure_history_mbar[index]; |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
630 } |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
631 pressure_average /= PRESSURE_HISTORY_SIZE; |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
632 if(pressure_average == 1000.0) /* first pressure calculation */ |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
633 { |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
634 if(fabs(pressurevalue - pressure_average) < 11000.0) /* just in case a reset occur during dive assume value equal < 100m as valid */ |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
635 { |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
636 for(index = 0; index < PRESSURE_HISTORY_SIZE; index++) |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
637 { |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
638 pressure_history_mbar[index] = pressurevalue; /* set history to current value */ |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
639 retval = 1; |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
640 } |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
641 } |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
642 } |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
643 else |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
644 { |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
645 pressure_history_mbar[pressurewriteindex++] = pressurevalue; |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
646 pressurewriteindex &= 0x7; /* wrap around if necessary */ |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
647 retval = 1; |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
648 } |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
649 |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
650 return retval; |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
651 } |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
652 |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
653 static void pressure_calculation_AN520_004_mod_MS5803_30BA__09_2015(void) |
| 38 | 654 { |
|
335
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
655 static float runningAvg = 0; |
|
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
656 static uint8_t avgCnt = 0; |
|
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
657 |
| 38 | 658 uint32_t local_D1; // ADC value of the pressure conversion |
| 659 uint32_t local_D2; // ADC value of the temperature conversion | |
| 660 int32_t local_Px10; // compensated pressure value | |
| 661 int32_t local_Tx100; // compensated temperature value | |
| 662 int64_t local_dT; // int32_t, difference between actual and measured temperature | |
| 663 int64_t local_OFF; // offset at actual temperature | |
| 664 int64_t local_SENS; // sensitivity at actual temperature | |
| 665 | |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
666 float calc_pressure; |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
667 |
| 38 | 668 int64_t T2; |
| 669 int64_t OFF2; | |
| 670 int64_t SENS2; | |
| 671 | |
| 672 local_D1 = D1; | |
| 673 local_D2 = D2; | |
| 674 | |
| 675 local_dT = ((int64_t)local_D2) - ((int64_t)C[5]) * 256; //pow(2,8); | |
| 676 local_OFF = ((int64_t)C[2]) * 65536 + local_dT * ((int64_t)C[4]) / 128; // pow(2,16), pow(2,7) | |
| 677 local_SENS = ((int64_t)C[1]) * 32768 + local_dT * ((int64_t)C[3]) / 256; // pow(2,15), pow(2,8) | |
| 678 | |
| 679 local_Tx100 = (int32_t)(2000 + (local_dT * ((int64_t)C[6])) / 8388608);// pow(2,23) | |
| 680 | |
| 681 | |
| 682 if(local_Tx100 < 2000) // low temperature | |
| 683 { | |
| 684 T2 = 3 * local_dT; | |
| 685 T2 *= local_dT; | |
| 686 T2 /= 8589934592; | |
| 687 | |
| 688 OFF2 = ((int64_t)local_Tx100) - 2000; | |
| 689 OFF2 *= OFF2; | |
| 690 OFF2 *= 3; | |
| 691 OFF2 /= 2; | |
| 692 | |
| 693 SENS2 = ((int64_t)local_Tx100) - 2000; | |
| 694 SENS2 *= SENS2; | |
| 695 SENS2 *= 5; | |
| 696 SENS2 /= 8; | |
| 697 | |
| 698 local_Tx100 -= (int32_t)T2; | |
| 699 local_OFF -= OFF2; | |
| 700 local_SENS -= SENS2; | |
| 701 } | |
| 702 else | |
| 703 { | |
| 704 T2 = 7 * local_dT; | |
| 705 T2 *= local_dT; | |
| 706 T2 /= 137438953472; | |
| 707 | |
| 708 OFF2 = ((int64_t)local_Tx100) - 2000; | |
| 709 OFF2 *= OFF2; | |
| 710 OFF2 /= 16; | |
| 711 | |
| 712 local_Tx100 -= (int32_t)T2; | |
| 713 local_OFF -= OFF2; | |
| 714 } | |
| 715 | |
| 716 local_Px10 = (int32_t)( | |
| 717 (((int64_t)((local_D1 * local_SENS) / 2097152)) - local_OFF) | |
| 718 / 8192 );// )) / 10; // pow(2,21), pow(2,13) | |
| 719 | |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
720 ambient_temperature = ((float)local_Tx100) / 100; |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
721 ambient_temperature += temperature_offset; |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
722 |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
723 calc_pressure = ((float)local_Px10) / 10; |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
724 calc_pressure += pressure_offset; |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
725 |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
726 if(pressure_plausible(calc_pressure)) |
|
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
727 { |
|
335
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
728 runningAvg = (avgCnt * runningAvg + calc_pressure) / (avgCnt + 1); |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
729 if (avgCnt < 10) /* build an average considering the last measurements to have a weight "1 of 10" */ |
|
335
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
730 { /* Main reason for this is the jitter of up to +-10 HPa in surface mode which is caused */ |
|
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
731 avgCnt++; /* by the measurement range of the sensor which is focused on under water pressure measurement */ |
|
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
732 } |
|
c11ce8c885d3
Use average calculation for pressure: precondition was that pressure values jittered +- 10 HPa from one capture (once a second) to the other. Basically pressure is measured several times a second => using these values in an additional history calculation reduces the jitter down to +-1 per second
ideenmodellierer
parents:
331
diff
changeset
|
733 ambient_pressure_mbar = runningAvg; |
|
331
b4c578caaafb
Added plausibility check for pressure values
ideenmodellierer
parents:
276
diff
changeset
|
734 } |
| 38 | 735 } |
| 736 | |
| 737 | |
| 738 /* taken from AN520 by meas-spec.com dated 9. Aug. 2011 | |
| 739 * short and int are both 16bit according to AVR/GCC google results | |
| 740 */ | |
| 356 | 741 /*static uint8_t crc4(uint16_t n_prom[]) |
| 38 | 742 { |
| 743 uint16_t cnt; // simple counter | |
| 744 uint16_t n_rem; // crc reminder | |
| 745 uint16_t crc_read; // original value of the crc | |
| 746 uint8_t n_bit; | |
| 747 n_rem = 0x00; | |
| 748 crc_read=n_prom[7]; //save read CRC | |
| 749 n_prom[7]=(0xFF00 & (n_prom[7])); //CRC byte is replaced by 0 | |
| 750 for (cnt = 0; cnt < 16; cnt++) // operation is performed on bytes | |
| 751 { // choose LSB or MSB | |
| 752 if (cnt%2==1) n_rem ^= (uint16_t) ((n_prom[cnt>>1]) & 0x00FF); | |
| 753 else n_rem ^= (uint16_t) (n_prom[cnt>>1]>>8); | |
| 754 for (n_bit = 8; n_bit > 0; n_bit--) | |
| 755 { | |
| 756 if (n_rem & (0x8000)) | |
| 757 { | |
| 758 n_rem = (n_rem << 1) ^ 0x3000; | |
| 759 } | |
| 760 else | |
| 761 { | |
| 762 n_rem = (n_rem << 1); | |
| 763 } | |
| 764 } | |
| 765 } | |
| 766 n_rem= (0x000F & (n_rem >> 12)); // // final 4-bit reminder is CRC code | |
| 767 n_prom[7]=crc_read; // restore the crc_read to its original place | |
| 768 return (n_rem ^ 0x00); | |
| 769 } | |
| 356 | 770 |
| 38 | 771 void test_calculation(void) |
| 772 { | |
| 773 C1 = 29112; | |
| 774 C2 = 26814; | |
| 775 C3 = 19125; | |
| 776 C4 = 17865; | |
| 777 C5 = 32057; | |
| 778 C6 = 31305; | |
| 779 | |
| 780 C2_x_2p16 = C2 * 65536; | |
| 781 C1_x_2p15 = C1 * 32768; | |
| 782 | |
| 783 D1 = 4944364; | |
| 784 D2 = 8198974; | |
| 785 pressure_calculation() ; | |
| 786 }; | |
| 787 */ | |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
788 void pressure_set_offset (float pressureOffset, float temperatureOffset) |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
789 { |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
790 if(pressure_offset != pressureOffset) /* we received a new value => reinit surface que */ |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
791 { |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
792 ambient_pressure_mbar -= pressure_offset; /* revert old value */ |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
793 ambient_pressure_mbar += pressureOffset; /* apply new offset */ |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
794 init_surface_ring(1); |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
795 } |
| 38 | 796 |
|
339
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
797 pressure_offset = pressureOffset; |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
798 temperature_offset = temperatureOffset; |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
799 } |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
800 |
|
37f45300bc2e
Apply averaging to pressure measurement: In pre versions calculated pressure value jittered +/-10hPa. Since we measure the pressure several time a second but only use one value a second, calc average including not used values
ideenmodellierer
parents:
335
diff
changeset
|
801 |