Skip to content

Commit

Permalink
version 1.1.12
Browse files Browse the repository at this point in the history
1.1.12
- rollback to version 1.1.9
  • Loading branch information
oepi-loepi committed Apr 6, 2021
1 parent 375ce13 commit cc34a48
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 14 deletions.
4 changes: 3 additions & 1 deletion Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
1.1.12
- rollback to version 1.1.9

1.1.11
- data in www mobile removed for mobile app
- flow in liters/hr corrected

1.1.10
- data in www mobile written for mobile app


1.1.9
- versioning corrected

Expand Down
12 changes: 0 additions & 12 deletions ToonWaterApp.qml
Original file line number Diff line number Diff line change
Expand Up @@ -283,16 +283,6 @@ App {
/////////////////////////////////////////Each time data was received /////////////////////////////////////////////////////////////////////////////////

function doEachtimeStuff(){
var this5minflow= waterflow * 60 //(flow per hour)
//push current 5 minutes into the array for the RRA flow
var http2 = new XMLHttpRequest()
var url2 = "http://localhost/hcb_rrd?action=setRrdData&loggerName=water_flow&rra=5min&samples=%7B%22" + parseInt(dateTimeNow.getTime()/1000)+ "%22%3A" + parseInt(this5minflow) + "%7D"
http2.open("GET", url2, true)
http2.send()

oldquantity = waterquantity

/*
var this5minquantity= 0
var this5minflow= this5minquantity *12 //(flow per hour)
if (oldquantity>0){
Expand All @@ -307,8 +297,6 @@ App {

oldquantity = waterquantity

*/

//push quantity into the 5yrhours RRA data
//produced this day so it must be in the RRA of next hour 00 mins
var nexthour = new Date();
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1.1.9
1.1.12

0 comments on commit cc34a48

Please sign in to comment.