Changeset 2514:93251877b7cd

Show
Ignore:
Timestamp:
07/29/10 09:38:36 (6 weeks ago)
Author:
Fritz
Parents:
2513:eec689b93c50 (diff), 2512:529dbe6bc7a8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Children:
2515:61874da9a73d, 2518:4f41e138ea93
Branch:
default
Message:

merge

Files:
2 modified

Legend:

Unmodified
Added
Removed
  • db_installer.py

    r2506 r2514  
    139139db.add_sensor_feature_model(sf_name='Present', sf_device_type_id=device_type.id, sf_value_type='boolean', 
    140140                            sf_parameters='{}', sf_stat_key='present') 
     141 
     142 
     143# Create device technology features for Relay Board 
     144device_technology = db.add_device_technology(dt_id='relayboard', dt_name='Relay Board', 
     145                                             dt_description='Relay boards monitoring and controling ') 
     146device_type = db.add_device_type(dty_name='Switch', dt_id=device_technology.id) 
     147db.add_actuator_feature_model(af_name='Switch', af_device_type_id=device_type.id, 
     148                              af_parameters='{"command":"","value0":"off", "value1":"on"}', 
     149                              af_value_type='binary', af_return_confirmation=True) 
     150# TODO : voltmeter, logical_input, counter 
     151 
     152 
    141153# Create device technology features for Computer 
    142154device_technology = db.add_device_technology(dt_id='computer', dt_name='Computer', 
  • db_installer.py

    r2513 r2514  
    8484db.add_actuator_feature_model(af_name='Switch', af_device_type_id=device_type.id, 
    8585                              af_parameters='{"command":"","value0":"off", "value1":"on"}', 
    86                               af_value_type='binary', af_return_confirmation=True) 
     86                              af_value_type='binary', af_stat_key='command', af_return_confirmation=True) 
    8787device_type = db.add_device_type(dty_name='Dimmer', dt_id=device_technology.id) 
    8888db.add_actuator_feature_model(af_name='Switch', af_device_type_id=device_type.id, 
    8989                              af_parameters='{"command":"","value0":"off", "value1":"on"}', 
    90                               af_value_type='binary', af_return_confirmation=True) 
     90                              af_value_type='binary', af_stat_key='command', af_return_confirmation=True) 
    9191db.add_actuator_feature_model(af_name='Dimmer', af_device_type_id=device_type.id, 
    9292                              af_parameters='{"command":"dim","valueMin":0, "valueMax":100}', 
    93                               af_value_type='range', af_return_confirmation=True) 
     93                              af_value_type='range', af_stat_key='level', af_return_confirmation=True) 
    9494 
    9595# Create device technology features for EIB/KNX