Corrections and adding TeltonikaParameter to CustomValueTypes

openremote · Dec 24, 2023 · 9f8bd8a · 9f8bd8a
1 parent 2ba164c
commit 9f8bd8a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/model/src/main/java/org/openremote/model/custom/CarAsset.java b/model/src/main/java/org/openremote/model/custom/CarAsset.java
@@ -15,11 +15,10 @@ public class CarAsset extends Asset<CarAsset> {
     public static final AttributeDescriptor<Date> LAST_CONTACT = new AttributeDescriptor<>("lastContact", ValueType.DATE_AND_TIME);
     public static final AttributeDescriptor<String> MAKE_AND_MODEL = new AttributeDescriptor<>("makeAndModel", ValueType.TEXT).withOptional(true);
     public static final AttributeDescriptor<Integer> MODEL_YEAR = new AttributeDescriptor<>("modelYear", ValueType.INTEGER).withOptional(true);
-    /**
-     * If Rich sees this, sorry for the American spelling!
-     */
     public static final AttributeDescriptor<ColourRGB> COLOR = new AttributeDescriptor<>("color", ValueType.COLOUR_RGB).withOptional(true);
     public static final AttributeDescriptor<String> LICENSE_PLATE = new AttributeDescriptor<>("licensePlate", ValueType.TEXT).withOptional(true);
+
+    // Figure out a way to use the colour parameter for the color of the car on the map
     public static final AssetDescriptor<CarAsset> DESCRIPTOR = new AssetDescriptor<>("car", null, CarAsset.class);
 
 

diff --git a/model/src/main/java/org/openremote/model/custom/CustomValueTypes.java b/model/src/main/java/org/openremote/model/custom/CustomValueTypes.java
@@ -1,7 +1,9 @@
 package org.openremote.model.custom;
 
+import org.openremote.model.teltonika.TeltonikaParameter;
 import org.openremote.model.value.ValueDescriptor;
 
 public class CustomValueTypes {
     public static final ValueDescriptor<AssetStateDuration> ASSET_STATE_DURATION = new ValueDescriptor<>("AssetStateDuration", AssetStateDuration.class);
+    public static final ValueDescriptor<TeltonikaParameter> TELTONIKA_PARAMETER = new ValueDescriptor<>("TeltonikaParameter", TeltonikaParameter.class);
 }