Commit Graph

53 Commits

Author SHA1 Message Date
5cfd78f942 Merge branch 'master' into noprints
# Conflicts:
#	src/Heating.cpp
#	src/main.cpp
2021-03-31 17:50:29 +02:00
3a5f1a3a74 interrupt full heat cycle when pump starts 2021-03-31 17:46:36 +02:00
39a8ecde85 turn of fan when pump cycle starts to prevent too much current draw 2021-03-31 17:28:54 +02:00
a9671773f3 comment out all Serialprints to not interrupt timer functions 2021-03-31 17:03:36 +02:00
9c782879a5 Merge branch 'pumpcounter' into 'master'
Total heating time and pump count

See merge request lukas/pumpensteuerung!9
2021-03-26 22:15:20 +00:00
2f38947ea4 add features to show total heating time and percentage on heating tab
and total pump cycles on homepage
2021-03-26 22:15:20 +00:00
5351bcb15d round to two float precision 2021-03-20 15:46:31 +01:00
983d2b9ce7 correct percent value 2021-03-06 23:50:36 +01:00
62cea9932e correct version parsing
and float conversion of percent value
2021-03-06 14:39:32 +01:00
3b502ac434 add features to show total heating time and percentage on heating tab
and total pump cycles on homepage
2021-03-06 14:21:12 +01:00
910797adaf add new feature to make wifi ap invisible 2021-01-03 17:08:05 +01:00
72095dbe3e Merge branch 'newheatingtab' into 'master'
display information about last heating time in gui

See merge request lukas/pumpensteuerung!7
2020-12-27 15:41:06 +00:00
c185fb7a8e display information about last heating time in gui
restructurize some jsx classes
2020-12-27 15:41:06 +00:00
6291c9311a cache more between builds 2020-12-12 16:10:06 +01:00
0817fcf492 use host time to calculate the real event time 2020-12-12 15:58:05 +01:00
747e7bbbf8 Merge branch 'notimeoverflow' into 'master'
prevent time variable overflow

See merge request lukas/pumpensteuerung!6
2020-12-12 14:13:34 +00:00
cb3850134a remove unneeded files
use different functions in heater to provide code readability
2020-12-10 18:51:49 +01:00
ee91b36c66 prevent time variable overflow 2020-12-09 19:53:59 +01:00
1547854edf Merge branch 'framework' into 'master'
Framework

See merge request lukas/pumpensteuerung!5
2020-12-08 15:12:15 +00:00
24f6a8a95f Deleted .idea/.gitignore, .idea/clion.iml, .idea/misc.xml, .idea/modules.xml, .idea/platformio.iml, .idea/serialmonitor_settings.xml, .idea/vcs.xml, .idea/watcherTasks.xml files 2020-12-08 15:12:15 +00:00
c28bde9f2b Merge branch 'nonblockingdht' into 'master'
use a non blocking dht22 library

See merge request lukas/pumpensteuerung!4
2020-12-05 12:45:08 +00:00
f2138d2378 use a non blocking dht22 library 2020-12-05 12:45:07 +00:00
5943ffc97b fix turn on/off of fan and switch to humidity mode 2020-11-30 11:14:08 +01:00
ffb62b9297 15min refresh time between heats 2020-11-17 18:37:47 +01:00
94b635252d Merge branch 'newHardware' into 'master'
New hardware

See merge request lukas/pumpensteuerung!2
2020-11-17 13:43:31 +00:00
4a7a929dbc two modes if no humidity sensor available 2020-11-17 15:26:17 +01:00
92e7089aef add some debug logs 2020-11-14 21:21:22 +01:00
337c65daf3 define pins dynamically 2020-11-10 17:39:40 +01:00
de792719ee new class for managing heating 2020-11-10 17:38:33 +01:00
e0a27bf155 add new pins for heizung 2020-11-10 15:12:47 +01:00
3aff2a69aa remove test code 2020-10-21 20:16:40 +02:00
7496b273db correct pin for dht22 2020-10-20 21:15:18 +02:00
7f1bf05af2 new fan pin, and testing on off times 2020-09-30 23:27:26 +02:00
1929251bfc add feature to show temp and hum in web gui 2020-08-22 19:13:50 +02:00
7e1dc425c4 Merge branch 'tempsensor' into 'master'
Tempsensor

See merge request lukas/pumpensteuerung!1
2020-08-22 10:36:01 +00:00
d036201313 fix event var 2020-08-22 12:35:43 +02:00
3d7a87f4b8 add new temperature class and rollback main 2020-08-22 12:33:46 +02:00
b065007b19 add some c++ doc 2020-08-02 16:56:49 +00:00
0261f186bd move turnontime back to on and off context
live view of pressure and watersensor
2020-08-02 11:31:36 +00:00
aaf73b2dd7 add last pump time and duration, chip ontime and last water leakage time to website 2020-08-01 18:00:36 +02:00
a0d42847c9 correct time set and get 2020-06-20 15:10:35 +02:00
387910d37f webserver where to set the pump timeout 2020-06-20 12:12:27 +02:00
9ccec50c37 dht22 2020-06-20 09:13:55 +02:00
1ba2aad7e7 prevent overflow with timeouts higher than 71mins. 2020-05-11 10:05:09 +02:00
94848ce00f extended turn off time to one hour 2020-05-06 19:56:57 +02:00
7061411ecc enhanced stop duration 2020-04-25 17:34:26 +02:00
34e4b996d7 added version info 2020-04-11 11:02:10 +02:00
0bf22c9a04 fix switch to error state after too long turn on time 2020-04-11 10:54:59 +02:00
a42b4529e6 formatting changes
comments
wifi manager
2020-04-11 10:23:02 +02:00
lukas-heiligenbrunner
56b7aa1426 Wifi first settings 2020-04-10 14:44:18 +02:00