Merge pull request #169 from AllanYangZhou/develop

Fix generic peripheral
pioneers · Feb 25, 2016 · a38df13 · a38df13
2 parents 1535a3a + 2b73c68
commit a38df13
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/dawn/js/components/peripherals/GenericPeripheral.js b/dawn/js/components/peripherals/GenericPeripheral.js
@@ -2,6 +2,7 @@
  * A generic peripheral, used when the peripheralType is unknown.
  */
 import React from 'react';
+import NameEdit from './NameEdit';
 
 export default React.createClass({
   getDefaultProps() {
@@ -10,6 +11,18 @@ export default React.createClass({
     };
   },
   render() {
-    return <h4> Peripheral Type Unknown <small>{this.props.peripheralType}</small></h4>;
+    return (
+      <div style={{overflow: 'auto'}}>
+        <div style={{overflow: 'auto', width: '100%'}}>
+          <h4 style={{float: 'left'}}>
+            <NameEdit name={this.props.name} id={this.props.id} />
+            <small>{this.props.peripheralType}</small>
+          </h4>
+          <h4 style={{float: 'right'}}>
+            { this.props.value }
+          </h4>
+        </div>
+      </div>
+    );
   }
 });
diff --git a/runtime/fake_runtime.py b/runtime/fake_runtime.py
@@ -70,14 +70,14 @@ def log_output(stream):
         'peripheral': {
             'name':id_to_name['1234'],
             'peripheralType': 'MOTOR_SCALAR',
-            'value': random.randint(0, 100),
+            'value': random.randint(-100, 100),
             'id': '1234'
         }
     })
     ansible.send_message('UPDATE_PERIPHERAL', {
         'peripheral': {
             'name': id_to_name['1235'],
-            'peripheralType': 'SENSOR_BOOLEAN',
+            'peripheralType': 'LimitSwitch',
             'value': random.randint(0, 1),
             'id': '1235'
         }