3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-06-27 14:57:01 +02:00
Code Issues Projects Releases Packages Wiki Activity

system clock was too fast

Browse source 
included display builds into zip
removed 10s info from index.html
This commit is contained in:
lumapu 2022-12-08 21:08:58 +01:00
parent 1fb45191a1
commit a9e4429f9f
5 changed files with 49 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
scripts/getVersion.py
View file

@ -51,13 +51,26 @@ def readVersion(path, infile):
os.mkdir(path + "firmware/")
sha = os.getenv("SHA",default="sha")
versionout = version[:-1] + "_esp8266_" + sha + ".bin"
src = path + ".pio/build/esp8266-release/firmware.bin"
dst = path + "firmware/" + versionout
os.rename(src, dst)
gzip_bin(dst, dst + ".gz")
versionout = version[:-1] + "_esp8266_nokia5110_" + sha + ".bin"
src = path + ".pio/build/esp8266-nokia5110/firmware.bin"
dst = path + "firmware/" + versionout
os.rename(src, dst)
gzip_bin(dst, dst + ".gz")
versionout = version[:-1] + "_esp8266_ssd1306_" + sha + ".bin"
src = path + ".pio/build/esp8266-ssd1306/firmware.bin"
dst = path + "firmware/" + versionout
os.rename(src, dst)
gzip_bin(dst, dst + ".gz")
versionout = version[:-1] + "_esp8266_1m_" + sha + ".bin"
versionout = version[:-1] + "_esp8285_" + sha + ".bin"
src = path + ".pio/build/esp8285-release/firmware.bin"
dst = path + "firmware/" + versionout
os.rename(src, dst)
@ -69,6 +82,18 @@ def readVersion(path, infile):
os.rename(src, dst)
gzip_bin(dst, dst + ".gz")
versionout = version[:-1] + "_esp32_nokia5110_" + sha + ".bin"
src = path + ".pio/build/esp32-wroom32-nokia5110/firmware.bin"
dst = path + "firmware/" + versionout
os.rename(src, dst)
gzip_bin(dst, dst + ".gz")
versionout = version[:-1] + "_esp32_ssd1306_" + sha + ".bin"
src = path + ".pio/build/esp32-wroom32-ssd1306/firmware.bin"
dst = path + "firmware/" + versionout
os.rename(src, dst)
gzip_bin(dst, dst + ".gz")
# other ESP32 bin files
src = path + ".pio/build/esp32-wroom32-release/"
dst = path + "firmware/"

2
src/defines.h
View file

@ -13,7 +13,7 @@
//-------------------------------------
#define VERSION_MAJOR 0
#define VERSION_MINOR 5
#define VERSION_PATCH 49
#define VERSION_PATCH 50
//-------------------------------------
typedef struct {

2
src/publisher/pubMqtt.h
View file

@ -236,7 +236,7 @@ class PubMqtt {
publish("version", mVersion, true);
publish("device", mDevName, true);
publish("uptime", "0");
tickerMinute();
publish(mLwtTopic, mLwtOnline, true, false);
subscribe("ctrl/#");

5
src/utils/scheduler.h
View file

@ -42,6 +42,7 @@ namespace ah {
mUptime = 0;
mTimestamp = 0;
mPrevMillis = millis();
mDiffFraq = 0;
}
void loop(void) {
@ -53,7 +54,8 @@ namespace ah {
return;
}
mDiffSeconds = mDiff / 1000;
mPrevMillis += (mPrevMillis * 1000);
mDiffFraq = mDiff % 1000;
mPrevMillis += (mDiffSeconds * 1000) - mDiffFraq;
checkEvery();
checkAt();
mUptime += mDiffSeconds;
@ -132,6 +134,7 @@ namespace ah {
uint32_t mMillis, mPrevMillis, mDiff;
uint32_t mUptime;
uint8_t mDiffSeconds;
uint16_t mDiffFraq;
};
}

21
src/web/html/index.html
View file

@ -39,12 +39,11 @@
</div>
<p><span class="des">WiFi RSSI: </span><span id="wifi_rssi"></span> dBm</p>
<p>
<span class="des">Statistics: </span>
<span class="des">System Infos: </span>
<pre id="stat"></pre>
<pre id="iv"></pre>
<pre id="warn_info"></pre>
</p>
<p>Every <span id="refresh"></span> seconds the values are updated</p>
<div id="note">
Discuss with us on <a href="https://discord.gg/WzhxEY62mB">Discord</a><br/>
@ -79,6 +78,8 @@
</div>
<script type="text/javascript">
var exeOnce = true;
var tickCnt = 0;
var ts = 0;
function apiCb(obj) {
var e = document.getElementById("apiResult");
@ -107,6 +108,7 @@
}
document.getElementById("wifi_rssi").innerHTML = obj["wifi_rssi"];
ts = obj["ts_now"];
var date = new Date(obj["ts_now"] * 1000);
var up = obj["ts_uptime"];
var days = parseInt(up / 86400) % 365;
@ -188,6 +190,18 @@
document.getElementById("warn_info").innerHTML = html;
}
function tick() {
if(++tickCnt >= 10) {
tickCnt = 0;
getAjax('/api/index', parse);
}
else {
var dSpan = document.getElementById("date");
if(0 != ts)
dSpan.innerHTML = (new Date((ts+tickCnt) * 1000)).toLocaleString('de-DE');
}
}
function parse(obj) {
if(null != obj) {
if(exeOnce)
@ -196,9 +210,8 @@
parseStat(obj["statistics"]);
parseIv(obj["inverter"]);
parseWarnInfo(obj["warnings"], obj["infos"]);
document.getElementById("refresh").innerHTML = 10;
if(exeOnce) {
window.setInterval("getAjax('/api/index', parse)", 10000);
window.setInterval("tick()", 1000);
exeOnce = false;
}
}