diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-11-22 11:31:17 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-11-22 11:31:17 +0200 |
| commit | 712a01ddb6ba8e226d6532cdb834ad8e8b521cd5 (patch) | |
| tree | d3f6744f637743fbe338ba7e68d627be1437f500 /Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | |
| parent | 58d96d90f9422d390658d328d4f6eb3b86d168fa (diff) | |
| parent | a5776d0c00f131ec71b5e0300a0282b224530b0d (diff) | |
| download | Tango-712a01ddb6ba8e226d6532cdb834ad8e8b521cd5.tar.gz Tango-712a01ddb6ba8e226d6532cdb834ad8e8b521cd5.zip | |
merge conflict
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 5f6cdf1c6..8beab771d 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -540,7 +540,8 @@ int MillisecCalculateTemperatures (TEMPERATURE_SENSOR_ID_ENUM SensorId) TemperatureSum[SensorId]-=TemperatureMax[SensorId]; TemperatureSum[SensorId]-=TemperatureMin[SensorId]; calc = TemperatureSum[SensorId] / (TemperatureCount[SensorId]-2); - + if (abs(TemperatureMax[SensorId]-TemperatureMin[SensorId])>2000) + Report("Millisec Temp spike",__FILE__,SensorId,(int)TemperatureMax[SensorId],RpWarning,(int) TemperatureMin[SensorId],0); TemperatureSum[SensorId] = 0; TemperatureCount[SensorId] = 0; TemperatureMin[SensorId] = 30000; |