Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Elatec.NET.Tests/ProtocolTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public async Task GetVersionStringAsync_SetsLegicFlagBasedOnVersion(string versi

private static string EncodeAsciiResponse(string value)
{
var bytes = System.Text.Encoding.ASCII.GetBytes(value);
var bytes = global::System.Text.Encoding.ASCII.GetBytes(value);
var response = new byte[bytes.Length + 2];
response[0] = 0x00; // ResponseError.None
response[1] = (byte)bytes.Length;
Expand All @@ -63,7 +63,7 @@ private static string EncodeAsciiResponse(string value)

private static string BytesToHex(byte[] bytes)
{
var hex = new System.Text.StringBuilder();
var hex = new global::System.Text.StringBuilder();
foreach (var value in bytes)
{
hex.Append(value.ToString("X2"));
Expand Down
3 changes: 2 additions & 1 deletion Elatec.NET.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using System.IO;
using Elatec.NET.Cards;
using Elatec.NET.Cards.Mifare;
using Elatec.NET.System;

/*
* Elatec.NET is a C# library to easily Talk to Elatec's TWN4 Devices
Expand Down Expand Up @@ -68,7 +69,7 @@ public static List<TWN4ReaderDevice> Instance
public TWN4ReaderDevice(string portName, Func<string, IReaderTransport> transportFactory = null)
{
PortName = portName;
_transportFactory = transportFactory ?? (name => new SerialPortTransport(name));
_transportFactory = transportFactory ?? new Func<string, IReaderTransport>(name => new SerialPortTransport(name));
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion Helpers/ByteArray.cs
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ private static byte HexToByte(string hex)
{
if (!(hex.Length > 2 || hex.Length <= 0))
{
newByte = byte.Parse(hex, System.Globalization.NumberStyles.HexNumber);
newByte = byte.Parse(hex, global::System.Globalization.NumberStyles.HexNumber);
}
}
catch
Expand Down
Loading