diff --git a/README.md b/README.md index 4b902f8..8fdd384 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ This software can be used with iSpindle hardware and utilizes the same hardware configuration. No code has been reused from the iSpindle project. -The documenation is now moved to https://mp-se.github.io/gravitymon/functionallity.html +The documenation is now moved to https://mp-se.github.io/gravitymon/index.html diff --git a/bin/about.min.htm b/bin/about.min.htm index 6403562..d590edd 100644 --- a/bin/about.min.htm +++ b/bin/about.min.htm @@ -1 +1 @@ -Beer Gravity Monitor

Beer Gravity Monitor

This is a piece of software for the iSpindle hardware and will work in a similar way. No part of this software is copied from the iSpindle project.

MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

(C) Copyright 2021 Magnus Persson
\ No newline at end of file +Beer Gravity Monitor

Beer Gravity Monitor

This is a piece of software for the iSpindle hardware and will work in a similar way. No part of this software is copied from the iSpindle project.

MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file diff --git a/bin/calibration.min.htm b/bin/calibration.min.htm new file mode 100644 index 0000000..094932b --- /dev/null +++ b/bin/calibration.min.htm @@ -0,0 +1,52 @@ +Beer Gravity Monitor

Here you can create your gravity formula by entering angles/tilt and the corresponding gravity (SG). These values will be saved for future use. Angles with 0 (zero) will be skipped. The values below will be used to check the formula and if the deviation is more than 1.5 SG then the forumla will be rejected. On the bottom of the page you can see a graph over the entered values + values calcualated by the formula.


(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file diff --git a/bin/config.min.htm b/bin/config.min.htm index b0c839c..f7bd12c 100644 --- a/bin/config.min.htm +++ b/bin/config.min.htm @@ -1 +1 @@ -Beer Gravity Monitor

Temperature Format:




(C) Copyright 2021 Magnus Persson
\ No newline at end of file +Beer Gravity Monitor

Temperature Format:




(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file diff --git a/bin/device.min.htm b/bin/device.min.htm index fe90b77..cef397a 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-22 Magnus Persson
\ No newline at end of file diff --git a/bin/firmware-debug.bin b/bin/firmware-debug.bin deleted file mode 100644 index 0f6f8fb..0000000 Binary files a/bin/firmware-debug.bin and /dev/null differ diff --git a/bin/firmware-perf.bin b/bin/firmware-perf.bin deleted file mode 100644 index 003f2b9..0000000 Binary files a/bin/firmware-perf.bin and /dev/null differ diff --git a/bin/firmware.bin b/bin/firmware.bin index ac7f0d5..a5771cc 100644 Binary files a/bin/firmware.bin and b/bin/firmware.bin differ diff --git a/bin/index.min.htm b/bin/index.min.htm index 144df21..1822cec 100644 --- a/bin/index.min.htm +++ b/bin/index.min.htm @@ -1 +1 @@ -Beer Gravity Monitor

Gravity:
Loading...
Temperature:
Loading...
Angle/Tilt:
Loading...
Battery:
Loading...

(C) Copyright 2021 Magnus Persson
\ No newline at end of file +Beer Gravity Monitor

Gravity:
Loading...
Temperature:
Loading...
Angle/Tilt:
Loading...
Battery:
Loading...

(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file diff --git a/bin/version.json b/bin/version.json index d2dc3aa..9e26c23 100644 --- a/bin/version.json +++ b/bin/version.json @@ -1 +1 @@ -{ "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 +{ "project":"gravmon", "version":"0.4.10", "html": [ "index.min.htm", "device.min.htm", "config.min.htm", "calibration.min.htm", "about.min.htm" ] } \ No newline at end of file diff --git a/docs/_sources/configuration.rst.txt b/docs/_sources/configuration.rst.txt index 0fb403c..7207371 100644 --- a/docs/_sources/configuration.rst.txt +++ b/docs/_sources/configuration.rst.txt @@ -174,11 +174,13 @@ Hardware Settings http://192.168.1.1/firmware/gravmon/ - Contents version.json + Contents version.json. The version is used by the device to check if the this version is newer. The html files will also be downloaded if the are present on the server. This way it's easy to + upgrade to a version that serve the html files from the file system. If they dont exist nothing will happen, the OTA flashing will still work. If the html files are missing from the file system + they can be uploaded manually afterwards. :: - { "project":"gravmon", "version":"0.5.0" } + { "project":"gravmon", "version":"0.4.10", "html": [ "index.min.htm", "device.min.htm", "config.min.htm", "calibration.min.htm", "about.min.htm" ] } Create formula diff --git a/docs/configuration.html b/docs/configuration.html index 2c1ec70..c2809fa 100644 --- a/docs/configuration.html +++ b/docs/configuration.html @@ -272,10 +272,12 @@ code the update will be done during startup.

http://192.168.1.1/firmware/gravmon/
 
 
-Contents version.json
+Contents version.json. The version is used by the device to check if the this version is newer. The html files will also be downloaded if the are present on the server. This way it's easy to
+upgrade to a version that serve the html files from the file system. If they dont exist nothing will happen, the OTA flashing will still work. If the html files are missing from the file system
+they can be uploaded manually afterwards.
 
-
{ "project":"gravmon", "version":"0.5.0" }
+
{ "project":"gravmon", "version":"0.4.10",  "html": [ "index.min.htm", "device.min.htm", "config.min.htm", "calibration.min.htm", "about.min.htm" ] }
 
diff --git a/docs/searchindex.js b/docs/searchindex.js index 2df45d4..de8f6d3 100644 --- a/docs/searchindex.js +++ b/docs/searchindex.js @@ -1 +1 @@ -Search.setIndex({docnames:["backlog","compiling","configuration","contributing","functionallity","index","installation","releases"],envversion:{"sphinx.domains.c":2,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":4,"sphinx.domains.index":1,"sphinx.domains.javascript":2,"sphinx.domains.math":2,"sphinx.domains.python":3,"sphinx.domains.rst":2,"sphinx.domains.std":2,sphinx:56},filenames:["backlog.rst","compiling.rst","configuration.rst","contributing.rst","functionallity.rst","index.rst","installation.rst","releases.rst"],objects:{},objnames:{},objtypes:{},terms:{"0":[2,7],"000":2,"00000000232820948":2,"00000204052596":2,"000134722124":2,"0004":2,"00130346":2,"0017978":2,"0050":2,"04":2,"053":2,"062":2,"0x1000":6,"1":[2,6],"10":2,"1031":2,"105":2,"1052":2,"115200":2,"1170":2,"12":2,"15v":2,"168":[2,6],"18":2,"192":[2,6],"2":[2,4],"20":2,"20c":2,"22":2,"2249":2,"230":2,"2e6753":2,"3":[1,2,6],"30":2,"32":2,"330":2,"34":2,"3600":2,"3d":1,"4":[2,5,6,7],"40":4,"45":2,"5":[2,5],"50":[2,4],"54":2,"56":2,"58":2,"59":2,"6":[2,5],"60":2,"60second":4,"67":2,"80":2,"8086":2,"85":2,"86":2,"89":2,"90":2,"900":2,"9090":2,"93":2,"9436":2,"96":2,"99":2,"case":4,"class":1,"default":[2,4,6],"do":[4,5],"function":[1,2,4,5],"long":[2,4],"new":[1,5],For:[2,5],If:[1,2,4,6],In:[1,4,6],Is:2,It:[1,2,5],Not:6,One:2,THe:1,The:[2,6],There:[1,4,5,7],These:2,Will:2,a1:2,a2:2,a3:2,a4:2,a5:2,access:[2,6],accur:4,accuraci:4,acheiv:5,action:0,activ:[2,4],activate_ota:1,ad:2,add:4,addit:[2,4],adjust:[2,4,5],adress:[2,6],against:2,all:[4,6],almost:4,also:[2,4,5,6],alwai:[1,4],an:[2,4,6],angl:[2,4],ani:[1,2,5,7],anoth:4,ap:6,api:[4,5],app:2,appli:2,approach:[5,6],ar:[1,2,5,6],arduino:5,arduinocurvefit:5,arduinojson:5,ardurino:1,area:4,assum:2,auth:2,automat:[0,1,4,5,6],avoid:4,ax:2,ay:2,az:2,back:4,backlog:5,balanc:4,base:[2,4,5],basic:[5,6],batteri:[2,4],bblanchon:5,becaus:5,becom:6,been:[2,5],beer:[4,5],befor:2,behav:4,between:[2,4],big:4,bin:[1,2,6],binari:[1,5,6],breakdown:5,brew:5,brewfath:4,browser:6,bucket:2,build:[0,1,4,5,6],button:[2,5],c:[1,2],cal:2,calcual:2,calcul:[2,4,5],calibr:2,call:6,can:[2,4,5,6],cannot:2,caus:5,celciu:4,celsiu:2,cfg_appver:1,cfg_disable_log:1,chang:[2,4,5],chapter:2,charg:2,charger:2,check:[0,1,4],checkbox:2,chip:5,choos:2,code:[2,4,5,6],codeplea:5,collect:[2,4],com4:6,com:[1,5,6,7],combin:5,come:5,command:[2,6],commit:[0,1],commun:5,compat:2,compil:[4,5,6],complet:5,condit:2,config:[1,5],configu:2,configur:[4,5],connect:[2,6],consol:2,construct:3,consum:4,consumpt:4,contain:[1,5],content:[1,2],contribut:[0,5],control:5,cool:4,corr:2,correct:[2,4,5],could:4,cover:5,cpp:1,crash:1,creat:[4,5,6],creator:5,css:5,current:[2,4,6],dash:2,data:[1,4,5,6],databas:6,de:5,debug:[1,6],deep:1,defin:[2,4],defint:1,degre:2,descript:1,design:5,destin:4,detail:6,detect:[4,5],develop:[1,6,7],devic:[1,4,5,6],differ:6,differnt:4,difficult:5,directori:6,disabl:[1,2],doc:[1,6],document:[1,6],doe:1,don:2,done:[1,2,5],dont:[5,6],down:4,ds18b20:[1,4,5],dure:2,earli:5,easier:[2,6],ee1bfc:2,either:2,embed:6,embed_html:1,empti:2,en:6,enabl:[1,4,6],endpoint:[2,4,5],ensur:[4,6],enter:[2,4,5,6],equal:2,error:5,esp32:6,esp8266:[2,5,6],esp:2,esp_doubleresetdetector:5,espressif:6,esptool:5,even:[2,5],exampl:2,excess:1,execut:[4,6],exist:[2,6],experiment:[1,5],explain:2,extend:4,extens:2,extern:1,f:2,factor:2,fals:2,fantast:5,farenheight:2,farenheigt:4,faster:5,faulti:[2,4],featur:5,ferment:5,few:[4,5],field:2,file:[1,2,5,6],filesystem:1,find:[4,5,6],fine:4,firmar:5,firmwar:[2,5,6],flash:[1,6],flat:2,folder:1,follow:[1,2,4,5,6],forget:2,format:[4,5],formula:[4,5],found:[1,5,6],from:[0,1,2,4,5],functional:[1,5],g1:2,g2:2,g3:2,g4:2,g5:2,g:2,getbootstrap:5,git:[1,5],github:[0,1,4,5,7],give:2,go:[2,4],goe:1,good:4,graph:[2,4,5],graphitemast:5,graphj:5,graviti:[1,4,5],gravity_unit:2,gravitymon:[2,7],gravmon:[2,6],gx:2,gy:2,gyro:[1,2,4,5],gyro_disable_log:1,gz:2,ha:[2,4],had:5,handl:5,hardwar:5,have:[4,5,6],here:[2,4,5,6],high:2,horizont:2,host:2,how:[2,4],howev:4,html:[1,2,5,6],http:[1,2,4,5,6,7],i2cdevlib:5,i:[1,4,5],id:2,identifi:2,imag:1,img:1,incbin:5,includ:[1,5],independ:4,index:5,influx:6,influxdb2:[2,4],influxdb:2,inform:[4,5],input:1,instal:[2,5],instead:[1,4,5],instruct:0,interact:[4,5],interfac:2,interv:[2,4],ip:2,ispindel:[2,5],ispindl:[4,5],issu:5,its:[5,6],jrowberg:5,json:[2,5],just:4,kei:2,khoih:5,know:4,larg:6,last:5,latest:[6,7],level:5,lib:1,librari:[1,4,5],life:4,like:[4,5],list:1,littl:5,local:[2,4,5],locat:2,log:[1,2,5],loglevel:5,lot:4,low:[2,5],mai:1,main:1,main_disable_log:1,make:[4,6],manag:1,mani:[4,5],maximum:1,md:1,mdn:2,measur:[1,2,4,5],might:4,milesburton:5,millisecond:4,minifi:1,minimis:1,minut:2,mode:[1,2,4,5],model:1,modul:5,monitor:[2,4,5],month:5,more:[4,5],move:[4,6],movement:4,mp:[5,7],mqtt:0,ms:2,much:[5,6],multipl:[4,5],must:2,my:[4,5],name:2,natur:5,need:[4,6],neg:2,net:2,network:2,never:[1,2],newer:2,nice:[2,4],normal:6,number:2,off:2,offici:5,old:5,onc:[2,4],one:[4,5],onewir:5,onli:[4,6],open:[5,6],oper:[2,4,5],optimis:5,option:[2,4,5,6],order:[1,2,6],org:2,organis:2,orient:2,origin:5,origni:4,ota:[0,1,2,4,5],other:[5,6],out:2,over:[0,2,5],overview:2,page:[1,2,5,6],parser:5,part:[2,4],password:[1,6],path:1,paulstoffregen:5,payload:2,pc:0,perf:[1,6],perform:[1,4,5,6],performac:4,place:2,platformio:1,plato:[0,2,4],pleas:[4,5],plugin:1,point:[2,6],port:6,possibl:6,power:4,pre:[0,1],prefer:6,preliminari:5,press:[2,5],problem:5,probli:4,proccess:5,process:1,prog:5,program:5,progress:5,project:[2,5,6],publis:7,publish:1,push2:2,push:[4,5],push_disable_log:1,pushtarget:1,py:6,qualiti:4,quit:[4,5],qwerti:2,rais:4,raw:2,read:[2,4,5],readm:1,recommend:[2,6],reduc:[2,4],regard:2,regular:4,releas:[1,5,6],render:5,replac:5,repo:4,repositori:[1,5],request:[2,4],requir:[2,4],reset:5,respons:5,rest:[4,5],retriv:2,rotario:5,rssi:2,run:[1,2,4],runtim:2,safeguard:2,same:4,save:[2,4],script:[1,4],se:[5,7],search:5,second:[2,4],section:[2,3,4,5],see:[2,4,5,6],send:[2,4,5],sensor:[4,5],sent:5,sequenc:2,serial:[2,5],serv:1,server:2,servic:5,set:[5,6],sg:[2,4],shoot:1,should:[2,4],show:[2,4,5],simul:[2,4],sinc:1,skip_sleepmod:1,sleep:[1,2,4],small:4,so:[2,4,5,6],softwar:[4,5,6],sofwar:4,some:[4,5],sourc:5,speed:2,src:1,src_doc:1,ssid:[1,6],stabl:7,stage:5,standard:[1,2,6],start:[4,5],startup:2,step:[2,4],stl:1,store:6,stream:2,structur:5,studio:1,style:1,submit:6,support:[0,2,4,5],sync:6,system:[1,6],t:2,tabl:2,tag:7,take:[4,5],target:[4,5],telemetri:2,temp:[2,4],tempcorr:2,temperatur:[1,2,4,5],templat:5,tempsensor:1,test:[1,4,5],than:[2,5],thei:1,them:4,theori:4,thi:[1,2,3,4,5,6],thijs:5,though:5,ticket:5,tile:4,tilt:[2,4],time:[2,4,6],tinyexpr:5,token:2,too:2,tool:[4,5],topic:5,trail:2,trigger:4,troubl:1,tsen_disable_log:1,twice:5,two:[2,4,5],tzapu:5,ubuntu:1,ui:[4,5],uncheck:2,under:[1,3],uniqu:2,unit:2,unless:2,up:[2,4],updat:[0,2,4],url:2,us:[0,1,2,4,5,6],use_gyro_temp:1,use_littlef:1,user_ssid:1,user_ssid_pwd:1,v0:[5,7],v1:2,valid:[0,1,4],valu:[2,4],variou:[1,5],ve:4,ver:2,verbos:1,version:[1,2,6,7],via:[0,2,4,6],view:4,visit:5,visual:1,voltag:2,vscode:1,wa:5,wai:4,wake:4,want:[4,5,6],we:[2,4],web:[2,5,6],web_disable_log:1,webserv:[1,4,5],well:2,what:5,when:[1,2,4,5,6],where:2,wifi:5,wifimanag:5,window:1,wirless:6,without:[2,5],work:[1,2,4,5,6],would:[4,5],write:[0,2],write_flash:6,wsl2:1,www:[1,5],yaml:1,year:5,yet:[1,2,4,7],you:[2,4,5,6],zero:2},titles:["Backlog of changes","Compiling the software","Configuration","Contributing","Functionallity","Welcome to GravityMon\u2019s documentation!","Installation","Releases"],titleterms:{The:[4,5],api:2,backlog:0,brewfath:2,chang:0,code:[0,1],compil:1,config:2,configur:[2,6],content:5,contribut:3,creat:2,credit:5,data:2,db:2,defin:1,devic:2,differ:[4,5],directori:1,document:[0,5],esptool:6,experiment:4,featur:4,format:[1,2],formula:2,functional:4,get:2,graviti:2,gravitymon:5,hardwar:2,index:2,indic:5,influx:2,instal:6,ispindl:2,main:[2,4,5],offici:6,option:1,other:4,post:2,push:2,releas:7,rest:2,s:5,set:2,softwar:1,sourc:1,statu:2,structur:1,tabl:5,target:1,tool:1,v2:2,welcom:5,wifi:6}}) \ No newline at end of file +Search.setIndex({docnames:["backlog","compiling","configuration","contributing","functionallity","index","installation","releases"],envversion:{"sphinx.domains.c":2,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":4,"sphinx.domains.index":1,"sphinx.domains.javascript":2,"sphinx.domains.math":2,"sphinx.domains.python":3,"sphinx.domains.rst":2,"sphinx.domains.std":2,sphinx:56},filenames:["backlog.rst","compiling.rst","configuration.rst","contributing.rst","functionallity.rst","index.rst","installation.rst","releases.rst"],objects:{},objnames:{},objtypes:{},terms:{"0":[2,7],"000":2,"00000000232820948":2,"00000204052596":2,"000134722124":2,"0004":2,"00130346":2,"0017978":2,"0050":2,"04":2,"053":2,"062":2,"0x1000":6,"1":[2,6],"10":2,"1031":2,"105":2,"1052":2,"115200":2,"1170":2,"12":2,"15v":2,"168":[2,6],"18":2,"192":[2,6],"2":[2,4],"20":2,"20c":2,"22":2,"2249":2,"230":2,"2e6753":2,"3":[1,2,6],"30":2,"32":2,"330":2,"34":2,"3600":2,"3d":1,"4":[2,5,6,7],"40":4,"45":2,"5":[2,5],"50":[2,4],"54":2,"56":2,"58":2,"59":2,"6":[2,5],"60":2,"60second":4,"67":2,"80":2,"8086":2,"85":2,"86":2,"89":2,"90":2,"900":2,"9090":2,"93":2,"9436":2,"96":2,"99":2,"case":4,"class":1,"default":[2,4,6],"do":[4,5],"function":[1,2,4,5],"long":[2,4],"new":[1,5],For:[2,5],If:[1,2,4,6],In:[1,4,6],Is:2,It:[1,2,5],Not:6,One:2,THe:1,The:[2,6],There:[1,4,5,7],These:2,Will:2,a1:2,a2:2,a3:2,a4:2,a5:2,about:2,access:[2,6],accur:4,accuraci:4,acheiv:5,action:0,activ:[2,4],activate_ota:1,ad:2,add:4,addit:[2,4],adjust:[2,4,5],adress:[2,6],afterward:2,against:2,all:[4,6],almost:4,also:[2,4,5,6],alwai:[1,4],an:[2,4,6],angl:[2,4],ani:[1,2,5,7],anoth:4,ap:6,api:[4,5],app:2,appli:2,approach:[5,6],ar:[1,2,5,6],arduino:5,arduinocurvefit:5,arduinojson:5,ardurino:1,area:4,assum:2,auth:2,automat:[0,1,4,5,6],avoid:4,ax:2,ay:2,az:2,back:4,backlog:5,balanc:4,base:[2,4,5],basic:[5,6],batteri:[2,4],bblanchon:5,becaus:5,becom:6,been:[2,5],beer:[4,5],befor:2,behav:4,between:[2,4],big:4,bin:[1,2,6],binari:[1,5,6],breakdown:5,brew:5,brewfath:4,browser:6,bucket:2,build:[0,1,4,5,6],button:[2,5],c:[1,2],cal:2,calcual:2,calcul:[2,4,5],calibr:2,call:6,can:[2,4,5,6],cannot:2,caus:5,celciu:4,celsiu:2,cfg_appver:1,cfg_disable_log:1,chang:[2,4,5],chapter:2,charg:2,charger:2,check:[0,1,2,4],checkbox:2,chip:5,choos:2,code:[2,4,5,6],codeplea:5,collect:[2,4],com4:6,com:[1,5,6,7],combin:5,come:5,command:[2,6],commit:[0,1],commun:5,compat:2,compil:[4,5,6],complet:5,condit:2,config:[1,5],configu:2,configur:[4,5],connect:[2,6],consol:2,construct:3,consum:4,consumpt:4,contain:[1,5],content:[1,2],contribut:[0,5],control:5,cool:4,corr:2,correct:[2,4,5],could:4,cover:5,cpp:1,crash:1,creat:[4,5,6],creator:5,css:5,current:[2,4,6],dash:2,data:[1,4,5,6],databas:6,de:5,debug:[1,6],deep:1,defin:[2,4],defint:1,degre:2,descript:1,design:5,destin:4,detail:6,detect:[4,5],develop:[1,6,7],devic:[1,4,5,6],differ:6,differnt:4,difficult:5,directori:6,disabl:[1,2],doc:[1,6],document:[1,6],doe:1,don:2,done:[1,2,5],dont:[2,5,6],down:4,download:2,ds18b20:[1,4,5],dure:2,earli:5,easi:2,easier:[2,6],ee1bfc:2,either:2,embed:6,embed_html:1,empti:2,en:6,enabl:[1,4,6],endpoint:[2,4,5],ensur:[4,6],enter:[2,4,5,6],equal:2,error:5,esp32:6,esp8266:[2,5,6],esp:2,esp_doubleresetdetector:5,espressif:6,esptool:5,even:[2,5],exampl:2,excess:1,execut:[4,6],exist:[2,6],experiment:[1,5],explain:2,extend:4,extens:2,extern:1,f:2,factor:2,fals:2,fantast:5,farenheight:2,farenheigt:4,faster:5,faulti:[2,4],featur:5,ferment:5,few:[4,5],field:2,file:[1,2,5,6],filesystem:1,find:[4,5,6],fine:4,firmar:5,firmwar:[2,5,6],flash:[1,2,6],flat:2,folder:1,follow:[1,2,4,5,6],forget:2,format:[4,5],formula:[4,5],found:[1,5,6],from:[0,1,2,4,5],functional:[1,5],g1:2,g2:2,g3:2,g4:2,g5:2,g:2,getbootstrap:5,git:[1,5],github:[0,1,4,5,7],give:2,go:[2,4],goe:1,good:4,graph:[2,4,5],graphitemast:5,graphj:5,graviti:[1,4,5],gravity_unit:2,gravitymon:[2,7],gravmon:[2,6],gx:2,gy:2,gyro:[1,2,4,5],gyro_disable_log:1,gz:2,ha:[2,4],had:5,handl:5,happen:2,hardwar:5,have:[4,5,6],here:[2,4,5,6],high:2,horizont:2,host:2,how:[2,4],howev:4,htm:2,html:[1,2,5,6],http:[1,2,4,5,6,7],i2cdevlib:5,i:[1,4,5],id:2,identifi:2,imag:1,img:1,incbin:5,includ:[1,5],independ:4,index:5,influx:6,influxdb2:[2,4],influxdb:2,inform:[4,5],input:1,instal:[2,5],instead:[1,4,5],instruct:0,interact:[4,5],interfac:2,interv:[2,4],ip:2,ispindel:[2,5],ispindl:[4,5],issu:5,its:[5,6],jrowberg:5,json:[2,5],just:4,kei:2,khoih:5,know:4,larg:6,last:5,latest:[6,7],level:5,lib:1,librari:[1,4,5],life:4,like:[4,5],list:1,littl:5,local:[2,4,5],locat:2,log:[1,2,5],loglevel:5,lot:4,low:[2,5],mai:1,main:1,main_disable_log:1,make:[4,6],manag:1,mani:[4,5],manual:2,maximum:1,md:1,mdn:2,measur:[1,2,4,5],might:4,milesburton:5,millisecond:4,min:2,minifi:1,minimis:1,minut:2,miss:2,mode:[1,2,4,5],model:1,modul:5,monitor:[2,4,5],month:5,more:[4,5],move:[4,6],movement:4,mp:[5,7],mqtt:0,ms:2,much:[5,6],multipl:[4,5],must:2,my:[4,5],name:2,natur:5,need:[4,6],neg:2,net:2,network:2,never:[1,2],newer:2,nice:[2,4],normal:6,noth:2,number:2,off:2,offici:5,old:5,onc:[2,4],one:[4,5],onewir:5,onli:[4,6],open:[5,6],oper:[2,4,5],optimis:5,option:[2,4,5,6],order:[1,2,6],org:2,organis:2,orient:2,origin:5,origni:4,ota:[0,1,2,4,5],other:[5,6],out:2,over:[0,2,5],overview:2,page:[1,2,5,6],parser:5,part:[2,4],password:[1,6],path:1,paulstoffregen:5,payload:2,pc:0,perf:[1,6],perform:[1,4,5,6],performac:4,place:2,platformio:1,plato:[0,2,4],pleas:[4,5],plugin:1,point:[2,6],port:6,possibl:6,power:4,pre:[0,1],prefer:6,preliminari:5,present:2,press:[2,5],problem:5,probli:4,proccess:5,process:1,prog:5,program:5,progress:5,project:[2,5,6],publis:7,publish:1,push2:2,push:[4,5],push_disable_log:1,pushtarget:1,py:6,qualiti:4,quit:[4,5],qwerti:2,rais:4,raw:2,read:[2,4,5],readm:1,recommend:[2,6],reduc:[2,4],regard:2,regular:4,releas:[1,5,6],render:5,replac:5,repo:4,repositori:[1,5],request:[2,4],requir:[2,4],reset:5,respons:5,rest:[4,5],retriv:2,rotario:5,rssi:2,run:[1,2,4],runtim:2,s:2,safeguard:2,same:4,save:[2,4],script:[1,4],se:[5,7],search:5,second:[2,4],section:[2,3,4,5],see:[2,4,5,6],send:[2,4,5],sensor:[4,5],sent:5,sequenc:2,serial:[2,5],serv:[1,2],server:2,servic:5,set:[5,6],sg:[2,4],shoot:1,should:[2,4],show:[2,4,5],simul:[2,4],sinc:1,skip_sleepmod:1,sleep:[1,2,4],small:4,so:[2,4,5,6],softwar:[4,5,6],sofwar:4,some:[4,5],sourc:5,speed:2,src:1,src_doc:1,ssid:[1,6],stabl:7,stage:5,standard:[1,2,6],start:[4,5],startup:2,step:[2,4],still:2,stl:1,store:6,stream:2,structur:5,studio:1,style:1,submit:6,support:[0,2,4,5],sync:6,system:[1,2,6],t:2,tabl:2,tag:7,take:[4,5],target:[4,5],telemetri:2,temp:[2,4],tempcorr:2,temperatur:[1,2,4,5],templat:5,tempsensor:1,test:[1,4,5],than:[2,5],thei:[1,2],them:4,theori:4,thi:[1,2,3,4,5,6],thijs:5,though:5,ticket:5,tile:4,tilt:[2,4],time:[2,4,6],tinyexpr:5,token:2,too:2,tool:[4,5],topic:5,trail:2,trigger:4,troubl:1,tsen_disable_log:1,twice:5,two:[2,4,5],tzapu:5,ubuntu:1,ui:[4,5],uncheck:2,under:[1,3],uniqu:2,unit:2,unless:2,up:[2,4],updat:[0,2,4],upgrad:2,upload:2,url:2,us:[0,1,2,4,5,6],use_gyro_temp:1,use_littlef:1,user_ssid:1,user_ssid_pwd:1,v0:[5,7],v1:2,valid:[0,1,4],valu:[2,4],variou:[1,5],ve:4,ver:2,verbos:1,version:[1,2,6,7],via:[0,2,4,6],view:4,visit:5,visual:1,voltag:2,vscode:1,wa:5,wai:[2,4],wake:4,want:[4,5,6],we:[2,4],web:[2,5,6],web_disable_log:1,webserv:[1,4,5],well:2,what:5,when:[1,2,4,5,6],where:2,wifi:5,wifimanag:5,window:1,wirless:6,without:[2,5],work:[1,2,4,5,6],would:[4,5],write:[0,2],write_flash:6,wsl2:1,www:[1,5],yaml:1,year:5,yet:[1,2,4,7],you:[2,4,5,6],zero:2},titles:["Backlog of changes","Compiling the software","Configuration","Contributing","Functionallity","Welcome to GravityMon\u2019s documentation!","Installation","Releases"],titleterms:{The:[4,5],api:2,backlog:0,brewfath:2,chang:0,code:[0,1],compil:1,config:2,configur:[2,6],content:5,contribut:3,creat:2,credit:5,data:2,db:2,defin:1,devic:2,differ:[4,5],directori:1,document:[0,5],esptool:6,experiment:4,featur:4,format:[1,2],formula:2,functional:4,get:2,graviti:2,gravitymon:5,hardwar:2,index:2,indic:5,influx:2,instal:6,ispindl:2,main:[2,4,5],offici:6,option:1,other:4,post:2,push:2,releas:7,rest:2,s:5,set:2,softwar:1,sourc:1,statu:2,structur:1,tabl:5,target:1,tool:1,v2:2,welcom:5,wifi:6}}) \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index 07c89b6..048b06b 100644 --- a/platformio.ini +++ b/platformio.ini @@ -42,7 +42,7 @@ build_flags = -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.4.9\"" + -D CFG_APPVER="\"0.4.10\"" lib_deps = # Switched to forks for better version control. # Using local copy of this library #https://github.com/mp-se/i2cdevlib # https://github.com/jrowberg/i2cdevlib.git @@ -68,7 +68,7 @@ extra_scripts = build_unflags = ${common_env_data.build_unflags} build_flags = - -D PIO_FRAMEWORK_ARDUINO_ENABLE_EXCEPTIONS + #-D PIO_FRAMEWORK_ARDUINO_ENABLE_EXCEPTIONS #-D SKIP_SLEEPMODE ${common_env_data.build_flags} -D COLLECT_PERFDATA # This option will collect runtime data for a few defined methods to measure time, dumped to serial and/or influxdb @@ -113,7 +113,7 @@ build_unflags = ${common_env_data.build_unflags} build_flags = ${common_env_data.build_flags} -D COLLECT_PERFDATA # This option will collect runtime data for a few defined methods to measure time, dumped to serial and/or influxdb - -D LOG_LEVEL=6 + -D LOG_LEVEL=5 lib_deps = ${common_env_data.lib_deps} board = ${common_env_data.board} diff --git a/script/create_versionjson.py b/script/create_versionjson.py index 7747abc..5e7d543 100644 --- a/script/create_versionjson.py +++ b/script/create_versionjson.py @@ -36,7 +36,7 @@ def after_build(source, target, env): print( "Copy file : " + source + " -> " + target ) shutil.copyfile( source, target ) - # Copy file 4 + # Copy file 5 source = dir + "\\data\\calibration.min.htm" target = dir + "\\bin\\calibration.min.htm" print( "Copy file : " + source + " -> " + target ) @@ -48,9 +48,9 @@ def after_build(source, target, env): print( "Creating version.json" ) f = open( target, "w" ) f.write( "{ \"project\":\"gravmon\", \"version\":" + ver + ", " ) - f.write( " \"html\": [ \"index.min.htm\", \"device.min.htm\", \"config.min.htm\", \"about.min.htm\" ] }" ) + f.write( " \"html\": [ \"index.min.htm\", \"device.min.htm\", \"config.min.htm\", \"calibration.min.htm\", \"about.min.htm\" ] }" ) f.close() print( "Adding custom build step (create json):") -env.AddPreAction("buildprog", after_build) +env.AddPostAction("buildprog", after_build) diff --git a/src_docs/source/configuration.rst b/src_docs/source/configuration.rst index 0fb403c..7207371 100644 --- a/src_docs/source/configuration.rst +++ b/src_docs/source/configuration.rst @@ -174,11 +174,13 @@ Hardware Settings http://192.168.1.1/firmware/gravmon/ - Contents version.json + Contents version.json. The version is used by the device to check if the this version is newer. The html files will also be downloaded if the are present on the server. This way it's easy to + upgrade to a version that serve the html files from the file system. If they dont exist nothing will happen, the OTA flashing will still work. If the html files are missing from the file system + they can be uploaded manually afterwards. :: - { "project":"gravmon", "version":"0.5.0" } + { "project":"gravmon", "version":"0.4.10", "html": [ "index.min.htm", "device.min.htm", "config.min.htm", "calibration.min.htm", "about.min.htm" ] } Create formula