Commit Graph

295 Commits

Author SHA1 Message Date
c3ma
ecc03e9cb4 mqtt extraction 2021-10-06 22:00:17 +02:00
c3ma
2cd0a0f48b initial flowmeter logic and calculation 2021-10-06 21:24:34 +02:00
c3ma
b5569aa8ab Cleanup of last changes 2021-10-06 20:05:09 +02:00
Your Name
244dfb9b27 Merge branch 'master' of https://github.com/0110/PlantCtrl
# Conflicts:
#	esp32/src/main.cpp
2021-10-01 23:51:29 +02:00
Your Name
f4e13454e3 wip new pump system 2021-10-01 23:46:37 +02:00
Ollo
1619b93fa1 Updated ini.example 2021-10-01 23:00:24 +02:00
Ollo
58cb523e1b added determineTimeLightState in TIMED_LIGHT_PIN define 2021-10-01 22:53:40 +02:00
Your Name
f13a25b34d prevent light from being reenabled untill next day after low voltage trigger 2021-09-14 18:54:14 +02:00
Empire
88e4ceea8b fix for wrong validator 2021-08-30 08:02:12 +00:00
Your Name
f99f72b65a added timed light function 2021-08-29 20:45:50 +02:00
Your Name
e927fc8c70 add alarm if pumps did not change state to wet after X consecutive tries 2021-08-23 00:58:37 +02:00
Your Name
61098724b6 fixed wrong percent calculation, emit trigger value to mqtt 2021-08-17 16:55:57 +02:00
c3ma
2e052710e2 missing sensor error 2021-07-21 21:34:14 +02:00
c3ma
d043d873cc Reading sensors by frequency 2021-07-21 21:23:58 +02:00
Ollo
2d167c7393 adapted datatype 2021-07-14 21:43:03 +02:00
Ollo
f6c51f6d05 Updated example, more debug output in script 2021-07-14 21:33:47 +02:00
Ollo
02a882ebde Seperate setting itself into a local file 2021-07-14 21:21:49 +02:00
Ollo
697d470d29 Renamed file 2021-07-14 21:15:04 +02:00
Ollo
c448960415 Check values before publishing water stuff 2021-07-14 21:14:03 +02:00
c3ma
2d91f91290 react on switch from Mqtt 2021-07-09 22:51:50 +02:00
c3ma
df39c09c50 code cleanups 2021-07-09 21:50:51 +02:00
c3ma
99703e5ad1 Adjust moister sensor boundaries 2021-07-09 19:40:51 +02:00
Your Name
12d4c9950d fix cooldown memory without power, improved logging 2021-07-01 23:09:02 +02:00
Ollo
456f78042c Fixed concatination of strings in logging 2021-07-01 22:15:55 +02:00
Ollo
57d18af76d converted serial prints into MQTT status log messages 2021-07-01 22:06:50 +02:00
Your Name
f1d55ed603 extracte time stuff, started logger 2021-07-01 21:19:51 +02:00
Your Name
a1f2388c7f use mAlive instead of mqtt/homie varaibles 2021-07-01 20:50:47 +02:00
Your Name
d2010ddebb improved script reliability 2021-07-01 20:40:51 +02:00
Your Name
7c9a0bf6f1 clear averages for each run, ignore distances higher than tank depth 2021-07-01 20:39:51 +02:00
Your Name
11d29939f6 code stuff 2021-07-01 20:39:06 +02:00
Your Name
a1de9ee2b9 config reduced, config json parser memory adjusted 2021-06-29 23:49:48 +02:00
Your Name
5568000d62 initial settings uploader added 2021-06-29 23:49:30 +02:00
Your Name
191e05b941 fixed config backup and restore 2021-06-29 22:09:30 +02:00
Your Name
c22c14a42b stop then script from sleeping the esp in case of an error 2021-06-29 20:14:36 +02:00
Your Name
54398b7bd6 adjust voltage divider to match 0.10 pcb layout 2021-06-29 20:14:19 +02:00
Your Name
0eeeb6dc60 set threshold for accumlator calculation 2021-06-29 20:14:03 +02:00
3391dfb2c9 report raw distance for water sensor 2021-06-06 22:50:56 +02:00
c3ma
a8403a7c98 added distance sensor and adjusted pcb for it 2021-06-06 21:23:21 +02:00
Your Name
dd58310fe9 make sensor address compare actually work 2021-05-29 22:07:47 +02:00
Your Name
8e5a13d291 ensure DS18S20 are properly resolved via address 2021-05-29 21:37:27 +02:00
Your Name
200ff30f62 allow analog sensor some time to settle 2021-05-29 19:11:40 +02:00
Your Name
2c5d61a124 "improved" topic macro, added backup status and topic 2021-05-27 22:53:49 +02:00
Your Name
057e2b37c3 retry on crc error for onewire 2021-05-27 21:43:15 +02:00
Your Name
3d45a3fca3 config backup wip 2021-05-26 22:25:12 +02:00
Your Name
98799bd2d5 added testmode, fixed formating 2021-05-26 21:46:33 +02:00
Ollo
f0127921b1 Handle different start and end times to water plants 2021-05-26 20:19:27 +02:00
Your Name
cad836b070 fixed homie config fail mode 2021-05-24 20:35:41 +02:00
Your Name
72f8d36393 ignore bod while starting upstepper 2021-05-24 20:07:22 +02:00
Your Name
a90b59f69f use mqtt roundtrip to ensure all receiving messages are processed before ds 2021-05-24 19:37:27 +02:00
Your Name
50d07a3c02 fixed deepsleep procedure, homie shutdown, ensure pinhold is same as pin 2021-05-24 15:50:04 +02:00
Your Name
92005c1c33 control works again (fixed with wifi and fallback) 2021-05-24 14:58:35 +02:00
c3ma
c7d98ef108 GPIO12 is evil 2021-05-16 22:24:14 +02:00
Ollo
129b2b1478 Cleanup unused variables and code 2021-04-07 22:42:31 +02:00
Ollo
658bc7a389 Todos aufgerauemt 2021-04-07 22:21:58 +02:00
Ollo
0a1d755154 runtime optimization 2021-04-07 22:18:52 +02:00
Ollo
31229594fe One wire is initialized directly after start 2021-04-07 22:10:26 +02:00
Ollo
b8b8cf84d5 Reduce frequence of ESP32 to 80Mhz 2021-04-07 21:57:00 +02:00
Ollo
902c863873 Main logic introduced as seperate function. This is executed after MQTT is connected or a timeout occured 2021-04-07 21:54:53 +02:00
Ollo
47aba5387b Handle cooldown time for watering; add start and end time when pumping is allowed 2021-04-07 21:26:11 +02:00
Ollo
3932e82593 Address of tempsensors is published to MQTT 2021-04-07 20:27:42 +02:00
Ollo
dc5dc27ba5 Removed index to indentify temperatur sensors 2021-04-07 19:40:31 +02:00
Ollo
284fb4907d Renamed constants 2021-04-07 18:49:59 +02:00
6da0e0268e 0.9 final 2021-03-04 23:26:57 +01:00
0784d2da44 added echo code 2021-03-04 22:13:02 +01:00
552c27632b removed mode1, reduced redundant bus resets, removed multiple deep sleep paths 2021-02-26 09:33:16 +01:00
d5fbd38762 expose ica dcd ccd ah values 2021-02-16 23:40:05 +01:00
Ollo
093b7c7fc3 Corrected pin configuration to 0.7final PCB 2021-02-16 22:52:47 +01:00
Ollo
55d66b763c Chip temperature is published, too 2021-02-16 22:29:07 +01:00
Ollo
5deea587a8 DS2438 module integrated 2021-02-16 22:25:12 +01:00
Ollo
437216187c Documentation improved 2021-01-03 16:32:09 +01:00
Ollo
4f754199eb Less debug output 2020-12-28 14:59:25 +01:00
Ollo
2fc835f396 Fixed one-wire library with an hammer 2020-12-28 14:57:17 +01:00
Ollo
46ab832624 Voltsensor test series has a constant, too 2020-12-28 14:26:41 +01:00
Ollo
a8837d3119 Check for NAN temperatures 2020-12-28 14:24:55 +01:00
Ollo
bd5fc9839f Used distance reading time to stabilize temperature sensors 2020-12-21 17:55:57 +01:00
Ollo
6f5c5536cc Removed repeating code 2020-12-21 17:07:15 +01:00
Ollo
f8052bd9b0 corrected code highlighting 2020-12-21 16:26:53 +01:00
Ollo
37c83ecef8 Described used ultra sonic sensor 2020-12-21 16:18:22 +01:00
Ollo
63708eeecc Comments included and code sorted 2020-12-21 16:12:46 +01:00
Ollo
b43e238293 Moved PCB stuff into the borad folder 2020-12-21 15:28:40 +01:00
23beebc4be pin fix 2020-12-20 17:00:44 +01:00
f4c935879b fix one wire detection, allow multiple sensors and set per setting which one is which 2020-12-13 17:17:54 +01:00
dd1b96374c fixed pin assignements for new revision 2020-12-12 17:26:18 +01:00
3bd77e0b57 prevent infinite loop on waiting for hall if not connected, fixed formating 2020-12-12 00:01:19 +01:00
Ollo
2b7840abf3 Added Cppcheck project file for static code analysis 2020-12-09 21:44:33 +01:00
Ollo
dd31122ed3 All static code analyis comments fixed, only TODOs are open 2020-12-09 21:43:07 +01:00
Ollo
303885fde5 Fixed wakeup due static code analysis 2020-12-09 21:39:48 +01:00
3bbcd24707 lcsc/jlcpcb order changes 2020-11-29 05:04:46 +01:00
5fcbf87671 startup reason mqtt notification 2020-11-28 01:45:57 +01:00
calculator
da00451de6 Merge branch 'master' of https://github.com/0110/PlantCtrl 2020-11-18 22:23:47 +01:00
calculator
48756874e5 replaced HC-SR04 with SR04M-2 2020-11-18 22:11:37 +01:00
Ollo
eb1650fed7 Moved upload port into seperate configuration file 2020-11-12 21:23:19 +01:00
c3ma
ade0a8b812 only read temperature multiple times, if it differs significantly to last measurement 2020-11-11 21:09:38 +01:00
Ollo
04bfaf4d94 Merged documents into ultrasonic sensor stuff 2020-11-11 21:42:29 +01:00
Ollo
8adf4d6f0d Read ultrasonnic sensor 5 times 2020-11-11 21:33:11 +01:00
Ollo
e583122a10 ultrasonic sensor is read 2020-11-11 21:28:03 +01:00
c3ma
398d832213 water sensor started 2020-11-11 20:13:15 +01:00
Ollo
6e6dec8d5f moved solar connector more to border 2020-11-07 17:13:24 +01:00
Ollo
3a1b8d6745 Raw ADC value of lipo added 2020-11-07 00:34:27 +01:00
Ollo
61171fb379 States described in doxygen 2020-11-06 23:29:46 +01:00
Ollo
7080fe306b Doxygen added 2020-11-06 22:19:16 +01:00
Ollo
9c83897fd9 Wakeup due to change temperature 2020-11-06 21:00:11 +01:00
Ollo
4303e248ff Upload script 2020-11-06 19:48:39 +01:00
Ollo
2d73925636 Added comments for the RTC struct 2020-11-06 19:18:28 +01:00
Ollo
3fbf3bdb84 Struct used for RTC memory 2020-11-06 19:15:43 +01:00
Ollo
2958976f0a Some comments 2020-11-06 18:52:38 +01:00
Ollo
39041ab091 Moved ESP32 information into its subdirectory 2020-11-06 17:51:22 +01:00
a14f599f5a missing sensor detection, delta trigger moisture working 2020-11-04 23:28:08 +01:00
1dcf4df740 improve mode3 not pumping 2020-11-04 22:12:00 +01:00
503c2b73b9 added raw moisture, improved pct calc , formating 2020-11-04 21:57:40 +01:00
fd28ffcfaf added rtc trigger vars 2020-11-04 21:55:51 +01:00
fb907f9b12 fixed wrong indes for pump determination
improved pump status output
fixed led blinking in  mode3 random
2020-11-04 21:10:22 +01:00
Ollo
329a228b2d Toggle Sensor LED to visualize mode 3 2020-11-01 20:42:45 +01:00
Ollo
89070806f7 NTP server is used from configuration setting 2020-11-01 20:29:24 +01:00
Ollo
e0de8dabe8 NTP Server can be set via configuration item 2020-11-01 20:17:21 +01:00
Ollo
e094221298 Publish only temperatur values, if a sensor was found 2020-11-01 14:30:26 +01:00
Ollo
6ba2f92fa7 Fixed plant loop in mode1 2020-11-01 13:26:38 +01:00
902b81ab3e :Merge branch 'master' of https://github.com/0110/PlantCtrl into master 2020-10-31 19:25:22 +01:00
f8658b78fd made deep sleep modes work and behave somewhat correctly, gave mqqt time to publish, gave ntp time to sync 2020-10-31 19:25:13 +01:00
83c26cc07c *cough* 2020-10-31 19:24:44 +01:00
Ollo
5b420ab904 Adapt time comment 2020-10-31 12:44:49 +01:00
Ollo
979baf5ff9 Adapt time comment 2020-10-31 12:44:32 +01:00
Ollo
8a2f320b1a Adapt time comment 2020-10-31 12:44:25 +01:00
fcaca7435f make shit work more 2020-10-31 03:51:35 +01:00
Ollo
a3cf5bfe8b Less temperature debugging output 2020-10-31 00:10:00 +01:00
Ollo
156e721691 Enable debugging of onewire lib 2020-10-30 22:53:24 +01:00
Ollo
8c840c599a Measure temperatur sensor multiple times 2020-10-30 22:51:32 +01:00
c3ma
a140383e32 Disable pumps while OTA running, mode2 is called only once 2020-10-28 21:20:46 +01:00
c3ma
0bd4aae258 Force the user to set something 2020-10-28 21:06:34 +01:00
c3ma
8657eedc43 Disable pumps while OTA running, mode2 is called only once 2020-10-28 20:31:18 +01:00
c3ma
58e3e3c652 Pump5 pin corrected 2020-10-28 20:14:52 +01:00
c3ma
48474cdba6 Power for Pump is disabled if no longer required 2020-10-28 20:00:24 +01:00
c3ma
0230cc2fe9 Deactivate all Pumps when pump power is deactivated 2020-10-23 19:32:12 +02:00
c3ma
8f21f58950 Handle default value of cooldown 2020-10-23 16:47:40 +02:00
c3ma
80ce95d5d6 More debug output 2020-10-23 16:32:05 +02:00
c3ma
3e3eaa96e4 Refactored code 2020-10-23 16:20:34 +02:00
Ollo
f29a5e3d0b Merge branch 'master' of https://github.com/0110/PlantCtrl 2020-10-22 20:20:23 +02:00
c3ma
6e9b7b29ff set pump output 2020-10-21 20:51:25 +02:00
c3ma
9b5bf90da9 settings gpio mode before deepsleep 2020-10-21 20:46:09 +02:00
c3ma
1485539a8b Deep sleep is set according daylight 2020-10-21 20:03:12 +02:00
c3ma
5591c6dba2 Deep sleep is set according daylight 2020-10-21 19:50:05 +02:00
c3ma
03be8a1bda Deep sleep is now working 2020-10-21 18:33:38 +02:00
c3ma
73759eec68 Sensor values are written and read in the same variable 2020-10-21 18:21:44 +02:00
c3ma
579e7daa93 onHomieEvent set 2020-10-21 18:14:51 +02:00
c3ma
04cb8bbaf0 Status LED for flashing 2020-10-21 16:57:57 +02:00
c3ma
9b27df7172 OTA flashing is disabling deepsleep at start 2020-10-21 16:43:26 +02:00
Ollo
0106641044 Merge branch 'master' of https://github.com/0110/PlantCtrl 2020-10-20 22:54:41 +02:00
94c78bd571 partitions with slightly more flash and smaller spiffs 2020-10-20 22:54:18 +02:00
0a473173f8 reduced settings 2020-10-20 22:52:03 +02:00
667eb0d275 slimmer website 2020-10-20 22:51:53 +02:00