Skip to content

Commit

Permalink
Add GitHub social media link, center github links in About
Browse files Browse the repository at this point in the history
  • Loading branch information
@qhdwight
qhdwight committed Mar 5, 2024
1 parent 7917d0b commit 6ac2df0
Show file tree
Hide file tree
Showing 14 changed files with 1,330 additions and 755 deletions.
134 changes: 74 additions & 60 deletions docs/about/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,12 +388,12 @@





<a class="page-link" href="../donate/">Sponsor</a>





<a class="page-link" href="../contact/">Contact</a>


Expand Down Expand Up @@ -438,7 +438,9 @@ <h3>The Challenge</h3>
<li>Autonomous Navigation - Driving to GPS coordinates and searching for markers nearby.</li>
</ul>

CIRC is hosted by the Canadian Space Technology Advancement Group and takes place in Drumheller, Alberta. The competition consists of five events. Four are similar to the URC events and the fifth is a Search and Rescue task occuring at night.
CIRC is hosted by the Canadian Space Technology Advancement Group and takes place in Drumheller, Alberta. The
competition consists of five events. Four are similar to the URC events and the fifth is a Search and Rescue
task occuring at night.


</div>
Expand All @@ -453,46 +455,48 @@ <h3>Mechanical Team</h3>
<div class="subrow-3-left">
<!-- Subrow contains two elements. Prevents glitches that occur when two info-sections of different
heights are next to each other without a subrow -->
<div class="info-section">
<div class="info-block" style="background-image: url('ARM2022.jpg');"></div>
<div class="info-content">
<h4>Robotic Arm</h4>
The Robotic Arm subteam designs and builds a multiple degree-of-freedom robotic arm responsible for
completing tasks in the "Equipment Servicing" and "Extreme Retrieval and Delivery" portions of the
competition. The arm is able to lift objects, open drawers, push buttons, type on a keyboard, and accomplish
other precise movements.
<div class="info-section">
<div class="info-block" style="background-image: url('ARM2022.jpg');"></div>
<div class="info-content">
<h4>Robotic Arm</h4>
The Robotic Arm subteam designs and builds a multiple degree-of-freedom robotic arm responsible for
completing tasks in the "Equipment Servicing" and "Extreme Retrieval and Delivery" portions of the
competition. The arm is able to lift objects, open drawers, push buttons, type on a keyboard, and accomplish
other precise movements.
</div>
</div>
</div>

<div class="info-section">
<div class="info-block" style="background-image: url('ISH2022.jpg');"></div>
<div class="info-content">
<h4>Instruments and Sample Handling</h4>
The Instrumentation and Sample Handling subteam designs the mechanisms that are used to conduct various tests detecting
signs of life onboard the rover; additionally, the ISH sub-system sends information back to Astrobiology members to effectively
analyze rock compositions and types.
<div class="info-section">
<div class="info-block" style="background-image: url('ISH2022.jpg');"></div>
<div class="info-content">
<h4>Instruments and Sample Handling</h4>
The Instrumentation and Sample Handling subteam designs the mechanisms that are used to conduct various
tests detecting
signs of life onboard the rover; additionally, the ISH sub-system sends information back to Astrobiology
members to effectively
analyze rock compositions and types.

</div>
</div>
</div>
</div>
<div class="subrow-3-right">
<div class="info-section-full">
<div class="info-block" style="background-image: url('chassis2022.jpg');"></div>
<div class="subrow-3-right">
<div class="info-section-full">
<div class="info-block" style="background-image: url('chassis2022.jpg');"></div>
<div class="info-content">
<h4>Chassis and Mounts</h4>
The Chassis and Mounts subteam develops a lightweight and strong chassis that is
optimized for the integration of all our sub-systems. They also develop our gimbal
camera for operation, physical enclosures for electrical components and
The Chassis and Mounts subteam develops a lightweight and strong chassis that is
optimized for the integration of all our sub-systems. They also develop our gimbal
camera for operation, physical enclosures for electrical components and
wire management for a professional-looking rover.

</div>
</div>
</div>
</div>
</div>
</div>

<div class="section-divider">

</div>
<div class="row-container info-row-container">
<div class="wrap">
Expand All @@ -501,52 +505,61 @@ <h4>Chassis and Mounts</h4>
<div class="info-block" style="background-image: url('Mobility2022.jpg');"></div>
<div class="info-content">
<h4>Mobility</h4>
The Mobility subteam develops and builds the drive and suspension systems to
navigate through rocks and rough terrain in each competition mission. They work
to provide reliable driving and agile maneuvering, while also protecting sensitive
The Mobility subteam develops and builds the drive and suspension systems to
navigate through rocks and rough terrain in each competition mission. They work
to provide reliable driving and agile maneuvering, while also protecting sensitive
onboard equipment from impacts and vibration.
</div>
</div>

<div class="info-section">
<div class="info-block" style="background-image: url('sa-scoop.png');"></div>
<div class="info-content">
<h4>Sample Acquistion</h4>
The Sample Acquisition subteam focuses on developing and testing the mechanics of soil collection. Previously, that has included a combination of an auger drill to extract the soil and mechanised scoop to deliver soil to the ISH system.
The Sample Acquisition subteam focuses on developing and testing the mechanics of soil collection.
Previously, that has included a combination of an auger drill to extract the soil and mechanised scoop to
deliver soil to the ISH system.
</div>
</div>
</div>

</div>
</div>




<div class="section-divider">
<h3>Astrobiology</h3>
</div>
<br>
<p style="text-align:center;">
<img src="strips.jpg" width="200" style="vertical-align:middle">
</p>
<br>
<p style="text-align:center;">
<img src="strips.jpg" width="200" style="vertical-align:middle">
</p>

<div class="info-section">
<div class="wrap" style="max-width: 800px">
<div class="info-content">
<p>The Astrobiology branch is responsible for developing tests to analyze soil and rock samples for signs of past or present life. They research different indicators of life, identify possible tests for those indicators, and then work with the Instrumentation & Sample Handling subteam and others to make those tests work in real-time onboard the rover for URC. And the Astrobiology team conducts the tests themselves at CIRC (where onboard testing is not required).</p>
</div>
</div>
<p>The Astrobiology branch is responsible for developing tests to analyze soil and rock samples for signs of
past or present life. They research different indicators of life, identify possible tests for those
indicators, and then work with the Instrumentation & Sample Handling subteam and others to make those tests
work in real-time onboard the rover for URC. And the Astrobiology team conducts the tests themselves at CIRC
(where onboard testing is not required).</p>
</div>
<br>
</div>
</div>
<br>

<div class="section-divider">
<h3>Software Team</h3>
</div>
<div class="row-container info-row-container">
<h4 class="text-center">To see some of our code check out our github at <a
href="https://github.com/umrover">https://github.com/umrover</a></h4>
</div>
<div class="row-container info-row-container">
<div class="wrap">
<div class="subrow-4">
<h4>To see some of our code check out our github at <a href="https://github.com/umrover">https://github.com/umrover</a></h4>
<div class="info-section">
<div class="info-block" style="background-image: url('Auton2022.jpg');"></div>
<div class="info-content">
Expand All @@ -563,8 +576,8 @@ <h4>Autonomy</h4>
<div class="info-block" style="background-image: url('percep.gif');"></div>
<div class="info-content">
<h4>Perception</h4>
The Perception subteam develops code to process information about the environment
around the rover, gathered from a variety of onboard sensors and cameras.
The Perception subteam develops code to process information about the environment
around the rover, gathered from a variety of onboard sensors and cameras.
This subteam works closely with Autonomous Navigation, providing them with useful information,
which allows the rover to effectively traverse the course.
</div>
Expand All @@ -575,11 +588,11 @@ <h4>Perception</h4>
<div class="info-block" style="background-image: url('IK2022.gif');"></div>
<div class="info-content">
<h4>Teleoperation</h4>
The Teleoperation subteam creates the interface between driver and rover.
They maintain the GUIs used at the base station used to control the rover
and view system metrics, as well as develop control solutions for complex
systems (such as our robotic arm) to improve accuracy and usability.
Disjointly, the Teleoperation subteam maintains and improves general software
The Teleoperation subteam creates the interface between driver and rover.
They maintain the GUIs used at the base station used to control the rover
and view system metrics, as well as develop control solutions for complex
systems (such as our robotic arm) to improve accuracy and usability.
Disjointly, the Teleoperation subteam maintains and improves general software
infrastructure such as our custom build system.

</div>
Expand Down Expand Up @@ -608,10 +621,10 @@ <h3>Electrical Team</h3>
<div class="info-block" style="background-image: url('EBOX.jpg');"></div>
<div class="info-content">
<h4>Power</h4>
The Power subteam is in charge of providing power to the rover and managing the
electronics box. They develop custom solutions to distribute power to key systems
around the rover and partner with all mechanical subteams to design the best
power delivery system for their needs. This year they look forward to improving their custom battery design.
The Power subteam is in charge of providing power to the rover and managing the
electronics box. They develop custom solutions to distribute power to key systems
around the rover and partner with all mechanical subteams to design the best
power delivery system for their needs. This year they look forward to improving their custom battery design.
</div>
</div>

Expand Down Expand Up @@ -647,22 +660,23 @@ <h3>Business Team</h3>
<div class="wrap">
<div class="row-content text-content">
<p>
The business team organizes corporate sponsorships, grants and other fundraising
opportunities, such as Giving Blueday, for MRover. The business team is also
The business team organizes corporate sponsorships, grants and other fundraising
opportunities, such as Giving Blueday, for MRover. The business team is also
responsible for keeping the team website up to date and setting up recruitment and community outreach events.
Many members of the business team are also members of other subteams.
</p>
</div>
</div>


</div>
</div>

</div>
</div>
</div>

<footer class="site-footer">
<div class="social-media-wrapper" >

<a class="fa fa-github" target="_blank" href="https://github.com/umrover/mrover-ros"></a>
<a class="fa fa-twitter" target="_blank" href="https://twitter.com/umrover"></a>
<a class="fa fa-instagram" target="_blank" href="https://www.instagram.com/umrover/" style="margin-right: 3px" ></a>
<a class="fa fa-youtube-play" target="_blank" href="https://www.youtube.com/channel/UCGQuDeJxL2HAH8deR6OT7yA"></a>
Expand Down
5 changes: 3 additions & 2 deletions docs/contact/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,12 +388,12 @@





<a class="page-link" href="../donate/">Sponsor</a>





<a class="page-link" href="../contact/">Contact</a>


Expand Down Expand Up @@ -457,6 +457,7 @@ <h6>Treasurer</h6>
<footer class="site-footer">
<div class="social-media-wrapper" >

<a class="fa fa-github" target="_blank" href="https://github.com/umrover/mrover-ros"></a>
<a class="fa fa-twitter" target="_blank" href="https://twitter.com/umrover"></a>
<a class="fa fa-instagram" target="_blank" href="https://www.instagram.com/umrover/" style="margin-right: 3px" ></a>
<a class="fa fa-youtube-play" target="_blank" href="https://www.youtube.com/channel/UCGQuDeJxL2HAH8deR6OT7yA"></a>
Expand Down
Loading

0 comments on commit 6ac2df0

Please sign in to comment.