diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-04-30 13:51:28 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-04-30 13:51:28 +0300 |
| commit | 2308c8ba08fc31bb0451ff60341fd951b2b84b06 (patch) | |
| tree | f2cc1ec31cc9befb21bbcffe01f89e3bb3691028 /Software/Embedded_SW | |
| parent | 5ddbacede46d3e22f8b61b874fdf61d71ce833f0 (diff) | |
| parent | 021f7cb6520386e1d46f26db8723164ad6055c18 (diff) | |
| download | Tango-2308c8ba08fc31bb0451ff60341fd951b2b84b06.tar.gz Tango-2308c8ba08fc31bb0451ff60341fd951b2b84b06.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c | 4 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c index 2256ebd34..2a7aef30a 100644 --- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c +++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c @@ -865,14 +865,14 @@ uint32_t AlarmHandlingLoop(uint32_t tick) value = Get_MidTank_Int100_Sensor(AlarmItem[Alarm_i].DeviceId); if (AlarmItem[Alarm_i].AlarmDirection == OVER_VALUE) { - if (value*100 > AlarmItem[Alarm_i].AlarmValue) + if (value > AlarmItem[Alarm_i].AlarmValue) { Status = true; } } else { - if (value*100 < AlarmItem[Alarm_i].AlarmValue) + if (value < AlarmItem[Alarm_i].AlarmValue) { Status = true; } diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c index 6a1821f4b..2b24f9832 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c @@ -244,12 +244,6 @@ uint32_t SetDigitalOutRequestRequestFunc(MessageContainer* requestContainer) /* case INTERFACE_IOS__GPO_LED4: DataUpdated = request->value; break;*/ -/* case INTERFACE_IOS__GPO_BLOWER_PWM: - if (request->value == true) - Control_Dryer_Fan(START,75); - else - Control_Dryer_Fan(STOP, 0); - break;*/ case INTERFACE_IOS__VALVE_WASTE_TANK: if (request->value == true) Valve_Set(VALVE_MIXCHIP_WASTECH,1); |