Skip to content

Commit

Permalink
Merge pull request IEEEDTU#14 from HemabhKamboj/master
Browse files Browse the repository at this point in the history
corrected venue, made changes in electrocution
  • Loading branch information
t1war1 authored Feb 2, 2019
2 parents e1caf2c + 44c9424 commit 9e17a21
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 8 deletions.
6 changes: 3 additions & 3 deletions event/bw.html
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,9 @@ <h2>About Brainwave</h2>

<div class="mu-title-area">
<h2 class="mu-title">Details</h2>
<p>Brainwave’19 is divided into two parts:<br>
<p><br>
• A predefined hardware challenge.<br>
• Digital system design and Verilog based event. </p>

<p>You can find the Rule Books below :</p><br>

<a href="https://drive.google.com/open?id=10QQWPn69VM_KRsH44d8rIEpgTcjFAnbU" class="btn btn-default btn-lg">Problem Statement</a>
Expand All @@ -203,7 +203,7 @@ <h2 class="mu-title">Details</h2>
<h2 class="mu-title-area">Schedule</h2>
<br><br>
<h3 class="mu-title-area"> 8th February'19 </h3>
<h3 class="mu-title-area"> Venu : TW1GF1, TW1GF2 </h3>
<h3 class="mu-title-area"> Venue : TW1GF1, TW1GF2 </h3>
</div>
<!-- End Feature Content -->
</div>
Expand Down
13 changes: 11 additions & 2 deletions event/electrocution.html
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ <h2 class="fon" style="color:white; float: left;">Circuital Wizardry.</h2>
<div class="row">
<div class="col-md-6">
<div class="mu-about-left">
<img class="" src="../img/electrocution.jpg" alt="Sample Image">
<img class="" src="../img/electro1.jpg" alt="Sample Image">
</div>
</div>
<div class="col-md-6">
Expand Down Expand Up @@ -190,7 +190,16 @@ <h2>About ELECTROCUTION</h2>

<div class="mu-title-area">
<h2 class="mu-title">Details</h2>
<p> Two category analog simulation challenge and digital hardware simulation challenge with Verilog</p>
<p> "The concepts of Analog and Digital Circuit design are most important in your core placements and interns" <br>
~ Every other senior ever </p>

<p> This year at Invictus powered by Troika, IEEE DTU brings to you a challenging platform to test out your circuit design prowess in Electrocution.
The event will test you to the extremes in the art of circuit design and will provide you with a unique experience.<br>
Electrocution has two tracks: <br>
1) Analog Circuit Design Challenge <br>
2) Digital Circuit Design Challenge<br>

Think you have what it takes?</p>


<a href=" https://drive.google.com/open?id=1LXCqZ9QH_05ACvq5qKwvXlZTxO22Fwlv" target="_blank" class="btn btn-default btn-lg">Digital Design Problem Statement</a>
Expand Down
5 changes: 3 additions & 2 deletions event/lfr.html
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@ <h2>About LFR</h2>
<div class="mu-details-area">

<div class="mu-title-area">
<h2 class="mu-title">Details</h2>
<h2 class="mu-title">Details</h2>
<p>The Race of autonomous</p>
<br>

<a href="https://drive.google.com/file/d/1dD6cNoN80pkQ4I4hx4KgAcN3RB3Ch_Q6/view" class="btn btn-default btn-lg">Problem Statement</a>
Expand Down Expand Up @@ -207,7 +208,7 @@ <h2 class="mu-title">Details</h2>
<h2 class="mu-title-area">Schedule</h2>
<br><br>
<h3 class="mu-title-area"> 8th February'19 </h3>
<h3 class="mu-title-area"> Mini OAT </h3>
<h3 class="mu-title-area"> Venue : Mini OAT </h3>
</div>
<!-- End Feature Content -->
</div>
Expand Down
1 change: 1 addition & 0 deletions event/roborace.html
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ <h2>About RoboRace</h2>

<div class="mu-title-area">
<h2 class="mu-title">Details</h2>
<p>Race of mighty bots</p>
<a href="https://drive.google.com/open?id=1vUzMu88GgJUFvDamWHHOA6JQIX4UG7MN" class="btn btn-default btn-lg">Problem Statement</a>
<a href="https://docs.google.com/forms/d/e/1FAIpQLSdvGQtzw_G3hdeEAYWOjQ1CU-Dgr5jWNHjfAUQkqgqWV_vi_A/viewform?usp" class="btn btn-default btn-lg">Register</a>

Expand Down
2 changes: 1 addition & 1 deletion event/robowar.html
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ <h2 class="mu-title">Details</h2>
<p>Stage 2 : The final round will be a 3 hour on-site programming competition.</p>
<p>Team Size: Up to Two members</p> -->
<a href="https://drive.google.com/open?id=1kvUZB-hJZyETBj-ZEqwAuzExiBq7KFKU" class="btn btn-default btn-lg">Problem Statement</a>
<a href="https://drive.google.com/open?id=1AbqA0GDtuvuuSozgTFVsgSr5m2VKI6-rxrb-rxmIA3E" class="btn btn-default btn-lg">Register</a>
<a href="https://docs.google.com/forms/d/e/1FAIpQLSdtEPJ9wkAK1NuJrMx84hy4zHoQAhTyyOWaHCle77JoDvH4rQ/viewform" class="btn btn-default btn-lg">Register</a>


</div>
Expand Down
Binary file added img/electro1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9e17a21

Please sign in to comment.