Merge pull request #262 from RoboCupULaval/dev

Merge old architecture in Master
RoboCupULaval · Mar 1, 2018 · 75f8fad · 75f8fad
2 parents 748eca8 + f09f009
commit 75f8fad
Show file tree

Hide file tree

Showing 231 changed files with 2,592 additions and 39,852 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,3 +70,6 @@ IMBoard
 filtered.txt
 unfiltered.txt
 *.csv
+
+# Config custom
+*.custom.cfg
diff --git a/RULEngine/Command/command.py b/RULEngine/Command/command.py
@@ -75,7 +75,7 @@ def __init__(self, player: OurPlayer):
         self.kick_speed = self.player.ai_command.kick_strength
 
     def package_command(self, mcu_communicator: McuCommunicator) -> None:
-        mcu_communicator.kick(self.player.id)
+        mcu_communicator.kick(self.player.id, self.kick_speed)
 
 
 class Stop(Command):
@@ -102,7 +102,8 @@ def __init__(self, player: OurPlayer, activate: bool=True):
         # todo ask embedded about dribbler strength MGL 2017/05/29
 
     def package_command(self, mcu_communicator: McuCommunicator) -> None:
-        if self.activate:
-            mcu_communicator.turnOnDribbler(self.player.id)
-        else:
-            mcu_communicator.turnOffDribbler(self.player.id)
+        print("in package command dribble")
+        #if self.activate:
+        mcu_communicator.turnOnDribbler(self.player.id)
+        # else:
+        #     mcu_communicator.turnOffDribbler(self.player.id)
diff --git a/RULEngine/Communication/protobuf/__init__.py b/RULEngine/Communication/protobuf/__init__.py
@@ -4,4 +4,3 @@
 folder = os.path.dirname(os.path.realpath(__file__))
 sys.path.insert(1, folder)
 
-from . import google
diff --git a/RULEngine/Communication/protobuf/google/__init__.py b/RULEngine/Communication/protobuf/google/__init__.py
diff --git a/RULEngine/Communication/protobuf/google/protobuf/compiler/__init__.py b/RULEngine/Communication/protobuf/google/protobuf/compiler/__init__.py
diff --git a/RULEngine/Communication/protobuf/google/protobuf/compiler/plugin_pb2.py b/RULEngine/Communication/protobuf/google/protobuf/compiler/plugin_pb2.py