Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fill byte in apci for payloads over 6bit #51

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fill byte in apci for payloads over 6bit #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
873c068
Fill byte in apci for payloads over 6bit
Dec 12, 2018
96072e7
fixup! Fill byte in apci for payloads over 6bit
Dec 12, 2018
72b9341
fixup! Fill byte in apci for payloads over 6bit
Dec 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/KNXLib/KnxConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public void Action(string address, bool data)
if (val == null)
throw new InvalidKnxDataException(data.ToString());

Action(address, val);
Action(address, val, false);
}

/// <summary>
Expand Down Expand Up @@ -286,16 +286,25 @@ public void Action(string address, int data)
/// <param name="data">byte value</param>
public void Action(string address, byte data)
{
Action(address, new byte[] {0x00, data});
Action(address, new byte[] {data});
}

/// <summary>
/// Send a byte array value as data to specified address
/// </summary>
/// <param name="address">KNX Address</param>
/// <param name="data">Byte array value</param>
public void Action(string address, byte[] data)
/// <param name="addTruncateByte">adds extra byte to chop off for payload</param>
public void Action(string address, byte[] data, bool addTruncateByte = true)
{
if (addTruncateByte)
{
// reverse bytes temporary to add byte in front
Array.Reverse(data);
Array.Resize(ref data, data.Length + 1);
data[data.Length - 1] = 0x00;
Array.Reverse(data);
}
Logger.Debug(ClassName, "Sending 0x{0} to {1}.", BitConverter.ToString(data), address);

_lockManager.PerformLockedOperation(() => KnxSender.Action(address, data));
Expand Down
11 changes: 0 additions & 11 deletions src/KNXLib/KnxHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,22 +311,11 @@ public static void WriteData(byte[] datagram, byte[] data, int dataStart)
}
else if (data.Length > 1)
{
if (data[0] < 0x3F)
{
datagram[dataStart] = (byte)(datagram[dataStart] | data[0]);

for (var i = 1; i < data.Length; i++)
{
datagram[dataStart + i] = data[i];
}
}
else
{
for (var i = 0; i < data.Length; i++)
{
datagram[dataStart + 1 + i] = data[i];
}
}
}
}
#endregion
Expand Down