aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-11-02 17:50:35 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-11-02 17:50:35 +0200
commitf0905c07b9b5bc33aa9bad914ca799cf1e8a920c (patch)
tree707079eae0630224126e228363a65b67192bc59b /Software/Embedded_SW/Embedded/Modules
parentfd4bdbad20a83025adbd8ec7992b4756e9d29c4d (diff)
downloadTango-f0905c07b9b5bc33aa9bad914ca799cf1e8a920c.tar.gz
Tango-f0905c07b9b5bc33aa9bad914ca799cf1e8a920c.zip
persistent alarms + config params description
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c6
-rw-r--r--Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 88ef35236..127ccbabf 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -163,6 +163,7 @@ typedef struct
uint16_t Predecessor;
uint8_t DebounceValue;
EventType EventType;
+ bool isPersistent;
}AlarmHandlingItemStruc;
typedef struct
{
@@ -500,6 +501,7 @@ uint32_t AlarmHandlingLoadFile(void)
FileAlarmItem[F_count].Predecessor = AlarmParametersTable->alarmitem[i]->predecessor;
FileAlarmItem[F_count].DebounceValue = AlarmParametersTable->alarmitem[i]->debouncevalue;
FileAlarmItem[F_count].EventType = AlarmParametersTable->alarmitem[i]->eventtype;
+ FileAlarmItem[F_count].isPersistent = AlarmParametersTable->alarmitem[i]->ispersistent;
p_size+= sizeof(AlarmHandlingItemStruc);
F_count++;
@@ -1077,8 +1079,8 @@ void AlarmHandlingInternalSetAlarm(uint32_t AlarmId, bool value)
{
if (AlarmItem[Alarm_i].EventType == AlarmId)
{
- if (0) // PERSISTENT ALARM
- //if ((AlarmItem[Alarm_i].EventType == EVENT_TYPE__UNINTENDED_RESET)) // PERSISTENT ALARM simulate
+ //if (0) // PERSISTENT ALARM
+ if ((AlarmItem[Alarm_i].isPersistent == true)) // PERSISTENT ALARM simulate
{
if (PersistentEventsResponse.events == NULL)
PersistentEventsResponse.events = (Event **)my_malloc(sizeof(Event*)*(PersistentEventsResponse.n_events+1));
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index b03494496..193a35e12 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -304,6 +304,9 @@ void LoadConfigurationParameters(ConfigurationParameters *Params)
else
{
EmbeddedParameters = Params;
+ if (EmbeddedParameters->description)
+ Report(EmbeddedParameters->description, __FILE__,__LINE__,112233, RpMessage, 445566, 0);
+
}
}
uint32_t EmbeddedParametersInit(void)