Skip to content

Commit

Permalink
Merge pull request #24 from Pitt-RAS/general-fixes
Browse files Browse the repository at this point in the history
updated all sponsorship footings and added micah's workshop
  • Loading branch information
hedana49 authored Apr 1, 2024
2 parents 00fe816 + 37e01d8 commit ee5c206
Show file tree
Hide file tree
Showing 8 changed files with 200 additions and 13 deletions.
10 changes: 8 additions & 2 deletions aboutus.html
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,18 @@ <h3>Previous RAS Websites</h3>
<h4 style="text-align: center; margin-left:-1em" >Sponsored by</h4>
<div class="sponsor-centering">
<div id="sponsor-row-1" class="row" style=" height:auto; margin-top:-0.5em">
<div class="sponsor-layout width-setting-50">
<div class="sponsor-layout width-setting-25">
<img id="mobi" src="images/sponsors/sponsor-mobi-white-new.png" alt="" />
</div>
<div class="sponsor-layout width-setting-50">
<div class="sponsor-layout width-setting-25">
<img id="pnc" src="images/sponsors/sponsor-pnc-white-resized.png" alt="" />
</div>
<div class="sponsor-layout width-setting-25">
<img id="aerotech" src="images/sponsors/sponsor-aerotech-white.png" alt="" />
</div>
<div class="sponsor-layout width-setting-25">
<img id="roaringcreek" src="images/sponsors/sponsor-roaringcreek-white.png" alt="" />
</div>
</div>
<div id="sponsor-row-2" class="row" style=" height:auto;">
<div class="sponsor-layout width-setting-15" >
Expand Down
10 changes: 8 additions & 2 deletions contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,18 @@ <h3>Mailing List</h3>
<h4 style="text-align: center; margin-left:-1em" >Sponsored by</h4>
<div class="sponsor-centering">
<div id="sponsor-row-1" class="row" style=" height:auto; margin-top:-0.5em">
<div class="sponsor-layout width-setting-50">
<div class="sponsor-layout width-setting-25">
<img id="mobi" src="images/sponsors/sponsor-mobi-white-new.png" alt="" />
</div>
<div class="sponsor-layout width-setting-50">
<div class="sponsor-layout width-setting-25">
<img id="pnc" src="images/sponsors/sponsor-pnc-white-resized.png" alt="" />
</div>
<div class="sponsor-layout width-setting-25">
<img id="aerotech" src="images/sponsors/sponsor-aerotech-white.png" alt="" />
</div>
<div class="sponsor-layout width-setting-25">
<img id="roaringcreek" src="images/sponsors/sponsor-roaringcreek-white.png" alt="" />
</div>
</div>
<div id="sponsor-row-2" class="row" style=" height:auto;">
<div class="sponsor-layout width-setting-15" >
Expand Down
10 changes: 8 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -230,12 +230,18 @@ <h2>Interested in getting involved?</h2>
<h4 style="text-align: center; margin-left:-1em" >Sponsored by</h4>
<div class="sponsor-centering">
<div id="sponsor-row-1" class="row" style=" height:auto; margin-top:-0.5em">
<div class="sponsor-layout width-setting-50">
<div class="sponsor-layout width-setting-25">
<img id="mobi" src="images/sponsors/sponsor-mobi-white-new.png" alt="" />
</div>
<div class="sponsor-layout width-setting-50">
<div class="sponsor-layout width-setting-25">
<img id="pnc" src="images/sponsors/sponsor-pnc-white-resized.png" alt="" />
</div>
<div class="sponsor-layout width-setting-25">
<img id="aerotech" src="images/sponsors/sponsor-aerotech-white.png" alt="" />
</div>
<div class="sponsor-layout width-setting-25">
<img id="roaringcreek" src="images/sponsors/sponsor-roaringcreek-white.png" alt="" />
</div>
</div>
<div id="sponsor-row-2" class="row" style=" height:auto;">
<div class="sponsor-layout width-setting-15" >
Expand Down
10 changes: 8 additions & 2 deletions projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -217,12 +217,18 @@ <h4>Rover</h4>
<h4 style="text-align: center; margin-left:-1em" >Sponsored by</h4>
<div class="sponsor-centering">
<div id="sponsor-row-1" class="row" style=" height:auto; margin-top:-0.5em">
<div class="sponsor-layout width-setting-50">
<div class="sponsor-layout width-setting-25">
<img id="mobi" src="images/sponsors/sponsor-mobi-white-new.png" alt="" />
</div>
<div class="sponsor-layout width-setting-50">
<div class="sponsor-layout width-setting-25">
<img id="pnc" src="images/sponsors/sponsor-pnc-white-resized.png" alt="" />
</div>
<div class="sponsor-layout width-setting-25">
<img id="aerotech" src="images/sponsors/sponsor-aerotech-white.png" alt="" />
</div>
<div class="sponsor-layout width-setting-25">
<img id="roaringcreek" src="images/sponsors/sponsor-roaringcreek-white.png" alt="" />
</div>
</div>
<div id="sponsor-row-2" class="row" style=" height:auto;">
<div class="sponsor-layout width-setting-15" >
Expand Down
13 changes: 10 additions & 3 deletions workshops.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ <h5 style="margin-top:-1em"><a href="workshops/introros">Introduction to Motors<
<div>
<div class="workshops">
<img class="image fit" src="images/workshops/introros/ROS_cat2.png">
<h5 style="margin-top:-1em"><a href="workshops/introros">Introduction to Robot Operating System (ROS)</a></h5>
<h5 style="margin-top:-1em"><a href="workshops/introros">Introduction to Robot Operating System (ROS) [2020]</a></h5>
<h5 style="margin-top:-1em"><a href="workshops/introros2024.html">Introduction to Robot Operating System (ROS) [2024]</a></h5>
</div>
</div>
</div>
Expand All @@ -120,12 +121,18 @@ <h5 style="margin-top:-1em"><a href="workshops/introros">Introduction to Robot O
<h4 style="text-align: center; margin-left:-1em" >Sponsored by</h4>
<div class="sponsor-centering">
<div id="sponsor-row-1" class="row" style=" height:auto; margin-top:-0.5em">
<div class="sponsor-layout width-setting-50">
<div class="sponsor-layout width-setting-25">
<img id="mobi" src="images/sponsors/sponsor-mobi-white-new.png" alt="" />
</div>
<div class="sponsor-layout width-setting-50">
<div class="sponsor-layout width-setting-25">
<img id="pnc" src="images/sponsors/sponsor-pnc-white-resized.png" alt="" />
</div>
<div class="sponsor-layout width-setting-25">
<img id="aerotech" src="images/sponsors/sponsor-aerotech-white.png" alt="" />
</div>
<div class="sponsor-layout width-setting-25">
<img id="roaringcreek" src="images/sponsors/sponsor-roaringcreek-white.png" alt="" />
</div>
</div>
<div id="sponsor-row-2" class="row" style=" height:auto;">
<div class="sponsor-layout width-setting-15" >
Expand Down
4 changes: 2 additions & 2 deletions workshops/introros.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<html>
<head>
<title>Workshops - ROS | RAS@Pitt</title>
<title>Workshops - ROS (2020) | RAS@Pitt</title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
<link rel="stylesheet" href="../assets/css/main.css" />
Expand Down Expand Up @@ -55,7 +55,7 @@ <h1><a href="../">Home</a></h1>
<!-- Main -->
<article id="main">
<header>
<h2>Intro to ROS</h2>
<h2>Intro to ROS (2020)</h2>
<p>Presented by Andrew Saba</p>
</header>
<section class="wrapper style5">
Expand Down
156 changes: 156 additions & 0 deletions workshops/introros2024.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
<!DOCTYPE HTML>
<!--
Spectral by HTML5 UP
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->

<html>
<head>
<title>Workshops - ROS (2024) | RAS@Pitt</title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
<link rel="stylesheet" href="../assets/css/main.css" />
<link rel="icon" href="../images/favicon/favicon.png">
<noscript><link rel="stylesheet" href="../assets/css/noscript.css" /></noscript>

<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-J2ZF7B2FY9"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());

gtag('config', 'G-J2ZF7B2FY9');
</script>
</head>
<body class="is-preload">

<!-- Page Wrapper -->
<div id="page-wrapper">

<!-- Header -->
<header id="header">
<h1><a href="../">Home</a></h1>
<nav id="nav">
<ul>
<li class="special">
<a href="#menu" class="menuToggle"><span>Menu</span></a>
<div id="menu">
<ul>
<li><a href="../">Home</a></li>
<li><a href="../aboutus">About Us</a></li>
<li><a href="../projects">Projects</a></li>
<li><a href="../mprw">MIT-PITT-RW</a></li>
<li><a href="../workshops">Workshops</a></li>
<li><a href="../sponsors">Sponsors</a></li>
<li><a href="../contact">Contact</a></li>
</ul>
</div>
</li>
</ul>
</nav>
</header>

<!-- Main -->
<article id="main">
<header>
<h2>Intro to ROS (2024)</h2>
<p>Presented by Micah Nye</p>
</header>
<section class="wrapper style5">
<div class="inner" id="workshop-body">

<h2>Intro to ROS</h2>
<p>Robot operating system, or more commonly known as ROS, is a 100% open source set of software libraries and tools that assist with the creation of advanced
and sophisticated robot applications. With drivers to state-of-the-art algorithms,
it creates a standard for the robotics industry and helps users create applications rapidly. We use ROS and lots of our projects and it's
an amazing tool to have under your belt before going out to industry! </p>
<!-- picture of the topic with a photo of the presenter, see pages for example -->
<!-- <div style="width:100%">
<img class="image fit" src="../images/workshops/introros/workshop1header.png" />
</div> -->

<hr>

<h2>Workshop Recording</h2>

<div style="margin-left:auto; margin-right:auto">
<!-- make sure its an embedded youtube link. not just a normal link to a youtube video. its a special link. -->
<iframe id="workshop-recording" src="https://www.youtube.com/embed/QvtAN2ogOXI?si=cIZQAeA44hNKxW--" frameborder="0" allow="picture-in-picture" allowfullscreen></iframe>
</div>

<hr>


<h2>Workshop Presentation</h2>

<div style="margin-left:auto; margin-right:auto">
<iframe id="workshop-presentation" src="slides/intro_to_ros_2024.pdf" frameborder="0" allow="picture-in-picture" allowfullscreen></iframe>
</div>

<hr>

<h2>Feedback? Questions?</h2>
<p>Please reach out to us! We'd be happy to answer any questions you might have or receive your helpful feedback!
Visit our <a href="../contact">contact page</a> to reach us. Thanks for stopping by - we hope you learned something new!
</p>





</div>
</section>
</article>

<!-- Footer -->
<footer id="footer">
<h4 style="text-align: center; margin-left:-1em" >Sponsored by</h4>
<div class="sponsor-centering">
<div id="sponsor-row-1" class="row" style=" height:auto; margin-top:-0.5em">
<div class="sponsor-layout width-setting-50">
<img id="mobi" src="../images/sponsors/sponsor-mobi-white-new.png" alt="" />
</div>
<div class="sponsor-layout width-setting-50">
<img id="pnc" src="../images/sponsors/sponsor-pnc-white-resized.png" alt="" />
</div>
</div>
<div id="sponsor-row-2" class="row" style=" height:auto;">
<div class="sponsor-layout width-setting-15" >
<img id="rti" src="../images/sponsors/sponsor-rti-colored.png" alt="" />
</div>
<div class="sponsor-layout width-setting-15">
<img id="ibm" src="../images/sponsors/sponsor-ibm-white - Copy.png" alt="" />
</div>
<div class="sponsor-layout width-setting-70over3" >
<img id="rrai" src="../images/sponsors/sponsor-rrai-white-resized.png" alt="" />
</div>
<div class="sponsor-layout width-setting-70over3">
<img id="cadence" src="../images/sponsors/sponsor-cadence-logo-white.png" alt="" />
</div>
<div class="sponsor-layout width-setting-70over3">
<img id="pitt" src="../images/sponsors/sponsor-pitt-white.png" alt="" />
</div>
</div>
</div>
<!-- <br> -->
<br>
<ul class="copyright">
<li>&copy; Pitt Robotics and Automation Society</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>
</ul>
</footer>

</div>

<!-- Scripts -->
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/js/jquery.scrollex.min.js"></script>
<script src="../assets/js/jquery.scrolly.min.js"></script>
<script src="../assets/js/browser.min.js"></script>
<script src="../assets/js/breakpoints.min.js"></script>
<script src="../assets/js/util.js"></script>
<script src="../assets/js/main.js"></script>

</body>
</html>
Binary file added workshops/slides/intro_to_ros_2024.pdf
Binary file not shown.

0 comments on commit ee5c206

Please sign in to comment.