Hydrosys4 · ChuckNorrison · Oct 2, 2024 · Oct 7, 2024 · Oct 7, 2024 · Oct 7, 2024
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+
+*.pyc
diff --git a/GPIOEXPI2Ccontrol.py b/GPIOEXPI2Ccontrol.py
@@ -230,14 +230,13 @@ def CheckRealHWpin(PIN=""):
 				return False, 0	
 	return False, 0		
 
-
 def GPIO_output(address , PINstr, level ):
 	isRealPIN,PIN=CheckRealHWpin(PINstr)
 	if isRealPIN:
 		if address in MCPDEVICES:
 			mcp=MCPDEVICES[address]
 		else:
-			msg= "Address =" +address+ " not available for this Hardware"
+			msg= "Address =" + address + " not available for this Hardware"
 			logger.error(msg)
 			print(msg)
 			return False
@@ -246,19 +245,17 @@ def GPIO_output(address , PINstr, level ):
 			mcp.output(PIN, mcp.LOW)
 		else:
 			mcp.output(PIN, mcp.HIGH)
-		statusdataDBmod.write_status_data(GPIO_data,address+PINstr,"level",level)
+		statusdataDBmod.write_status_data(GPIO_data, address + PINstr, "level", level)
 		logger.info("Set PIN=%s to State=%s", PINstr, str(level))
 		return True
 	else:
-		msg= "PIN=" +PINstr+ " not Valid for this Hardware"
-		logger.error(msg)
-		print(msg)
+		if PINstr != "N/A":
+			msg= "PIN=" + PINstr + " not Valid for this Hardware (" + address + ")"
+			logger.error(msg)
+			print(msg)
 
 	return False
 
-
-
-
 def GPIO_setup(address, PINstr, state, pull_up_down=""):
 	isRealPIN,PIN=CheckRealHWpin(PINstr)
 	if isRealPIN:

diff --git a/HWcontrol.py b/HWcontrol.py
@@ -1142,9 +1142,11 @@ def GPIO_output(PINstr, level):
 		#print PINstr , " ***********************************************" , level
 		return True
 	else:
-		msg= "PIN=" +PINstr+ " not Valid for this Hardware"
-		logger.error(msg)
-		print(msg)
+		if PINstr != "N/A":
+			msg= "PIN=" +PINstr+ " not Valid for this Hardware"
+			logger.error(msg)
+			print(msg)
+
 	return False 
 
 def GPIO_output_nostatus(PINstr, level):

diff --git a/HWcontrol.pyc b/HWcontrol.pyc
diff --git a/Prepare for Release/Release checklist b/Prepare for Release/Release checklist
@@ -16,7 +16,7 @@ HYDROSYSTEM SW LEVEL:
 4c) remove all files in database /logfiles/
 4d) remove all files in database /static/downlaod/
 remove all pictures -> go to 'images' and push deleteall or go to static/hydropicture/
-5) bash, ensure the latest bash file is install_hydreosys4.sh
+5) bash, ensure the latest bash file is install_hydrosys4.sh
 
 
 START THE PROGRAM IN UBUNTU:

diff --git a/README.md b/README.md
@@ -1,29 +1,42 @@
 # Hydrosystem
 
-The hydrosys4 project aim to create a platform for the raspbery pi 3 which let you easily controls and record sensors data, use actuators through the GPIO and play with analog by using external ADC the supported hardware and wiring can be found in the Documentation folder. The platform is developed in python and is based on web server interface. The system can control the WiFi interface and work either in Access point mode than connected to wifi network. The webserver interface can be adjusted to support several purposes, the current development is a small irrigation system, GIU is made to support planning and conditional irrigation based on temperature and humidity, relays control the valve and pumps, the system also support email notifications, cameras and video. Latest upgrade include possibility to mount camera over servo.
-The SW platform is based on a web interface where the webserver is running locally on the raspberry. The SW is designed to be used with smartphone and to be reachable from internet without need of external servers or dynamic DNS. 
-The basic concept is to develop a platoform for the internet of things which is not centralized, then to avoid extra fees, Static IP fees, Dynamic DNS fees. Every time the IP address is updated the system will send an email with relevant link to itself. 
-NOTE: The mainstream IoT products relies on central server architecture which binds user to annual fees, the server is also a single point of failure and a poses high security problems. 
-For the designed applications the supporting hardware platform and sensors are choosen to be inexpensive.
+The hydrosys4 project aims to create a platform for the raspberry pi which lets you easily control and record sensors data. 
 
-More details can be found on my webpage https://hydrosysblog.wordpress.com/
+Use actuators through the GPIO and play with analog by using external ADC the supported hardware and wiring can be found in the Documentation folder.
+
+The platform is developed in python and is based on web server interface. The system can control the WiFi interface and works in Access point mode where to user can connect to. 
+
+The webserver interface can be adjusted to support several purposes, the current development is used as automatic irrigation system. The GUI is made to support planning and conditional irrigation based on temperature and humidity, relays control the valve and pumps, the system also supports email notifications, cameras and video stream. Latest upgrade include possibility to mount camera over servo.
+
+The software platform is based on a web interface where the webserver is running locally on the raspberry pi. The software is designed to be used with smartphone and to be reachable from internet without need of external servers or dynamic DNS. Every time the IP address is updated the system will send an email with relevant link as configured. 
+
+More details can be found on the webpage https://hydrosysblog.wordpress.com/
+
+![image](https://github.com/user-attachments/assets/481f820f-82e2-4f30-bfb0-a897d2679e94)
 
 # Installation
 
-For installation please follow the installation guide in the website:
+For installation please follow the installation guide from here:
 
 https://hydrosysblog.wordpress.com/configuration/
 
 two installation methods are possible:
 
-1) For easy installation it is possible to directly download the SD image.
+1) For easy installation it is possible to directly download the SD image from current relase
 
 2) For a more traditional installation it is possible to download a bash installer 
 
+```
+wget https://raw.githubusercontent.com/Hydrosys4/Master/master/bash/install_hydrosys4.sh
+
+sudo chmod u+x install_hydrosys4.sh
+
+sudo ./install_hydrosys4.sh
+```
 
 # Access to the System
 
-The systems run on the RPI3 which will act as access point, wait few seconds after the system is restarted, you will se a new wifi network. 
+The system runs on a raspberry pi, which will act as access point per default. Wait a few seconds after the system is restarted, you will see a new wifi network.
 Once connected to the wifi network, open the webbrowser and type the address indicated in the guide.
 
 https://hydrosysblog.wordpress.com/configuration/
@@ -36,5 +49,3 @@ Username: admin
 Password: default
 
 it is strongly suggested to modify the password.
-
-
diff --git a/SchedulerMod.pyc b/SchedulerMod.pyc
diff --git a/__pycache__/ActuatorControllermod.cpython-37.pyc b/__pycache__/ActuatorControllermod.cpython-37.pyc
diff --git a/__pycache__/GPIOEXPI2Ccontrol.cpython-37.pyc b/__pycache__/GPIOEXPI2Ccontrol.cpython-37.pyc
diff --git a/__pycache__/HASScompMatrix.cpython-37.pyc b/__pycache__/HASScompMatrix.cpython-37.pyc
diff --git a/__pycache__/HASSintegrMQTT.cpython-37.pyc b/__pycache__/HASSintegrMQTT.cpython-37.pyc
diff --git a/__pycache__/HC12control.cpython-37.pyc b/__pycache__/HC12control.cpython-37.pyc
diff --git a/__pycache__/HC12mod.cpython-37.pyc b/__pycache__/HC12mod.cpython-37.pyc
diff --git a/__pycache__/HWcontrol.cpython-37.pyc b/__pycache__/HWcontrol.cpython-37.pyc
diff --git a/__pycache__/Hygro24_I2C.cpython-37.pyc b/__pycache__/Hygro24_I2C.cpython-37.pyc
diff --git a/__pycache__/MQTTcontrol.cpython-37.pyc b/__pycache__/MQTTcontrol.cpython-37.pyc
diff --git a/__pycache__/REGandDBmod.cpython-37.pyc b/__pycache__/REGandDBmod.cpython-37.pyc
diff --git a/__pycache__/SchedulerMod.cpython-37.pyc b/__pycache__/SchedulerMod.cpython-37.pyc
diff --git a/__pycache__/SlowWire.cpython-37.pyc b/__pycache__/SlowWire.cpython-37.pyc
diff --git a/__pycache__/actuatordbmod.cpython-37.pyc b/__pycache__/actuatordbmod.cpython-37.pyc
diff --git a/__pycache__/advancedmod.cpython-37.pyc b/__pycache__/advancedmod.cpython-37.pyc
diff --git a/__pycache__/autofertilizerdbmod.cpython-37.pyc b/__pycache__/autofertilizerdbmod.cpython-37.pyc
diff --git a/__pycache__/autofertilizermod.cpython-37.pyc b/__pycache__/autofertilizermod.cpython-37.pyc
diff --git a/__pycache__/automationdbmod.cpython-37.pyc b/__pycache__/automationdbmod.cpython-37.pyc
diff --git a/__pycache__/automationmod.cpython-37.pyc b/__pycache__/automationmod.cpython-37.pyc
diff --git a/__pycache__/autowateringdbmod.cpython-37.pyc b/__pycache__/autowateringdbmod.cpython-37.pyc
diff --git a/__pycache__/autowateringmod.cpython-37.pyc b/__pycache__/autowateringmod.cpython-37.pyc
diff --git a/__pycache__/basicSetting.cpython-37.pyc b/__pycache__/basicSetting.cpython-37.pyc
diff --git a/__pycache__/camera_pi.cpython-37.pyc b/__pycache__/camera_pi.cpython-37.pyc
diff --git a/__pycache__/cameradbmod.cpython-37.pyc b/__pycache__/cameradbmod.cpython-37.pyc
diff --git a/__pycache__/clockdbmod.cpython-37.pyc b/__pycache__/clockdbmod.cpython-37.pyc
diff --git a/__pycache__/clockmod.cpython-37.pyc b/__pycache__/clockmod.cpython-37.pyc
diff --git a/__pycache__/countryinfo.cpython-37.pyc b/__pycache__/countryinfo.cpython-37.pyc
diff --git a/__pycache__/databasemod.cpython-37.pyc b/__pycache__/databasemod.cpython-37.pyc
diff --git a/__pycache__/debuggingmod.cpython-37.pyc b/__pycache__/debuggingmod.cpython-37.pyc
diff --git a/__pycache__/emaildbmod.cpython-37.pyc b/__pycache__/emaildbmod.cpython-37.pyc
diff --git a/__pycache__/emailmod.cpython-37.pyc b/__pycache__/emailmod.cpython-37.pyc
diff --git a/__pycache__/fertilizerdbmod.cpython-37.pyc b/__pycache__/fertilizerdbmod.cpython-37.pyc
diff --git a/__pycache__/filemanagementmod.cpython-37.pyc b/__pycache__/filemanagementmod.cpython-37.pyc
diff --git a/__pycache__/filestoragemod.cpython-37.pyc b/__pycache__/filestoragemod.cpython-37.pyc
diff --git a/__pycache__/flasksettings.cpython-37.pyc b/__pycache__/flasksettings.cpython-37.pyc
diff --git a/__pycache__/hardwaremod.cpython-37.pyc b/__pycache__/hardwaremod.cpython-37.pyc
diff --git a/__pycache__/hx711_AV.cpython-37.pyc b/__pycache__/hx711_AV.cpython-37.pyc
diff --git a/__pycache__/interruptdbmod.cpython-37.pyc b/__pycache__/interruptdbmod.cpython-37.pyc
diff --git a/__pycache__/interruptmod.cpython-37.pyc b/__pycache__/interruptmod.cpython-37.pyc
diff --git a/__pycache__/jsonFormUtils.cpython-37.pyc b/__pycache__/jsonFormUtils.cpython-37.pyc
diff --git a/__pycache__/loggerconfig.cpython-37.pyc b/__pycache__/loggerconfig.cpython-37.pyc
diff --git a/__pycache__/logindbmod.cpython-37.pyc b/__pycache__/logindbmod.cpython-37.pyc
diff --git a/__pycache__/messageboxmod.cpython-37.pyc b/__pycache__/messageboxmod.cpython-37.pyc
diff --git a/__pycache__/networkdbmod.cpython-37.pyc b/__pycache__/networkdbmod.cpython-37.pyc
diff --git a/__pycache__/networkmod.cpython-37.pyc b/__pycache__/networkmod.cpython-37.pyc
diff --git a/__pycache__/photomod.cpython-37.pyc b/__pycache__/photomod.cpython-37.pyc
diff --git a/__pycache__/selectedplanmod.cpython-37.pyc b/__pycache__/selectedplanmod.cpython-37.pyc
diff --git a/__pycache__/sensordbmod.cpython-37.pyc b/__pycache__/sensordbmod.cpython-37.pyc
diff --git a/__pycache__/start.cpython-37.pyc b/__pycache__/start.cpython-37.pyc
diff --git a/__pycache__/statusdataDBmod.cpython-37.pyc b/__pycache__/statusdataDBmod.cpython-37.pyc
diff --git a/__pycache__/sysconfigfilemod.cpython-37.pyc b/__pycache__/sysconfigfilemod.cpython-37.pyc
diff --git a/__pycache__/systemtimeMod.cpython-37.pyc b/__pycache__/systemtimeMod.cpython-37.pyc
diff --git a/__pycache__/videocontrolmod.cpython-37.pyc b/__pycache__/videocontrolmod.cpython-37.pyc
diff --git a/__pycache__/videomod.cpython-37.pyc b/__pycache__/videomod.cpython-37.pyc
diff --git a/__pycache__/wateringdbmod.cpython-37.pyc b/__pycache__/wateringdbmod.cpython-37.pyc
diff --git a/__pycache__/wateringplansensordbmod.cpython-37.pyc b/__pycache__/wateringplansensordbmod.cpython-37.pyc
diff --git a/__pycache__/weatherAPIdbmod.cpython-37.pyc b/__pycache__/weatherAPIdbmod.cpython-37.pyc
diff --git a/__pycache__/weatherAPImod.cpython-37.pyc b/__pycache__/weatherAPImod.cpython-37.pyc
diff --git a/__pycache__/wpa_cli_mod.cpython-37.pyc b/__pycache__/wpa_cli_mod.cpython-37.pyc
diff --git a/actuatordbmod.pyc b/actuatordbmod.pyc
diff --git a/advancedmod.pyc b/advancedmod.pyc
diff --git a/autofertilizermod.py b/autofertilizermod.py
@@ -24,17 +24,12 @@
 # triggerdate, datetime when the doser have been triggered to start
 # tobeactivated, doser need to be activated in the next opportunity 
 
-
-def isschedulermode(element):
+def getworkmode(element):
 	recordkey="element"
 	recordvalue=element
 	keytosearch="workmode"
 	workmode=autofertilizerdbmod.searchdata(recordkey,recordvalue,keytosearch)
-	if workmode=="SceduledTime":
-		return True
-	else:
-		return False
-
+	return workmode
 
 def checkactivate(elementwater,durationwater):  # requires integer input
 	elementlist=fertilizerdbmod.getelementlist()
@@ -47,7 +42,8 @@ def checkactivate(elementwater,durationwater):  # requires integer input
 			break
 	if waterok: # there is a corresponding doser element
 		minwaterduration=hardwaremod.toint(autofertilizerdbmod.searchdata("element",element,"minactivationsec"),0)
-		if not isschedulermode(element): #setup is not for scheduled time
+		workmode = getworkmode(element)
+		if workmode == "BeforeWatering": #setup is not for scheduled time
 			print(" Fertilizer " ,element ," set to autowater")
 			print(" Check Water duration ", durationwater ,">", minwaterduration)
 			if durationwater>minwaterduration: # watering time above the set threshold
@@ -59,9 +55,9 @@ def checkactivate(elementwater,durationwater):  # requires integer input
 					time.sleep(durationfer) #this blocks the system (and watering activation) for n seconds ... not best practice
 				else:
 					print(" No pending request to activate ", element)
-			
+
 def activatedoser(element, duration):
-	print(element, " ",duration, " " , datetime.now()) 
+	print(element, " ",duration, " " , datetime.now())
 	logger.info('Doser Pulse, pulse time for ms = %s', duration)
 	msg, pulseok = ActuatorControllermod.activateactuator(element,duration)
 	# msg , pulseok=hardwaremod.makepulse(element,duration)
@@ -85,13 +81,17 @@ def checkworkmode(element):
 	return autofertilizerdbmod.searchdata("element",element,"workmode")
 
 def timelist(element):
-	if isschedulermode(element):
+	workmode = getworkmode(element)
+	if workmode == "ScheduledTime":
 		fertime=autofertilizerdbmod.searchdata("element",element,"time")
 		print("fertime " , fertime)
 		timelist=hardwaremod.separatetimestringint(fertime)
-	else:
+	elif workmode == "BeforeWatering":
 		print("non scheduler mode ")
 		timelist=hardwaremod.separatetimestringint("00:20:00") # get up 0 minutes and check for doseractivation
+	else:
+		print("Fertilizer is disabled")
+
 	return timelist
 
 if __name__ == '__main__':

diff --git a/autowatering/autowateringmod.py b/autowatering/autowateringmod.py
@@ -97,7 +97,7 @@ def message(msg, status: StatusManager,  console=True, log=True, logseverity = "
 		if mail:
 			Messaging.writemail(msg, status, mailtype)
 		if note:
-			dictitem={'title': "System Message (Alert) - Autowatering", 'content': msg }
+			dictitem={'title': "System Message (Alert) - Autowatering", 'content': msg, 'color': "blue" }
 			messageboxmod.SaveMessage(dictitem)
 
 

diff --git a/bash/guide~ b/bash/guide~
diff --git a/bash/install_hydrosys4.sh b/bash/install_hydrosys4.sh
@@ -563,6 +563,11 @@ server {
         proxy_buffering off;
     }
 
+    location /static/download/configdownload/logincred.txt {
+        return 302 https://$server_name$request_uri;
+    }
+
+
     location /favicon.ico {
         alias /home/pi/env/autonom/static/favicon.ico;
     }

diff --git a/basicSetting.pyc b/basicSetting.pyc
diff --git a/camera_pi.pyc b/camera_pi.pyc
diff --git a/cameradbmod.pyc b/cameradbmod.pyc
diff --git a/changelog/change b/changelog/change
@@ -1044,4 +1044,12 @@ This means that after the MQTT discovery configuration has been push to home ass
 
 2022-10-05 -> release 343d
 
-- Modify the Notification function to properly delete messages
+- Modify the Notification function to properly delete messages
+
+2024-10-07 -> release 344
+
+- Security fix with hashed passwords and removed logincred.txt from webserver
+- Improved LAN mode
+- Fix video stream resolutions
+- Fix photo quality
+- Add Create Image and modal dialogues in images
diff --git a/changelog/change~ b/changelog/change~
diff --git a/clockdbmod.py b/clockdbmod.py
@@ -2,7 +2,7 @@
 """
 fertilizer UI setting storage utilities
 """
-from __future__ import print_function
+from __future__ import print_function
 
 #import logging
 import os
@@ -46,7 +46,7 @@ def changesavesetting(FTparameter,FTvalue):
 	searchvalue="clock"
 	isok=filestoragemod.savechange(DATAFILENAME,searchfield,searchvalue,FTparameter,FTvalue)
 	if not isok:
-		print("problem saving paramete")
+		print("problem saving parameter")
 	return isok
 
 def restoredefault():

diff --git a/clockdbmod.pyc b/clockdbmod.pyc
diff --git a/clockmod.pyc b/clockmod.pyc
diff --git a/countryinfo.pyc b/countryinfo.pyc
diff --git a/database/default/defaddata.txt~ b/database/default/defaddata.txt~
diff --git a/database/default/defhwdata.txt~ b/database/default/defhwdata.txt~