diff options
author | Matthew Barth <msbarth@us.ibm.com> | 2017-05-18 13:44:46 -0500 |
---|---|---|
committer | Matthew Barth <msbarth@us.ibm.com> | 2017-05-31 12:46:06 -0500 |
commit | 9c72667e8f6f75ffd1fd29de817fa8fdcbd1b45d (patch) | |
tree | 3359ac3bc2e8b658508ed3216a5e401719784104 /control | |
parent | 7e527c129ad97734484c46fc74a6fdd4b5dac738 (diff) | |
download | phosphor-fan-presence-9c72667e8f6f75ffd1fd29de817fa8fdcbd1b45d.tar.gz phosphor-fan-presence-9c72667e8f6f75ffd1fd29de817fa8fdcbd1b45d.zip |
Fixed alignment issues
Fixed resulting pep8 alignment issues in the generated template
Change-Id: I26d316a86c40896cda729683b26ccf06a3f89d5f
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Diffstat (limited to 'control')
-rwxr-xr-x | control/gen-fan-zone-defs.py | 126 |
1 files changed, 65 insertions, 61 deletions
diff --git a/control/gen-fan-zone-defs.py b/control/gen-fan-zone-defs.py index a779f34..f537716 100755 --- a/control/gen-fan-zone-defs.py +++ b/control/gen-fan-zone-defs.py @@ -25,66 +25,70 @@ const unsigned int Manager::_powerOnDelay{${mgr_data['power_on_delay']}}; const std::vector<ZoneGroup> Manager::_zoneLayouts { %for zone_group in zones: - ZoneGroup{std::vector<Condition>{}, - std::vector<ZoneDefinition>{ - %for zone in zone_group['zones']: - ZoneDefinition{${zone['num']}, - ${zone['full_speed']}, - std::vector<FanDefinition>{ - %for fan in zone['fans']: - FanDefinition{"${fan['name']}", - std::vector<std::string>{ - %for sensor in fan['sensors']: - "${sensor}", - %endfor - } - }, - %endfor - }, - std::vector<SetSpeedEvent>{ - %for event in zone['events']: - SetSpeedEvent{ - Group{ - %for member in event['group']: - { - "${member['name']}", - {"${member['interface']}", - "${member['property']}"} - }, - %endfor - }, - make_action(action::${event['action']['name']}( - %for index, param in enumerate(event['action']['parameters']): - %if (index+1) != len(event['action']['parameters']): - static_cast<${param['type']}>(${param['value']}), - %else: - static_cast<${param['type']}>(${param['value']}) - %endif - %endfor - )), - std::vector<PropertyChange>{ - %for signal in event['signal']: - PropertyChange{ - "interface='org.freedesktop.DBus.Properties'," - "member='PropertiesChanged'," - "type='signal'," - "path='${signal['path']}'", - make_handler(propertySignal<${signal['type']}>( - "${signal['interface']}", - "${signal['property']}", - handler::setProperty<${signal['type']}>( - "${signal['member']}", - "${signal['property']}" - ) - ))}, - %endfor - } - }, - %endfor - } - }, - %endfor - } + ZoneGroup{ + std::vector<Condition>{}, + std::vector<ZoneDefinition>{ + %for zone in zone_group['zones']: + ZoneDefinition{ + ${zone['num']}, + ${zone['full_speed']}, + std::vector<FanDefinition>{ + %for fan in zone['fans']: + FanDefinition{ + "${fan['name']}", + std::vector<std::string>{ + %for sensor in fan['sensors']: + "${sensor}", + %endfor + } + }, + %endfor + }, + std::vector<SetSpeedEvent>{ + %for event in zone['events']: + SetSpeedEvent{ + Group{ + %for member in event['group']: + { + "${member['name']}", + {"${member['interface']}", + "${member['property']}"} + }, + %endfor + }, + make_action(action::${event['action']['name']}( + %for i, p in enumerate(event['action']['parameters']): + %if (i+1) != len(event['action']['parameters']): + static_cast<${p['type']}>(${p['value']}), + %else: + static_cast<${p['type']}>(${p['value']}) + %endif + %endfor + )), + std::vector<PropertyChange>{ + %for s in event['signal']: + PropertyChange{ + "interface='org.freedesktop.DBus.Properties'," + "member='PropertiesChanged'," + "type='signal'," + "path='${s['path']}'", + make_handler(propertySignal<${s['type']}>( + "${s['interface']}", + "${s['property']}", + handler::setProperty<${s['type']}>( + "${s['member']}", + "${s['property']}" + ) + )) + }, + %endfor + } + }, + %endfor + } + }, + %endfor + } }, %endfor }; @@ -123,7 +127,7 @@ def getEventsInZone(zone_num, events_data): # Add set speed action and function parameters action = {} actions = next(a for a in events_data['actions'] - if a['name'] == e['action']['name']) + if a['name'] == e['action']['name']) action['name'] = actions['name'] params = [] for p in actions['parameters']: |