diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..76e9f9a --- /dev/null +++ b/.vscode/c_cpp_properties.json @@ -0,0 +1,18 @@ +{ + "configurations": [ + { + "name": "Linux", + "includePath": [ + "${workspaceFolder}/**", + "~/miniforge3/envs/ros_env/include/**", + "/robotics/bcm2835-1.73/**" + ], + "defines": [], + "compilerPath": "/usr/bin/gcc", + "cStandard": "c17", + "cppStandard": "gnu++17", + "intelliSenseMode": "linux-gcc-arm64" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..b6cafdb --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,92 @@ +{ + "files.associations": { + "cctype": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "csignal": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "array": "cpp", + "atomic": "cpp", + "strstream": "cpp", + "bit": "cpp", + "*.tcc": "cpp", + "bitset": "cpp", + "cfenv": "cpp", + "chrono": "cpp", + "codecvt": "cpp", + "compare": "cpp", + "complex": "cpp", + "concepts": "cpp", + "condition_variable": "cpp", + "cstdint": "cpp", + "deque": "cpp", + "forward_list": "cpp", + "list": "cpp", + "map": "cpp", + "set": "cpp", + "string": "cpp", + "unordered_map": "cpp", + "unordered_set": "cpp", + "vector": "cpp", + "exception": "cpp", + "algorithm": "cpp", + "functional": "cpp", + "iterator": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "numeric": "cpp", + "optional": "cpp", + "random": "cpp", + "ratio": "cpp", + "string_view": "cpp", + "system_error": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "utility": "cpp", + "fstream": "cpp", + "future": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "numbers": "cpp", + "ostream": "cpp", + "semaphore": "cpp", + "shared_mutex": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "stop_token": "cpp", + "streambuf": "cpp", + "thread": "cpp", + "cinttypes": "cpp", + "typeindex": "cpp", + "typeinfo": "cpp", + "variant": "cpp" + }, + "ros.distro": "humble", + "python.autoComplete.extraPaths": [ + "/workspaces/DevEnv/repos/Robot2023/install/grr_test/lib/python3.10/site-packages", + "/workspaces/DevEnv/repos/Robot2023/install/grr_python_controllers/lib/python3.10/site-packages", + "/workspaces/DevEnv/repos/Robot2023/install/grr_bringup/lib/python3.10/site-packages", + "/opt/ros/humble/lib/python3.10/site-packages", + "/opt/ros/humble/local/lib/python3.10/dist-packages" + ], + "python.analysis.extraPaths": [ + "/workspaces/DevEnv/repos/Robot2023/install/grr_test/lib/python3.10/site-packages", + "/workspaces/DevEnv/repos/Robot2023/install/grr_python_controllers/lib/python3.10/site-packages", + "/workspaces/DevEnv/repos/Robot2023/install/grr_bringup/lib/python3.10/site-packages", + "/opt/ros/humble/lib/python3.10/site-packages", + "/opt/ros/humble/local/lib/python3.10/dist-packages" + ] +} \ No newline at end of file diff --git a/src/grr_description/bloodstone.urdf b/src/grr_description/bloodstone.urdf new file mode 100644 index 0000000..db85f52 --- /dev/null +++ b/src/grr_description/bloodstone.urdf @@ -0,0 +1,935 @@ +grr_hardware/IsaacDriveHardware3.03.0-11-11-11-11Gazebo/Blue \ No newline at end of file diff --git a/src/grr_guis/grr_guis/main_gui.py b/src/grr_guis/grr_guis/main_gui.py index 705b4cb..be37d33 100644 --- a/src/grr_guis/grr_guis/main_gui.py +++ b/src/grr_guis/grr_guis/main_gui.py @@ -61,7 +61,6 @@ def __init__(self) -> None: self.main_pane.addWidget(self.state_machine_button) self.main_pane.addWidget(self.start_button) - # self.main_pane.addWidget(self.videoWidget) horiz_layout.addLayout(self.main_pane) horiz_layout.addLayout(self.middle_pane) diff --git a/src/grr_hardware_python/grr_hardware_python/robot.py b/src/grr_hardware_python/grr_hardware_python/robot.py index 27be835..20a3e2e 100644 --- a/src/grr_hardware_python/grr_hardware_python/robot.py +++ b/src/grr_hardware_python/grr_hardware_python/robot.py @@ -82,7 +82,6 @@ def __init__(self) -> None: # self.left_tof = VL53L4CD(self.tca[3]) self.down_tof_pub = self.create_publisher(LaserScan, "/grr/down_tof", 10) self.left_tof_pub = self.create_publisher(LaserScan, "/grr/left_tof", 10) - # self.left_tof.start_ranging() self.line_follower = Line_Follower(self.i2c) diff --git a/src/grr_python_controllers/grr_python_controllers/state_machine.py b/src/grr_python_controllers/grr_python_controllers/state_machine.py index 9f83fce..8f0e196 100644 --- a/src/grr_python_controllers/grr_python_controllers/state_machine.py +++ b/src/grr_python_controllers/grr_python_controllers/state_machine.py @@ -28,12 +28,8 @@ def __init__(self): super().__init__('State_Machine') self.promo_display = False - self.relay = False def set_true(): self.promo_display=True - def relay_func_on():self.relay = True - def relay_func_off():self.relay = False - # self.action_tree = ServoAction(JointState(name=['small_package_sweeper_joint', 'bridge_latch_joint', 'mechansim_thruster_joint', 'mechanism_lift_joint'], position=[0.0, 100.0, 0.0, 100.0]), 1, name="starting positions") self.action_tree = ServoAction(JointState(name=['small_package_sweeper_joint', 'bridge_latch_joint', 'mechanism_package_joint', 'mechanism_thruster_joint', 'mechanism_lift_joint'], position=[0.0, 100.0, 50.0, 0.0, 100.0]), 1, name="starting positions")