Added Mid Tanks to DB.

Started implementing Machine Designer.

1 files changed, 3 insertions, 8 deletions

diff --git a/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs b/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs
index 84103af39..5985eb393 100644
--- a/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs
+++ b/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs
@@ -35,8 +35,6 @@ namespace Tango.Synchronization.Remote
 
             LogManager.Log("Querying all local addresses...");
             var local_addresses = _localDB.ADDRESSES.ToList();
-            LogManager.Log("Querying all local cartridges...");
-            var local_cartridges = _localDB.CARTRIDGES.ToList();
             LogManager.Log("Querying all local configurations...");
             var local_configurations = _localDB.CONFIGURATIONS.ToList();
             LogManager.Log("Querying all local configuration dispensers...");
@@ -110,9 +108,9 @@ namespace Tango.Synchronization.Remote
             guids = remote_ids_packs.Select(x => x.DISPENSER_GUID).ToList();
             var remote_dispensers = _remoteDB.DISPENSERS.Where(x => guids.Contains(x.GUID)).ToList();
 
-            LogManager.Log("Querying all remote cartridges...");
-            guids = remote_ids_packs.Select(x => x.CARTRIDGE_GUID).ToList();
-            var remote_cartridges = _remoteDB.CARTRIDGES.Where(x => guids.Contains(x.GUID)).ToList();
+            LogManager.Log("Querying all remote cartridge types...");
+            guids = remote_ids_packs.Select(x => x.CARTRIDGE_TYPE_GUID).ToList();
+            var remote_cartridges_types = _remoteDB.CARTRIDGE_TYPES.Where(x => guids.Contains(x.GUID)).ToList();
 
             LogManager.Log("Querying all remote CATS...");
             guids = remote_machines.Select(x => x.GUID).ToList();
@@ -128,9 +126,6 @@ namespace Tango.Synchronization.Remote
             LogManager.Log("Comparing addresses");
             CompareCollections(remote_addresses, local_addresses, _remoteDB.ADDRESSES, _localDB.ADDRESSES);
 
-            LogManager.Log("Comparing cartridges");
-            CompareCollections(remote_cartridges, local_cartridges, _remoteDB.CARTRIDGES, _localDB.CARTRIDGES);
-
             LogManager.Log("Comparing configurations");
             CompareCollections(remote_configurations, local_configurations, _remoteDB.CONFIGURATIONS, _localDB.CONFIGURATIONS);