Fix enum and boolean handling issue (#3)

acmerobotics · Dec 18, 2018 · 93c75b6 · 93c75b6
1 parent 17effc7
commit 93c75b6
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 32 deletions.
diff --git a/FtcDashboard/dash/config.json b/FtcDashboard/dash/config.json
@@ -1,4 +1,4 @@
 {
-  "HOST": "192.168.49.1",
+  "HOST": "192.168.1.20",
   "PORT": 8000
-}
+}
diff --git a/FtcDashboard/dash/src/components/inputs/BooleanInput.jsx b/FtcDashboard/dash/src/components/inputs/BooleanInput.jsx
@@ -1,13 +1,20 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-const BooleanInput = ({ value, onChange }) => (
-  <input type="checkbox" checked={value} onChange={evt => onChange(evt.target.checked, true)} />
+const BooleanInput = ({ value, onChange, onSave }) => (
+  <span>
+    <input type="checkbox" checked={value} onChange={evt => onChange({
+      value: evt.target.checked, 
+      valid: true
+    })} />
+    <button onClick={onSave}>Save</button>
+  </span>
 );
 
 BooleanInput.propTypes = {
   value: PropTypes.bool.isRequired,
-  onChange: PropTypes.func.isRequired
+  onChange: PropTypes.func.isRequired,
+  onSave: PropTypes.func.isRequired
 };
 
 export default BooleanInput;
diff --git a/FtcDashboard/dash/src/components/inputs/EnumInput.jsx b/FtcDashboard/dash/src/components/inputs/EnumInput.jsx
@@ -1,21 +1,28 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-const EnumInput = ({ value, values, onChange }) => (
-  <select
-    className="valid"
-    value={value}
-    onChange={evt => onChange(evt.target.value, true)}>
-    {
-      values.map(v => (<option key={v} value={v}>{v}</option>))
-    }
-  </select>
+const EnumInput = ({ value, values, onChange, onSave }) => (
+  <span>
+    <select
+      className="valid"
+      value={value}
+      onChange={evt => onChange({
+        value: evt.target.value, 
+        valid: true
+      })}>
+      {
+        values.map(v => (<option key={v} value={v}>{v}</option>))
+      }
+    </select>
+    <button onClick={onSave}>Save</button>
+  </span>
 );
 
 EnumInput.propTypes = {
   value: PropTypes.string.isRequired,
   values: PropTypes.arrayOf(PropTypes.string).isRequired,
-  onChange: PropTypes.func.isRequired
+  onChange: PropTypes.func.isRequired,
+  onSave: PropTypes.func.isRequired
 };
 
 export default EnumInput;
diff --git a/FtcDashboard/dash/src/components/inputs/TextInput.jsx b/FtcDashboard/dash/src/components/inputs/TextInput.jsx
@@ -18,7 +18,7 @@ class TextInput extends React.Component {
 
   handleKeyDown(evt) {
     if (evt.keyCode === 13) {
-      this.props.onEnter();
+      this.props.onSave();
     }
   }
 
@@ -41,7 +41,7 @@ TextInput.propTypes = {
   valid: PropTypes.bool.isRequired,
   validate: PropTypes.func.isRequired,
   onChange: PropTypes.func.isRequired,
-  onEnter: PropTypes.func.isRequired
+  onSave: PropTypes.func.isRequired
 };
 
 export default TextInput;
diff --git a/FtcDashboard/dash/src/containers/BasicOption.jsx b/FtcDashboard/dash/src/containers/BasicOption.jsx
@@ -12,7 +12,7 @@ class BasicOption extends React.Component {
 
     const type = OptionType.getFromSchema(schema);
 
-    const onEnter = () => {
+    const optionOnSave = () => {
       if (valid && modified) {
         onSave(value);
       }
@@ -22,27 +22,33 @@ class BasicOption extends React.Component {
 
     switch (type) {
     case OptionType.INT:
-      input = <TextInput value={value} valid={valid} validate={validateInt} onChange={onChange} onEnter={onEnter} />;
+      input = <TextInput value={value} valid={valid} validate={validateInt} onChange={onChange} onSave={optionOnSave} />;
       break;
     case OptionType.DOUBLE:
-      input = <TextInput value={value} valid={valid} validate={validateDouble} onChange={onChange} onEnter={onEnter} />;
+      input = <TextInput value={value} valid={valid} validate={validateDouble} onChange={onChange} onSave={optionOnSave} />;
       break;
     case OptionType.STRING:
-      input = <TextInput value={value} valid={valid} validate={validateString} onChange={onChange} onEnter={onEnter} />;
+      input = <TextInput value={value} valid={valid} validate={validateString} onChange={onChange} onSave={optionOnSave} />;
       break;
     case OptionType.BOOLEAN:
-      input = <BooleanInput value={value} onChange={onChange} />;
+      input = <BooleanInput value={value} onChange={onChange} onSave={optionOnSave} />;
       break;
     case OptionType.ENUM:
-      input = <EnumInput value={value} values={schema.values} onChange={onChange} />;
+      input = <EnumInput value={value} values={schema.values} onChange={onChange} onSave={optionOnSave} />;
       break;
     default:
       input = <p>Unknown option type: {type}</p>;
     }
 
     return (
       <tr>
-        <td>{modified ? '*' : ''}{name}</td>
+        <td><span style={ modified ? {
+          userSelect: 'auto',
+          opacity: 1.0
+        } : {
+          userSelect: 'none',
+          opacity: 0.0
+        }}>*</span>{name}</td>
         <td>{input}</td>
       </tr>
     );

diff --git a/FtcDashboard/dash/src/containers/CustomOption.jsx b/FtcDashboard/dash/src/containers/CustomOption.jsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { isEqual } from 'lodash';
 import Heading from '../components/Heading';
 import Icon from '../components/Icon';
 import BasicOption from './BasicOption';
@@ -30,12 +29,6 @@ class CustomOption extends React.Component {
       .filter((key) => key in schema)
       .sort();
 
-    // TODO: hack to reverse sort PID coefficients
-    if (isEqual(optionKeys, ['d', 'i', 'p'])) {
-      optionKeys[0] = 'p';
-      optionKeys[2] = 'd';
-    }
-
     const options = optionKeys.map((key) => {
       const onChange = (value) => {
         this.props.onChange({

diff --git a/FtcDashboard/src/main/java/com/acmerobotics/dashboard/DashboardWebSocket.java b/FtcDashboard/src/main/java/com/acmerobotics/dashboard/DashboardWebSocket.java
@@ -16,7 +16,7 @@
  * WebSocket connection to a dashboard client.
  */
 public class DashboardWebSocket extends NanoWSD.WebSocket {
-    public static final boolean DEBUG = true;
+    public static final boolean DEBUG = false;
 
     private static final Gson GSON = new GsonBuilder()
             .registerTypeAdapter(Message.class, new MessageDeserializer())

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/SampleConstants.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/SampleConstants.java
@@ -0,0 +1,13 @@
+package org.firstinspires.ftc.teamcode;
+
+import com.acmerobotics.dashboard.config.Config;
+import com.qualcomm.robotcore.hardware.DcMotorSimple;
+
+/*
+ * Some additional constants for testing.
+ */
+@Config
+public class SampleConstants {
+    public static DcMotorSimple.Direction DIR = DcMotorSimple.Direction.FORWARD;
+    public static boolean FF_ENABLED = false;
+}