From 23856e0409fc62155fc1dec934101a507517c2b5 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Mon, 3 Dec 2018 09:47:09 +0200 Subject: improved logging in thread winder --- Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules') diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index b6392249a..c7d303f9a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -219,7 +219,9 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag) winderspeed+=WinderMotorSpeed[i]; } winderspeed/=MAX_WINDER_SPEED_CALCULATION; - LOG_ERROR(winderspeed, "WinderSpeedUpdated"); + //LOG_ERROR(winderspeed, "WinderSpeedUpdated"); + Report("WinderSpeedUpdated",__FILE__,__LINE__,winderspeed,RpWarning,ScrewNumberOfSteps,0); + WinderReferenceSpeed = winderspeed; } screw_horizontal_speed = ScrewNumberOfSteps / InternalWinderCfg.NumberOfRotationPerPassage; @@ -231,7 +233,8 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag) temp /= ScrewSpeed; if (ScrewRunningTime != temp) { - LOG_ERROR(temp , "new winder speed"); + //LOG_ERROR(temp , "new winder speed"); + Report("new winder speed",__FILE__,__LINE__,temp,RpWarning,ScrewSpeed,0); } ScrewRunningTime = temp;//(SYS_CLK_FREQ*Steps)/ScrewSpeed; -- cgit v1.3.1 From 7665c5bd2de71fa724809cede3bcb408a78250bf Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Mon, 3 Dec 2018 09:54:52 +0200 Subject: improve alarm handling reporting --- .../Embedded/Modules/AlarmHandling/AlarmHandling.c | 25 ++++++++++------------ 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules') diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c index d1a7b0145..2d0e5a4c7 100644 --- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c +++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c @@ -261,6 +261,8 @@ JobEndReasonEnum getEndReason(uint32_t AlarmId) return JOB_OTHER_ALARM; } } +char Alarmstr[150]; + uint32_t AlarmHandlingConsequentActions(uint32_t AlarmId, DebugLogCategory Severity) { switch (Severity) @@ -269,25 +271,20 @@ uint32_t AlarmHandlingConsequentActions(uint32_t AlarmId, DebugLogCategory Sever //raise flag fr next job break; + case DEBUG_LOG_CATEGORY__Critical: + watchdogCriticalAlarm = true; + //intentional fall through case DEBUG_LOG_CATEGORY__Error: if (JobIsActive()) { + memset(Alarmstr,0,sizeof(Alarmstr)); + usnprintf(Alarmstr, 100, "Alarm set on Alarm Id, Value",(int)AlarmId,(int)AlarmItem[AlarmId].AlarmValue); + strcat (Alarmstr, AlarmItem[AlarmId].EventName ); JobEndReason = getEndReason(AlarmId); - AbortJob(AlarmItem[AlarmId].EventName); - Report(AlarmItem[AlarmId].EventName, __FILE__,__LINE__,AlarmId, RpMessage, DEBUG_LOG_CATEGORY__Error, 0); + AbortJob(Alarmstr); + Report("Alarm set on - stop job", __FILE__,__LINE__,AlarmItem[AlarmId].AlarmValue, RpMessage, AlarmItem[AlarmId].DebounceCounter, 0); + Report(AlarmItem[AlarmId].EventName, __FILE__,__LINE__,AlarmId, RpMessage, Severity, 0); } -//Stop Job - break; - case DEBUG_LOG_CATEGORY__Critical: - if (JobIsActive()) - { - JobEndReason = JOB_OTHER_ALARM; - AbortJob(AlarmItem[AlarmId].EventName); - Report(AlarmItem[AlarmId].EventName, __FILE__,__LINE__,AlarmId, RpMessage, DEBUG_LOG_CATEGORY__Critical, 0); - } - watchdogCriticalAlarm = true; - //stop job - //turn machine off break; case DEBUG_LOG_CATEGORY__Debug: case DEBUG_LOG_CATEGORY__Info: -- cgit v1.3.1