supleed2/ELEC50003-P1-CW
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC50003-P1-CW.git synced 2024-09-19 20:16:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed layout fomatting to use tables instead of 'float' property. Removed com port field so it works in my environment.

Browse source
This commit is contained in:
jc4419 2021-06-11 17:44:12 +04:00
parent 0dee19f28c
commit 385eac760f
2 changed files with 40 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
Control/data/index.html
View file

@ -14,8 +14,8 @@
.section_container { .section_container {
float: left; float: left;
width: 50%; width: 33%;
padding: 10px; padding: 0px;
} }
.flex-container { .flex-container {
@ -49,13 +49,13 @@
meter { meter {
width: 100%; width: 100%;
height: 40px; height: 40px;
transform: translateY(-8px); transform: translateY(8px);
} }
meter::after { meter::after {
content: attr(value) attr(title); content: attr(value) attr(title);
top: -28px; top: -28px;
left: 0px; left: 45%;
position: relative; position: relative;
} }
@ -241,15 +241,19 @@
<h1 style="text-align:center;">ROVER COMMAND CENTER</h1> <h1 style="text-align:center;">ROVER COMMAND CENTER</h1>
<div class="clearfix"> <div class="clearfix">
<table style="width:100%;">
<div class="section_container"> <tr>
<div class="movement_control"> <th><h2>Control Panel</h2></th>
<h2>Movement Control</h2> <th><h2>Telemetry</h2></th>
<div style="transform: translateY(0px);"> <th><h2>Command Line</h2></th>
</tr>
<tr>
<td>
<div style="transform: translateY(0px); text-align:center;">
<button id="up_arrow" onmousedown="up_mouseDown()" onmouseup="up_mouseUp()" <button id="up_arrow" onmousedown="up_mouseDown()" onmouseup="up_mouseUp()"
class="button"><span>&#8679;</span></button> class="button"><span>&#8679;</span></button>
</div> </div>
<div style="transform: translateY(13px);"> <div style="transform: translateY(13px); text-align:center;">
<button id="left_arrow" onmousedown="left_mouseDown()" onmouseup="left_mouseUp()" <button id="left_arrow" onmousedown="left_mouseDown()" onmouseup="left_mouseUp()"
class="button"><span>&#8678;</span></button> class="button"><span>&#8678;</span></button>
<button id="down_arrow" onmousedown="down_mouseDown()" onmouseup="down_mouseUp()" <button id="down_arrow" onmousedown="down_mouseDown()" onmouseup="down_mouseUp()"
@ -257,39 +261,22 @@
<button id="right_arrow" onmousedown="right_mouseDown()" onmouseup="right_mouseUp()" <button id="right_arrow" onmousedown="right_mouseDown()" onmouseup="right_mouseUp()"
class="button"><span>&#8680;</span></button> class="button"><span>&#8680;</span></button>
</div> </div>
</td>
</div> <td>
</div> <table style="width:100%;">
<tr>
<div class="section_container"> <td style="width:50%;"><label>Battery Voltage</label></td>
<div id="bleh" class="sensor_data"> <td style="width:50%;"><meter id="btry_meter" min="4.0" max="6.0" low="4.5" optimum="5.0" high="4.8" value="5.8"
<h2>Sensor Data</h2> title="V"></meter></td>
<ul> </tr>
<tr>
<li> <td style="width:50%;"><label>Odometer</label></td>
<div class="section_container"> <td><strong id="Odometer">28</strong><strong>mm</strong></td>
<label>Battery Voltage</label> </tr>
</div> </table>
<div class="section_container"> </td>
<meter id="btry_meter" min="4.0" max="6.0" low="4.5" optimum="5.0" high="4.8" value="5.8" </tr>
title="V"></meter> </table>
</div>
</li>
<li>
<div class="section_container">
<label>Odometer</label>
</div>
<div class="section_container">
<strong id="Odometer">28</strong><strong>mm</strong>
</div>
</li>
</ul>
</div>
</div>
</div> </div>

1
Control/platformio.ini
View file

@ -13,7 +13,6 @@ platform = espressif32
board = esp32dev board = esp32dev
framework = arduino framework = arduino
monitor_speed = 115200 monitor_speed = 115200
upload_port = COM[3]
monitor_filters = monitor_filters =
send_on_enter send_on_enter
esp32_exception_decoder esp32_exception_decoder