Skip to content

Commit

Permalink
Minor formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@bmalinowsky
bmalinowsky committed Mar 4, 2024
1 parent bce75cb commit 629d2ad
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 61 deletions.
62 changes: 23 additions & 39 deletions src/io/calimero/dptxlator/DPTXlator2ByteFloat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,27 +63,25 @@ public class DPTXlator2ByteFloat extends DPTXlator
/**
* DPT ID 9.001, Temperature; values from <b>-273</b> to <b>670433.28</b> °C.
*/
public static final DPT DPT_TEMPERATURE =
new DPT("9.001", "Temperature", "-273", "670433.28", "°C");
public static final DPT DPT_TEMPERATURE = new DPT("9.001", "Temperature", "-273", "670433.28", "°C");

/**
* DPT ID 9.002, Temperature difference; value range <b>-671088.64</b> to <b>670433.28</b> K.
*/
public static final DPT DPT_TEMPERATURE_DIFFERENCE =
new DPT("9.002", "Temperature difference", "-671088.64", "670433.28", "K");
public static final DPT DPT_TEMPERATURE_DIFFERENCE = new DPT("9.002", "Temperature difference", "-671088.64",
"670433.28", "K");

/**
* DPT ID 9.003, Temperature gradient; value range <b>-671088.64</b> to <b>670433.28</b> K/h.
*/
public static final DPT DPT_TEMPERATURE_GRADIENT =
new DPT("9.003", "Temperature gradient", "-671088.64", "670433.28", "K/h");
public static final DPT DPT_TEMPERATURE_GRADIENT = new DPT("9.003", "Temperature gradient", "-671088.64",
"670433.28", "K/h");

/**
* DPT ID 9.004, Intensity of light (Lux); values from <b>0</b> to <b>670433.28</b> lx. Note, the
* unit of measure symbol used here is "lx", and not "Lux" as originally proposed for this DPT.
* DPT ID 9.004, Intensity of light (Lux); values from <b>0</b> to <b>670433.28</b> lx. Note, the unit of measure
* symbol used here is "lx", and not "Lux" as originally proposed for this DPT.
*/
public static final DPT DPT_INTENSITY_OF_LIGHT =
new DPT("9.004", "Light intensity", "0", "670433.28", "lx");
public static final DPT DPT_INTENSITY_OF_LIGHT = new DPT("9.004", "Light intensity", "0", "670433.28", "lx");

/**
* DPT ID 9.005, Wind speed; values from <b>0</b> to <b>670433.28</b> m/s.
Expand All @@ -93,8 +91,7 @@ public class DPTXlator2ByteFloat extends DPTXlator
/**
* DPT ID 9.006, Air pressure; values from <b>0</b> to <b>670433.28</b> Pa.
*/
public static final DPT DPT_AIR_PRESSURE = new DPT("9.006", "Air pressure", "0", "670433.28",
"Pa");
public static final DPT DPT_AIR_PRESSURE = new DPT("9.006", "Air pressure", "0", "670433.28", "Pa");

/**
* DPT ID 9.007, Humidity; values from <b>0</b> to <b>670433.28</b> %.
Expand All @@ -109,20 +106,17 @@ public class DPTXlator2ByteFloat extends DPTXlator
/**
* DPT ID 9.009, Air flow; value range <b>-671088.64</b> to <b>670433.28</b> m&sup3;/h; resolution 0.01 m&sup3;/h.
*/
public static final DPT DPT_AIR_FLOW = new DPT("9.009", "Air flow", "-671088.64", "670433.28",
"m³/h");
public static final DPT DPT_AIR_FLOW = new DPT("9.009", "Air flow", "-671088.64", "670433.28", "m³/h");

/**
* DPT ID 9.010, Time difference in seconds; value range <b>-671088.64</b> to <b>670433.28</b> s.
*/
public static final DPT DPT_TIME_DIFFERENCE1 =
new DPT("9.010", "Time difference 1", "-671088.64", "670433.28", "s");
public static final DPT DPT_TIME_DIFFERENCE1 = new DPT("9.010", "Time difference 1", "-671088.64", "670433.28", "s");

/**
* DPT ID 9.011, Time difference in milliseconds; value range <b>-671088.64</b> to <b>670433.28</b> ms.
*/
public static final DPT DPT_TIME_DIFFERENCE2 =
new DPT("9.011", "Time difference 2", "-671088.64", "670433.28", "ms");
public static final DPT DPT_TIME_DIFFERENCE2 = new DPT("9.011", "Time difference 2", "-671088.64", "670433.28", "ms");

/**
* DPT ID 9.020, Voltage; value range <b>-671088.64</b> to <b>670433.28</b> mV.
Expand All @@ -132,20 +126,17 @@ public class DPTXlator2ByteFloat extends DPTXlator
/**
* DPT ID 9.021, Electrical current; value range <b>-671088.64</b> to <b>670433.28</b> mA.
*/
public static final DPT DPT_ELECTRICAL_CURRENT =
new DPT("9.021", "Electrical current", "-671088.64", "670433.28", "mA");
public static final DPT DPT_ELECTRICAL_CURRENT = new DPT("9.021", "Electrical current", "-671088.64", "670433.28", "mA");

/**
* DPT ID 9.022, Power density; value range <b>-671088.64</b> to <b>670433.28</b> W/m<sup>2</sup>.
*/
public static final DPT DPT_POWERDENSITY =
new DPT("9.022", "Power density", "-671088.64", "670433.28", "W/m²");
public static final DPT DPT_POWERDENSITY = new DPT("9.022", "Power density", "-671088.64", "670433.28", "W/m²");

/**
* DPT ID 9.023, Kelvin/percent; value range <b>-671088.64</b> to <b>670433.28</b> K/%.
*/
public static final DPT DPT_KELVIN_PER_PERCENT =
new DPT("9.023", "Kelvin/percent", "-671088.64", "670433.28", "K/%");
public static final DPT DPT_KELVIN_PER_PERCENT = new DPT("9.023", "Kelvin/percent", "-671088.64", "670433.28", "K/%");

/**
* DPT ID 9.024, Power; value range <b>-671088.64</b> to <b>670433.28</b> kW.
Expand All @@ -155,29 +146,23 @@ public class DPTXlator2ByteFloat extends DPTXlator
/**
* DPT ID 9.025, Volume flow in liter/hour; value range <b>-671088.64</b> to <b>670433.28</b> l/h, resolution 0.01.
*/
public static final DPT DPT_VOLUME_FLOW = new DPT("9.025", "Volume flow", "-671088.64", "670433.28",
"l/h");
public static final DPT DPT_VOLUME_FLOW = new DPT("9.025", "Volume flow", "-671088.64", "670433.28", "l/h");

/**
* DPT ID 9.026, Rain amount in liters per square meter; values from <b>-671088.64</b> to
* <b>670433.28</b> l/m<sup>2</sup>, resolution 0.01.
* DPT ID 9.026, Rain amount in liters per square meter; values from <b>-671088.64</b> to <b>670433.28</b>
* l/m<sup>2</sup>, resolution 0.01.
*/
public static final DPT DPT_RAIN_AMOUNT = new DPT("9.026", "Rain amount", "-671088.64",
"670433.28", "l/m²");
public static final DPT DPT_RAIN_AMOUNT = new DPT("9.026", "Rain amount", "-671088.64", "670433.28", "l/m²");

/**
* DPT ID 9.027, Temperature in Degree Fahrenheit; values from <b>-459.6</b> to
* <b>670433.28</b> °F, resolution 0.01.
* DPT ID 9.027, Temperature in Degree Fahrenheit; values from <b>-459.6</b> to <b>670433.28</b> °F, resolution 0.01.
*/
public static final DPT DPT_TEMP_F = new DPT("9.027", "Temperature", "-459.6", "670433.28",
"°F");
public static final DPT DPT_TEMP_F = new DPT("9.027", "Temperature", "-459.6", "670433.28", "°F");

/**
* DPT ID 9.028, Wind speed in km/h; values from <b>0</b> to <b>670433.28</b> km/h, resolution
* 0.01.
* DPT ID 9.028, Wind speed in km/h; values from <b>0</b> to <b>670433.28</b> km/h, resolution 0.01.
*/
public static final DPT DPT_WIND_SPEED_KMH = new DPT("9.028", "Wind speed", "0", "670433.28",
"km/h");
public static final DPT DPT_WIND_SPEED_KMH = new DPT("9.028", "Wind speed", "0", "670433.28", "km/h");

/**
* DPT ID 9.029, absolute humidity in g/m³; values from <b>0</b> to <b>670760</b> g/m³, resolution 0.01.
Expand All @@ -190,7 +175,6 @@ public class DPTXlator2ByteFloat extends DPTXlator
public static final DPT DptConcentration = new DPT("9.030", "concentration", "0", "670760", "µg/m³");



private static final Map<String, DPT> types = loadDatapointTypes(DPTXlator2ByteFloat.class);

private final double min;
Expand Down
33 changes: 11 additions & 22 deletions src/io/calimero/dptxlator/DPTXlator2ByteUnsigned.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,50 +61,42 @@ public class DPTXlator2ByteUnsigned extends DPTXlator
/**
* DPT ID 7.001, Unsigned count; values from <b>0</b> to <b>65535</b> pulses.
*/
public static final DPT DPT_VALUE_2_UCOUNT =
new DPT("7.001", "Unsigned count", "0", "65535", "pulses");
public static final DPT DPT_VALUE_2_UCOUNT = new DPT("7.001", "Unsigned count", "0", "65535", "pulses");

/**
* DPT ID 7.002, Time period in ms; values from <b>0</b> to <b>65535</b> ms.
*/
public static final DPT DPT_TIMEPERIOD =
new DPT("7.002", "Time period in ms", "0", "65535", "ms");
public static final DPT DPT_TIMEPERIOD = new DPT("7.002", "Time period in ms", "0", "65535", "ms");

/**
* DPT ID 7.003, Time period (resolution 10 ms); values from <b>0</b> to <b>655350</b> ms.
*/
public static final DPT DPT_TIMEPERIOD_10 =
new DPT("7.003", "Time period (resolution 10 ms)", "0", "655350", "ms");
public static final DPT DPT_TIMEPERIOD_10 = new DPT("7.003", "Time period (resolution 10 ms)", "0", "655350", "ms");

/**
* DPT ID 7.004, Time period (resolution 100 ms); values from <b>0</b> to <b>6553500</b> ms.
*/
public static final DPT DPT_TIMEPERIOD_100 =
new DPT("7.004", "Time period (resolution 100 ms)", "0", "6553500", "ms");
public static final DPT DPT_TIMEPERIOD_100 = new DPT("7.004", "Time period (resolution 100 ms)", "0", "6553500", "ms");

/**
* DPT ID 7.005, Time period in seconds; values from <b>0</b> to <b>65535</b> s (~18,2 hours).
*/
public static final DPT DPT_TIMEPERIOD_SEC =
new DPT("7.005", "Time period in seconds", "0", "65535", "s");
public static final DPT DPT_TIMEPERIOD_SEC = new DPT("7.005", "Time period in seconds", "0", "65535", "s");

/**
* DPT ID 7.006, Time period in minutes; values from <b>0</b> to <b>65535</b> min (~45,5 days).
*/
public static final DPT DPT_TIMEPERIOD_MIN =
new DPT("7.006", "Time period in minutes", "0", "65535", "min");
public static final DPT DPT_TIMEPERIOD_MIN = new DPT("7.006", "Time period in minutes", "0", "65535", "min");

/**
* DPT ID 7.007, Time period in hours; values from <b>0</b> to <b>65535</b> h (~7,4 years).
*/
public static final DPT DPT_TIMEPERIOD_HOURS =
new DPT("7.007", "Time period in hours", "0", "65535", "h");
public static final DPT DPT_TIMEPERIOD_HOURS = new DPT("7.007", "Time period in hours", "0", "65535", "h");

/**
* DPT ID 7.010, Interface object property ID; values from <b>0</b> to <b>65535</b>.
*/
public static final DPT DPT_PROP_DATATYPE =
new DPT("7.010", "Interface object type", "0", "65535", "");
public static final DPT DPT_PROP_DATATYPE = new DPT("7.010", "Interface object type", "0", "65535", "");

/**
* DPT ID 7.011, Length in millimeters; values from <b>0</b> to <b>65535</b>, resolution 1.
Expand All @@ -114,17 +106,14 @@ public class DPTXlator2ByteUnsigned extends DPTXlator
/**
* DPT ID 7.012, Electrical current; values from <b>0</b> to <b>65535</b> mA.
* <p>
* A value of 0 indicates no bus power supply functionality available, 1 to 65535 is
* the current in mA.
* A value of 0 indicates no bus power supply functionality available, 1 to 65535 is the current in mA.
*/
public static final DPT DPT_ELECTRICAL_CURRENT =
new DPT("7.012", "Electrical current", "0", "65535", "mA");
public static final DPT DPT_ELECTRICAL_CURRENT = new DPT("7.012", "Electrical current", "0", "65535", "mA");

/**
* DPT ID 7.013, Brightness (Lux); values from <b>0</b> to <b>65535</b> lx.
* <p>
* Note: the unit of measure symbol used here is "lx", and not "Lux" as originally
* proposed for this DPT.
* Note: the unit of measure symbol used here is "lx", and not "Lux" as originally proposed for this DPT.
*/
public static final DPT DPT_BRIGHTNESS = new DPT("7.013", "Brightness", "0", "65535", "lx");

Expand Down

0 comments on commit 629d2ad

Please sign in to comment.