Merge pull request #9 from robocup-logistics/tviehmann/protobuf-submo…

…dule add protobuf submodule
robocup-logistics · Feb 16, 2023 · 283f8bb · 283f8bb
2 parents 99c7143 + 3a4fbd6
commit 283f8bb
Show file tree

Hide file tree

Showing 71 changed files with 6,013 additions and 2,467 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Simulator/protobuff/rcll-protobuf-msgs"]
+	path = Simulator/protobuff/rcll-protobuf-msgs
+	url = https://github.com/robocup-logistics/rcll-protobuf-msgs.git
diff --git a/Simulator/RobotEssentials/PBMessageFactoryBase.cs b/Simulator/RobotEssentials/PBMessageFactoryBase.cs
@@ -2,7 +2,6 @@
 using System.Net;
 using System.Collections.Generic;
 using Google.Protobuf;
-using Llsfmsgs;
 using LlsfMsgs;
 using MachineStates;
 using Simulator.Utility;

diff --git a/Simulator/RobotEssentials/PBMessageFactoryRobot.cs b/Simulator/RobotEssentials/PBMessageFactoryRobot.cs
@@ -4,7 +4,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using Google.Protobuf;
-using Llsfmsgs;
 using LlsfMsgs;
 using Simulator.Utility;
 using Timer = System.Threading.Timer;

diff --git a/Simulator/TerminalGui/MapGuiView.cs b/Simulator/TerminalGui/MapGuiView.cs
@@ -527,7 +527,7 @@ private ColorScheme GetBaseColorScheme(BaseElement bottom)
             }
             switch (bottom.GetBaseColor())
             {
-                case BaseColor.BaseUncolored:
+                case BaseColor.BaseClear:
                     return Config.ProductColorSchemeBase0;
                 case BaseColor.BaseRed:
                     return Config.ProductColorSchemeBase1;

diff --git a/Simulator/Utility/Products.cs b/Simulator/Utility/Products.cs
@@ -68,7 +68,7 @@ public Products(BaseColor color)
                 case BaseColor.BaseSilver:
                     ID = WorkpieceSilverRangeStart;
                     break;
-                case BaseColor.BaseUncolored:
+                case BaseColor.BaseClear:
                     ID = WorkpieceColorlessRangeStart;
                     break;
             }
@@ -119,7 +119,7 @@ public BaseElement(BaseColor color)
         }
         public BaseElement()
         {
-            BaseColor = BaseColor.BaseUncolored;
+            BaseColor = BaseColor.BaseClear;
         }
         public BaseColor GetBaseColor()
         {

diff --git a/Simulator/Utility/Timer.cs b/Simulator/Utility/Timer.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 using Simulator.RobotEssentials;
-using Llsfmsgs;
+using LlsfMsgs;
 
 namespace Simulator.Utility
 {