marva/sumorobot-web
1
0
Fork 1
Code Issues Pull Requests Activity

add battery indication

Browse Source
This commit is contained in:
Silver Kuusik
2018-08-18 18:48:27 +02:00
parent ec2e6f41ac
commit 2af99f108b
6 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/img/battery_disconnected.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
assets/img/battery_empty.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
assets/img/battery_full.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
assets/img/battery_half.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

12
assets/js/sumorobot.js
View File

@@ -31,8 +31,7 @@ Sumorobot.prototype.connect = function() {
// Setup connection watchdog interval // Setup connection watchdog interval
self.connectionTimer = setInterval(function() { self.connectionTimer = setInterval(function() {
if (self.watchdogCounter == 0 && !self.terminate) { if (self.watchdogCounter == 0 && !self.terminate) {
$('#battery').removeClass('connected'); $("#battery img").attr("src", "assets/img/battery_disconnected.png");
$('#battery').html('Disconnected');
} }
// Reset watchdog counter // Reset watchdog counter
self.watchdogCounter = 0; self.watchdogCounter = 0;
@@ -66,8 +65,13 @@ Sumorobot.prototype.connect = function() {
self.sensors = JSON.parse(data); self.sensors = JSON.parse(data);
// When sensor data received // When sensor data received
if (self.sensors['battery_voltage']) { if (self.sensors['battery_voltage']) {
$('#battery').html(self.sensors['battery_voltage'] + 'V'); if (self.sensors['battery_voltage'] > 4.0) {
$('#battery').addClass('connected'); $("#battery img").attr("src", "assets/img/battery_full.png");
} else if (self.sensors['battery_voltage'] > 3.1) {
$("#battery img").attr("src", "assets/img/battery_half.png");
} else {
$("#battery img").attr("src", "assets/img/battery_empty.png");
}
} }
// Count data received packets // Count data received packets
self.watchdogCounter += 1; self.watchdogCounter += 1;

12
index.html
View File

@@ -12,10 +12,13 @@
<!-- cookie notification --> <!-- cookie notification -->
<script src="assets/js/min/cookieconsent.min.js" type="text/javascript" charset="utf-8"></script> <script src="assets/js/min/cookieconsent.min.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/cookie.js" type="text/javascript" charset="utf-8"></script> <script src="assets/js/cookie.js" type="text/javascript" charset="utf-8"></script>
<!-- other --> <!-- jquery, popper, bootstrap -->
<script src="assets/js/min/jquery.min.js" type="text/javascript" charset="utf-8"></script> <script src="assets/js/min/jquery.min.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/min/popper.min.js" type="text/javascript" charset="utf-8"></script> <script src="assets/js/min/popper.min.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/min/bootstrap.min.js" type="text/javascript" charset="utf-8"></script> <script src="assets/js/min/bootstrap.min.js" type="text/javascript" charset="utf-8"></script>
<!-- ace editor -->
<script src="assets/js/ace/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/ace/ext-language_tools.js" type="text/javascript" charset="utf-8"></script>
<!-- Google Blockly --> <!-- Google Blockly -->
<script src="assets/blockly/blockly_compressed.js" type="text/javascript" charset="utf-8"></script> <script src="assets/blockly/blockly_compressed.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/blockly/blocks_compressed.js" type="text/javascript" charset="utf-8"></script> <script src="assets/blockly/blocks_compressed.js" type="text/javascript" charset="utf-8"></script>
@@ -23,15 +26,12 @@
<script src="assets/blockly/msg/js/en.js" type="text/javascript" charset="utf-8"></script> <script src="assets/blockly/msg/js/en.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/sumorobot.js" type="text/javascript" charset="utf-8"></script> <script src="assets/js/sumorobot.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/utils.js" type="text/javascript" charset="utf-8"></script> <script src="assets/js/utils.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/main.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/ace.js" type="text/javascript" charset="utf-8"></script> <script src="assets/js/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/blockly.js" type="text/javascript" charset="utf-8"></script> <script src="assets/js/blockly.js" type="text/javascript" charset="utf-8"></script>
<!-- ace editor --> <script src="assets/js/main.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/ace/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="assets/js/ace/ext-language_tools.js" type="text/javascript" charset="utf-8"></script>
</head> </head>
<body> <body>
<div id="battery">Disconnected</div> <div id="battery"><img src="assets/img/battery_disconnected.png"></div>
<div id="panel"> <div id="panel">
<img class="logo" src="assets/img/logo.png" alt="logo"> <img class="logo" src="assets/img/logo.png" alt="logo">