Add basic support for long, float (#150)

* feat: support long types in configurations * feat: support float types in configurations
acmerobotics · Dec 12, 2023 · 26920d6 · 26920d6
1 parent 82b536f
commit 26920d6
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 2 deletions.
diff --git a/...oardCore/src/main/java/com/acmerobotics/dashboard/config/reflection/ReflectionConfig.java b/...oardCore/src/main/java/com/acmerobotics/dashboard/config/reflection/ReflectionConfig.java
@@ -33,6 +33,8 @@ private static ConfigVariable<?> createVariableFromArrayField(Field field, Class
         switch (type) {
             case BOOLEAN:
             case INT:
+            case LONG:
+            case FLOAT:
             case DOUBLE:
             case STRING:
             case ENUM:
@@ -88,6 +90,8 @@ private static ConfigVariable<?> createVariableFromField(Field field, Object par
         switch (type) {
             case BOOLEAN:
             case INT:
+            case LONG:
+            case FLOAT:
             case DOUBLE:
             case STRING:
             case ENUM:

diff --git a/.../src/main/java/com/acmerobotics/dashboard/config/variable/ConfigVariableDeserializer.java b/.../src/main/java/com/acmerobotics/dashboard/config/variable/ConfigVariableDeserializer.java
@@ -25,6 +25,12 @@ public ConfigVariable<?> deserialize(JsonElement jsonElement, Type type,
             case INT:
                 return new BasicVariable<>(varType,
                     new ConstantProvider<>(valueEl.isJsonNull() ? null : valueEl.getAsInt()));
+            case LONG:
+                return new BasicVariable<>(varType,
+                    new ConstantProvider<>(valueEl.isJsonNull() ? null : valueEl.getAsLong()));
+            case FLOAT:
+                return new BasicVariable<>(varType,
+                    new ConstantProvider<>(valueEl.isJsonNull() ? null : valueEl.getAsFloat()));
             case DOUBLE:
                 return new BasicVariable<>(varType,
                     new ConstantProvider<>(valueEl.isJsonNull() ? null : valueEl.getAsDouble()));

diff --git a/DashboardCore/src/main/java/com/acmerobotics/dashboard/config/variable/VariableType.java b/DashboardCore/src/main/java/com/acmerobotics/dashboard/config/variable/VariableType.java
@@ -12,6 +12,12 @@ public enum VariableType {
     @SerializedName("int")
     INT,
 
+    @SerializedName("long")
+    LONG,
+
+    @SerializedName("float")
+    FLOAT,
+
     @SerializedName("double")
     DOUBLE,
 
@@ -34,6 +40,10 @@ public static VariableType fromClass(Class<?> klass) {
             return BOOLEAN;
         } else if (klass == Integer.class || klass == int.class) {
             return INT;
+        } else if (klass == Long.class || klass == long.class) {
+            return LONG;
+        } else if (klass == Float.class || klass == float.class) {
+            return FLOAT;
         } else if (klass == Double.class || klass == double.class) {
             return DOUBLE;
         } else if (klass == String.class) {

diff --git a/DashboardCore/src/test/java/com/acmerobotics/dashboard/TestDashboardInstance.java b/DashboardCore/src/test/java/com/acmerobotics/dashboard/TestDashboardInstance.java
@@ -176,6 +176,32 @@ public void set(TestEnum value) {
             }
         });
 
+        core.addConfigVariable("More Primitives", "Long", new ValueProvider<Long>() {
+            private long value = 10L;
+
+            @Override
+            public Long get() {
+                return this.value;
+            }
+
+            @Override
+            public void set(Long value) {
+                this.value = value;
+            }
+        });
+        core.addConfigVariable("More Primitives", "Float", new ValueProvider<Float>() {
+            private float value = 10L;
+
+            @Override
+            public Float get() {
+                return this.value;
+            }
+
+            @Override
+            public void set(Float value) {
+                this.value = value;
+            }
+        });
 
         try {
             server.start();

diff --git a/FtcDashboard/dash/src/components/views/ConfigView/BasicVariable.tsx b/FtcDashboard/dash/src/components/views/ConfigView/BasicVariable.tsx
@@ -61,6 +61,7 @@ class BasicVariable extends React.Component<Props> {
     } else {
       switch (state.__type) {
         case 'int':
+        case 'long':
           input = (
             <TextInput
               id={path}
@@ -72,6 +73,7 @@ class BasicVariable extends React.Component<Props> {
             />
           );
           break;
+        case 'float':
         case 'double':
           if (typeof state.__value === 'string') {
             input = <p>{state.__value}</p>;

diff --git a/FtcDashboard/dash/src/store/types/config.ts b/FtcDashboard/dash/src/store/types/config.ts
@@ -20,7 +20,7 @@ export type BasicVar =
       __enumValues: string[];
     }
   | {
-      __type: 'boolean' | 'int' | 'double' | 'string';
+      __type: 'boolean' | 'int' | 'long' | 'float' | 'double' | 'string';
       __value: boolean | number | string | null;
     };
 
@@ -33,7 +33,7 @@ export type BasicVarState = (
       __enumValues: string[];
     }
   | {
-      __type: 'boolean' | 'int' | 'double' | 'string';
+      __type: 'boolean' | 'int' | 'long' | 'float' | 'double' | 'string';
       __value: boolean | number | string | null;
       __newValue: boolean | number | string | null;
     }