Skip to content

Commit cbc761d

Browse files
committed
Integration with Hop V2.X.X in progress. Action and Transform Read, Write and Events are working, Subscription is missing due to S7 driver problems. The resources for modification are added to the portal.
1 parent 239d61d commit cbc761d

File tree

44 files changed

+1620
-440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1620
-440
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ atlassian-ide-plugin.xml
3333
*.tar.gz
3434
*.rar
3535

36+
3637
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
3738
hs_err_pid*
3839

plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,6 +1617,9 @@ public enum BACnetVendorId {
16171617
METRONICAKP_SPJ((int) 1406, (int) 1406, (String) "Metronic AKP Sp. J."),
16181618
TECHKNAVE((int) 1407, (int) 1407, (String) "Techknave"),
16191619
ELSNER_ELEKTRONIK((int) 1408, (int) 1408, (String) "Elsner Elektronik"),
1620+
LEFOO_INDUSTRIAL_HANGZHOU_CO_LTD(
1621+
(int) 1409, (int) 1409, (String) "LEFOO Industrial (Hangzhou) Co., Ltd."),
1622+
CALIBRATION_TECHNOLOGIES_INC((int) 1410, (int) 1410, (String) "Calibration Technologies, Inc."),
16201623
UNKNOWN_VENDOR((int) 0xFFFF, (int) 0xFFFF, (String) "Unknown");
16211624
private static final Map<Integer, BACnetVendorId> map;
16221625

plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapoint.java

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2156,6 +2156,22 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap
21562156
// Simple Field (value)
21572157
Float value = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readFloat("", 16);
21582158

2159+
return new PlcREAL(value);
2160+
} else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Coefficient)) { // REAL
2161+
2162+
// Reserved Field (Compartmentalized so the "reserved" variable can't leak)
2163+
{
2164+
short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/
2165+
readBuffer.readUnsignedShort("", 8);
2166+
if (reserved != (short) 0x00) {
2167+
LOGGER.info(
2168+
"Expected constant value " + 0x00 + " but got " + reserved + " for reserved field.");
2169+
}
2170+
}
2171+
2172+
// Simple Field (value)
2173+
Float value = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readFloat("", 16);
2174+
21592175
return new PlcREAL(value);
21602176
} else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_TimeOfDay)) { // Struct
21612177

@@ -9457,6 +9473,15 @@ public static void staticSerialize(
94579473
float value = (float) _value.getFloat();
94589474
/*TODO: migrate me*/
94599475
/*TODO: migrate me*/ writeBuffer.writeFloat("", 16, (value));
9476+
} else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Coefficient)) { // REAL
9477+
// Reserved Field
9478+
/*TODO: migrate me*/
9479+
/*TODO: migrate me*/ writeBuffer.writeUnsignedShort(
9480+
"", 8, ((Number) (short) 0x00).shortValue());
9481+
// Simple Field (value)
9482+
float value = (float) _value.getFloat();
9483+
/*TODO: migrate me*/
9484+
/*TODO: migrate me*/ writeBuffer.writeFloat("", 16, (value));
94609485
} else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_TimeOfDay)) { // Struct
94619486
// Reserved Field
94629487
/*TODO: migrate me*/
@@ -14083,6 +14108,11 @@ public static int getLengthInBits(PlcValue _value, KnxDatapointType datapointTyp
1408314108
sizeInBits += 8;
1408414109
// Simple Field (value)
1408514110
sizeInBits += 16;
14111+
} else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Coefficient)) { // REAL
14112+
// Reserved Field
14113+
sizeInBits += 8;
14114+
// Simple Field (value)
14115+
sizeInBits += 16;
1408614116
} else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_TimeOfDay)) { // Struct
1408714117
// Reserved Field
1408814118
sizeInBits += 8;

0 commit comments

Comments
 (0)