commit d0b90fc68a35f153c54f693ef36ee8e90e219ed4
author Matthew Barth <msbarth@us.ibm.com> Mon Mar 05 09:38:45 2018 -0600
committer Matthew Barth <msbarth@us.ibm.com> Tue May 21 11:07:23 2019 -0500
tree 88418e77db4ab9181babb72fe1bd2c23dcb54adc
parent f20c321d43f8bb61e2c51198e7596bb877d9f3e3

Have timers be a trigger type in microseconds

Extract and generate timers in microseconds for all event triggers and
actions that take a timer as a parameter.

Tested:
    Timers are created on events with timer triggers defined
    Inspect that generated timers are created in microseconds
    No timer is created for events without a timer trigger

Change-Id: I345f247782779ef142fe0d569632be2b6c11f0c3
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>

control/templates/defs.mako

diff --git a/control/templates/defs.mako b/control/templates/defs.mako
index 30045f6d..fd8d97d 100644
--- a/control/templates/defs.mako
+++ b/control/templates/defs.mako
@@ -59,8 +59,11 @@
 %endfor
 },
 TimerConf{
-    ${event['timer']['interval']},
-    ${event['timer']['type']}
+    %if ('timer' in event['triggers']) and \
+        (event['triggers']['timer'] is not None):
+    ${event['triggers']['timer']['interval']},
+    ${event['triggers']['timer']['type']}
+    %endif
 },
 std::vector<Signal>{
 %for s in event['triggers']['signals']:

control/templates/fan_zone_defs.mako.cpp

diff --git a/control/templates/fan_zone_defs.mako.cpp b/control/templates/fan_zone_defs.mako.cpp
index a4ba615..ad37579 100644
--- a/control/templates/fan_zone_defs.mako.cpp
+++ b/control/templates/fan_zone_defs.mako.cpp
@@ -156,8 +156,11 @@
                         %endif
                         },
                         TimerConf{
-                            ${event['pc']['pctime']['interval']},
-                            ${event['pc']['pctime']['type']}
+                            %if ('timer' in event['pc']['triggers']) and \
+                                (event['pc']['triggers']['timer'] is not None):
+                            ${event['pc']['triggers']['pctime']['interval']},
+                            ${event['pc']['triggers']['pctime']['type']}
+                            %endif
                         },
                         std::vector<Signal>{
                         %for s in event['pc']['triggers']['pcsigs']: