From 8f3953123d2d603998b0bff85cce42dd48829199 Mon Sep 17 00:00:00 2001
From: John Lee <john.lee@hardkernel.com>
Date: Mon, 23 Jan 2017 16:41:21 +0900
Subject: [PATCH] SmartPower2 v1.1
---
data/index.html | 10 +++++++---
src/smartpower2.ino | 4 ++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/data/index.html b/data/index.html
index 002468a..58116c8 100644
--- a/data/index.html
+++ b/data/index.html
@@ -29,6 +29,7 @@
var SAVE_SSID = 's';
var SAVE_IPADDR = 'i';
var SAVE_PASSWD = 'x';
+ var FW_VERSION = 'f';
var wsUriC = "ws://" + ipaddr + ":81";
var ws;
@@ -124,7 +125,10 @@
$("#btn_measure_watthour").val("start").slider("refresh");
}
break;
- }
+ case FW_VERSION:
+ $("#fwversion").html(data.substring(1));
+ break;
+ }
}
ws.onopen = function() {
@@ -157,10 +161,10 @@
<div class="ui-block-b">
</div>
<div class="ui-block-c">
- <label for="text-10" style="margin:15px 10px 0 0; text-align:right;">Build date</label>
+ <label for="text-10" style="margin:15px 10px 0 0; text-align:right;">F/W Version : </label>
</div>
<div class="ui-block-d">
- <input data-mini="true" disabled="disabled" id="text-10" value="161206" type="text">
+ <div style="margin:15px 0 0 10px;" id="fwversion"></div>
</div>
</div>
</div>
diff --git a/src/smartpower2.ino b/src/smartpower2.ino
index d4283c7..4012ae1 100644
--- a/src/smartpower2.ino
+++ b/src/smartpower2.ino
@@ -39,6 +39,9 @@ WiFiClient logClient;
#define PAGE_STATE 'p'
#define DATA_PVI 'd'
#define MEASUREWATTHOUR 'm'
+#define FW_VERSION 'f'
+
+#define FWversion 1.1
uint8_t onoff = OFF;
unsigned char measureWh;
@@ -694,6 +697,7 @@ void sendStatus(uint8_t num, uint8_t page)
webSocket.sendTXT(num, String(CMD_ONOFF) + onoff);
webSocket.sendTXT(num, String(SET_VOLTAGE) + setVoltage);
webSocket.sendTXT(num, String(MEASUREWATTHOUR) + measureWh);
+ webSocket.sendTXT(num, String(FW_VERSION) + FWversion);
} else if (page) {
webSocket.sendTXT(num, String(SET_AUTORUN) + autorun);
webSocket.sendTXT(num, String(SAVE_NETWORKS) + String(ssid) + "," +
--
GitLab