diff --git a/dawn/fake-runtime/FakeRuntime.js b/dawn/fake-runtime/FakeRuntime.js index 3c164166..bd09e9f0 100644 --- a/dawn/fake-runtime/FakeRuntime.js +++ b/dawn/fake-runtime/FakeRuntime.js @@ -85,7 +85,10 @@ class FakeRuntime { sensor('MOTOR_SCALAR', 'MS2', [param('Val', 'float', randomFloat(-100, 100))], '101'), sensor('LimitSwitch', 'LS1', [param('Val', 'int', Math.round(randomFloat(0, 1)))], '102'), sensor('SENSOR_SCALAR', 'SS1', [param('Val', 'float', randomFloat(-100, 100))], '103'), - sensor('SENSOR_SCALAR', 'SS2', [param('Val', 'float', randomFloat(-100, 100))], '104'), + sensor('SENSOR_SCALAR', 'SS2', [ + param('Val 1', 'float', randomFloat(-100, 100)), + param('Val 2', 'float', randomFloat(-100, 100)), + param('Val 3', 'float', randomFloat(-100, 100))], '104'), sensor('SENSOR_BOOLEAN', 'SB1', [param('Val', 'bool', Math.random() < 0.5)], '105'), // Special Cases handled in dawn/renderer/reducers/peripherals.js diff --git a/dawn/main/MenuTemplate/DebugMenu.js b/dawn/main/MenuTemplate/DebugMenu.js index b8c5ec35..796132ce 100644 --- a/dawn/main/MenuTemplate/DebugMenu.js +++ b/dawn/main/MenuTemplate/DebugMenu.js @@ -44,14 +44,7 @@ const DebugMenu = { }); }, }, - { - label: 'Full Stack Timestamp', - click() { - RendererBridge.reduxDispatch({ - type: 'TIMESTAMP_CHECK', - }); - }, - }, + { label: 'Reload', accelerator: 'CommandOrControl+R', @@ -73,6 +66,14 @@ if (process.env.NODE_ENV === 'development') { } }, }); + DebugMenu.submenu.push({ + label: 'Full Stack Timestamp', + click() { + RendererBridge.reduxDispatch({ + type: 'TIMESTAMP_CHECK', + }); + }, + }); } export default DebugMenu; diff --git a/dawn/package.json b/dawn/package.json index fcc1b9af..d3f888c7 100644 --- a/dawn/package.json +++ b/dawn/package.json @@ -1,6 +1,6 @@ { "name": "Dawn", - "version": "0.6.0", + "version": "2018.0.0", "description": "Frontend for PIE Robotics System", "license": "Apache-2.0", "private": true, diff --git a/dawn/renderer/components/DNav.js b/dawn/renderer/components/DNav.js index 3ac43225..61e4ced2 100644 --- a/dawn/renderer/components/DNav.js +++ b/dawn/renderer/components/DNav.js @@ -10,7 +10,7 @@ import ConfigBox from './ConfigBox'; import UpdateBox from './UpdateBox'; import StatusLabel from './StatusLabel'; import TooltipButton from './TooltipButton'; -import { REG_VERSION, FC_VERSION } from '../constants/Constants'; +import { VERSION } from '../constants/Constants'; import { runtimeState } from '../utils/utils'; class DNavComponent extends React.Component { @@ -34,9 +34,9 @@ class DNavComponent extends React.Component { createHeader() { if (this.props.fieldControlStatus) { - return `Dawn v${FC_VERSION} ${(this.props.heart) ? '+' : '-'}`; + return `Dawn v${VERSION} ${(this.props.heart) ? '+' : '-'}`; } - return `Dawn v${REG_VERSION}`; + return `Dawn v${VERSION}`; } render() { diff --git a/dawn/renderer/components/peripherals/GenericPeripheral.js b/dawn/renderer/components/peripherals/GenericPeripheral.js index 9918100e..dd17c3e2 100644 --- a/dawn/renderer/components/peripherals/GenericPeripheral.js +++ b/dawn/renderer/components/peripherals/GenericPeripheral.js @@ -18,7 +18,7 @@ const GenericPeripheral = ({ { _.map(param, obj => (
-

+

{`${obj.param}: ${numeral(obj.int_value || obj.float_value).format('+0.00')}`}

@@ -28,14 +28,15 @@ const GenericPeripheral = ({ ); GenericPeripheral.propTypes = { - device_name: PropTypes.string.isRequired, + device_name: PropTypes.string, device_type: PropTypes.string, id: PropTypes.string.isRequired, param: PropTypes.array.isRequired, }; GenericPeripheral.defaultProps = { - device_type: 'Undefined Type', + device_name: 'Unknown Device', + device_type: 'Unknown Type', }; export default GenericPeripheral; diff --git a/dawn/renderer/components/peripherals/Motor.js b/dawn/renderer/components/peripherals/Motor.js index ae01690f..ce737a3b 100644 --- a/dawn/renderer/components/peripherals/Motor.js +++ b/dawn/renderer/components/peripherals/Motor.js @@ -18,10 +18,11 @@ const Motor = ({ id, device_name, param }) => ( { _.map(param, obj => ( // TODO: Figure out if a ProgressBar is useful
-

+

{`${obj.param}: ${numeral(obj.float_value).format('+0.00')}`} - +

+
)) } diff --git a/dawn/renderer/constants/Constants.js b/dawn/renderer/constants/Constants.js index 6e8d729e..2d1835e4 100755 --- a/dawn/renderer/constants/Constants.js +++ b/dawn/renderer/constants/Constants.js @@ -1,7 +1,6 @@ import keyMirror from 'keymirror'; -export const REG_VERSION = '0.7.0'; -export const FC_VERSION = 'FC-0.3.0'; +export const VERSION = '2018.0.0'; export const PeripheralTypes = keyMirror({ MOTOR_SCALAR: null, SENSOR_BOOLEAN: null,