From e4e8be1d138a4723c24f53ed57f54c7daec54d5c Mon Sep 17 00:00:00 2001 From: Magnus Persson Date: Sat, 1 Jan 2022 13:53:07 +0100 Subject: [PATCH] Fixed compiler issues and bump to v0.4 --- bin/device.min.htm | 2 +- bin/version.json | 2 +- data/device.htm | 2 +- data/device.min.htm | 2 +- platformio.ini | 2 +- src/main.cpp | 2 +- src/pushtarget.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/device.min.htm b/bin/device.min.htm index 93d8388..fe90b77 100644 --- a/bin/device.min.htm +++ b/bin/device.min.htm @@ -1 +1 @@ -Beer Gravity Monitor
Current version:
Loading...
Host name:
Loading...
Device ID:
Loading...
(C) Copyright 2021 Magnus Persson
\ No newline at end of file +Beer Gravity Monitor
Current version:
Loading...
Host name:
Loading...
Device ID:
Loading...
(C) Copyright 2021 Magnus Persson
\ No newline at end of file diff --git a/bin/version.json b/bin/version.json index 249c5d5..d2dc3aa 100644 --- a/bin/version.json +++ b/bin/version.json @@ -1 +1 @@ -{ "project":"gravmon", "version":"0.3.8", "html": [ "index.min.htm", "device.min.htm", "config.min.htm", "about.min.htm" ] } \ No newline at end of file +{ "project":"gravmon", "version":"0.4.0", "html": [ "index.min.htm", "device.min.htm", "config.min.htm", "about.min.htm" ] } \ No newline at end of file diff --git a/data/device.htm b/data/device.htm index 0f6526d..39acf16 100644 --- a/data/device.htm +++ b/data/device.htm @@ -97,7 +97,7 @@ $('#spinner').show(); $.getJSON(url, function (cfg) { console.log( cfg ); - $("#app-ver").text(cfg["app-ver"] + " (html 0.3.5)"); + $("#app-ver").text(cfg["app-ver"] + " (html 0.4.0)"); $("#mdns").text(cfg["mdns"]); $("#id").text(cfg["id"]); }) diff --git a/data/device.min.htm b/data/device.min.htm index 93d8388..fe90b77 100644 --- a/data/device.min.htm +++ b/data/device.min.htm @@ -1 +1 @@ -Beer Gravity Monitor
Current version:
Loading...
Host name:
Loading...
Device ID:
Loading...
(C) Copyright 2021 Magnus Persson
\ No newline at end of file +Beer Gravity Monitor
Current version:
Loading...
Host name:
Loading...
Device ID:
Loading...
(C) Copyright 2021 Magnus Persson
\ No newline at end of file diff --git a/platformio.ini b/platformio.ini index c432585..2527a13 100644 --- a/platformio.ini +++ b/platformio.ini @@ -32,7 +32,7 @@ build_flags = #-O0 -Wl,-Map,output.map -D EMBED_HTML # If this is not used the html files needs to be on the file system (can be uploaded) -D USER_SSID=\""\"" # =\""myssid\"" -D USER_SSID_PWD=\""\"" # =\""mypwd\"" - -D CFG_APPVER="\"0.3.8\"" + -D CFG_APPVER="\"0.4.0\"" lib_deps = # https://github.com/jrowberg/i2cdevlib.git # Using local copy of this library https://github.com/codeplea/tinyexpr diff --git a/src/main.cpp b/src/main.cpp index 933b8c8..a4a9cfe 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -166,7 +166,7 @@ void setup() { void loop() { drd->loop(); - if( sleepModeActive || abs(millis() - loopMillis) > interval ) { + if( sleepModeActive || abs( (long) (millis() - loopMillis)) > interval ) { float angle = 0; float volt = myBatteryVoltage.getVoltage(); //float sensorTemp = 0; diff --git a/src/pushtarget.cpp b/src/pushtarget.cpp index 149c8c1..9dcc709 100644 --- a/src/pushtarget.cpp +++ b/src/pushtarget.cpp @@ -31,7 +31,7 @@ PushTarget myPushTarget; // Send the pressure value // void PushTarget::send(float angle, float gravity, float corrGravity, float temp, float runTime, bool force ) { - unsigned long timePassed = abs( millis() - ms ); + unsigned long timePassed = abs( (long) (millis() - ms) ); unsigned long interval = myConfig.getSleepInterval()*1000; if( ( timePassed < interval ) && !force) {