Skip to content

Commit 7774b42

Browse files
EllerbachEllerbach
authored
Fix Card.nfproj project reference (#117)
1 parent 9825ddc commit 7774b42

File tree

9 files changed

+20
-19
lines changed

9 files changed

+20
-19
lines changed

Diff for: ‎devices/Card/Card.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Ndef", "Ndef\Ndef.nfproj",
1010
EndProject
1111
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Ultralight", "Ultralight\Ultralight.nfproj", "{DC2A68E1-21C5-4C4E-BA99-222F116EC4B2}"
1212
EndProject
13-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared Project", "Shared Project", "{1DB0B9F5-6A23-4E2A-9478-7106E8BFE212}"
13+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared Projects", "Shared Project", "{1DB0B9F5-6A23-4E2A-9478-7106E8BFE212}"
1414
EndProject
1515
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BinaryPrimitives", "..\..\src\BinaryPrimitives\BinaryPrimitives.shproj", "{3F28B003-6318-4E21-A9B6-6C0DBD0BDBFD}"
1616
EndProject

Diff for: ‎devices/Mfrc522/Mfrc522.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mfrc522", "Mfrc522.nfproj",
66
EndProject
77
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mifare", "..\Card\Mifare\Mifare.nfproj", "{D1F84C93-3A17-46FA-9761-CF4AAC3EF2D7}"
88
EndProject
9-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CardRfid", "..\Card\CardRfid.nfproj", "{7E99A789-283C-AFEF-CCEF-50A40E38813F}"
9+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CardRfid", "..\Card\Card.nfproj", "{7E99A789-283C-AFEF-CCEF-50A40E38813F}"
1010
EndProject
1111
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ultralight", "..\Card\Ultralight\Ultralight.nfproj", "{DC2A68E1-21C5-4C4E-BA99-222F116EC4B2}"
1212
EndProject

Diff for: ‎devices/Mfrc522/samples/Mfrc522.samples.nfproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<Compile Include="Properties\AssemblyInfo.cs" />
2323
</ItemGroup>
2424
<ItemGroup>
25-
<ProjectReference Include="..\..\Card\CardRfid.nfproj" />
25+
<ProjectReference Include="..\..\Card\Card.nfproj" />
2626
<ProjectReference Include="..\..\Card\Mifare\Mifare.nfproj" />
2727
<ProjectReference Include="..\..\Card\Ndef\Ndef.nfproj" />
2828
<ProjectReference Include="..\..\Card\Ultralight\Ultralight.nfproj" />

Diff for: ‎devices/Mfrc522/samples/Program.cs

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using Iot.Device.Mfrc522;
1414
using Iot.Device.Ndef;
1515
using Iot.Device.Rfid;
16-
using nanoFramework.Hardware.Esp32;
1716

1817
Debug.WriteLine("Hello MFRC522!");
1918

Diff for: ‎devices/Pn5180/Pn5180.cs

+13-11
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,9 @@ public bool WriteEeprom(EepromAddress address, SpanByte eeprom)
241241
try
242242
{
243243
SpiWrite(dumpEeprom);
244+
#if DEBUG
244245
_logger.LogDebug($"{nameof(WriteEeprom)}, {nameof(dumpEeprom)}: {BitConverter.ToString(dumpEeprom.ToArray())}");
246+
#endif
245247

246248
SpanByte irqStatus = new byte[4];
247249
ret = GetIrqStatus(irqStatus);
@@ -260,9 +262,9 @@ public bool WriteEeprom(EepromAddress address, SpanByte eeprom)
260262
return ret;
261263
}
262264

263-
#endregion
265+
#endregion
264266

265-
#region SEND and READ data from card
267+
#region SEND and READ data from card
266268

267269
/// <summary>
268270
/// Send data to a card.
@@ -713,9 +715,9 @@ private bool SendRBlock(byte targetNumber, RBlock ack, int blockNumber)
713715
return false;
714716
}
715717

716-
#endregion
718+
#endregion
717719

718-
#region Mifare specific
720+
#region Mifare specific
719721

720722
/// <summary>
721723
/// Specific function to authenticate Mifare cards
@@ -776,9 +778,9 @@ public bool MifareAuthenticate(SpanByte key, MifareCardCommand mifareCommand, by
776778
return response[0] == 0;
777779
}
778780

779-
#endregion
781+
#endregion
780782

781-
#region RadioFrequency
783+
#region RadioFrequency
782784

783785
/// <summary>
784786
/// Load a specific radio frequency configuration
@@ -1004,9 +1006,9 @@ private bool SetRadioFrequency(bool fieldOn)
10041006
return true;
10051007
}
10061008

1007-
#endregion
1009+
#endregion
10081010

1009-
#region Listen to cards
1011+
#region Listen to cards
10101012

10111013
/// <summary>
10121014
/// Listen to any 14443 Type A card
@@ -1535,9 +1537,9 @@ private bool GetIrqStatus(SpanByte irqStatus)
15351537
return true;
15361538
}
15371539

1538-
#endregion
1540+
#endregion
15391541

1540-
#region SPI primitives
1542+
#region SPI primitives
15411543

15421544
private void SpiWriteRegister(Command command, Register register, SpanByte data)
15431545
{
@@ -1656,6 +1658,6 @@ private void SpiRead(SpanByte toRead)
16561658
_gpioController.Write(_pinNss, PinValue.High);
16571659
}
16581660

1659-
#endregion
1661+
#endregion
16601662
}
16611663
}

Diff for: ‎devices/Pn5180/Pn5180.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pn5180", "Pn5180.nfproj", "
88
EndProject
99
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Card Projects", "Card Projects", "{7DE389DF-FE19-440A-A172-1D7B8D601303}"
1010
EndProject
11-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CardRfid", "..\Card\CardRfid.nfproj", "{7E99A789-283C-AFEF-CCEF-50A40E38813F}"
11+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CardRfid", "..\Card\Card.nfproj", "{7E99A789-283C-AFEF-CCEF-50A40E38813F}"
1212
EndProject
1313
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreditCardProcessing", "..\Card\CreditCard\CreditCardProcessing.nfproj", "{88B63840-FE53-4FC7-B687-88437D8269D9}"
1414
EndProject

Diff for: ‎devices/Pn5180/sample/Pn5180.sample.nfproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<None Include="packages.config" />
5858
</ItemGroup>
5959
<ItemGroup>
60-
<ProjectReference Include="..\..\Card\CardRfid.nfproj" />
60+
<ProjectReference Include="..\..\Card\Card.nfproj" />
6161
<ProjectReference Include="..\..\Card\Mifare\Mifare.nfproj" />
6262
<ProjectReference Include="..\..\Card\Ndef\Ndef.nfproj" />
6363
<ProjectReference Include="..\..\Card\Ultralight\Ultralight.nfproj" />

Diff for: ‎devices/Pn532/Pn532.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pn532", "Pn532.nfproj", "{4
88
EndProject
99
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Card Projects", "Card Projects", "{6F2CD363-FCFC-430C-806B-82DE583E5D61}"
1010
EndProject
11-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CardRfid", "..\Card\CardRfid.nfproj", "{7E99A789-283C-AFEF-CCEF-50A40E38813F}"
11+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CardRfid", "..\Card\Card.nfproj", "{7E99A789-283C-AFEF-CCEF-50A40E38813F}"
1212
EndProject
1313
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mifare", "..\Card\Mifare\Mifare.nfproj", "{D1F84C93-3A17-46FA-9761-CF4AAC3EF2D7}"
1414
EndProject

Diff for: ‎devices/Pn532/samples/Pn532.sample.nfproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<Compile Include="Properties\AssemblyInfo.cs" />
2424
</ItemGroup>
2525
<ItemGroup>
26-
<ProjectReference Include="..\..\Card\CardRfid.nfproj" />
26+
<ProjectReference Include="..\..\Card\Card.nfproj" />
2727
<ProjectReference Include="..\..\Card\Mifare\Mifare.nfproj" />
2828
<ProjectReference Include="..\..\Card\Ndef\Ndef.nfproj" />
2929
<ProjectReference Include="..\..\Card\Ultralight\Ultralight.nfproj" />

0 commit comments

Comments
 (0)