minor updates

This commit is contained in:
Nico Melone
2025-04-03 14:17:52 -05:00
parent fb7667ff1a
commit efbb5a8e1b
10 changed files with 1168 additions and 8104 deletions

File diff suppressed because one or more lines are too long

View File

@@ -4,7 +4,7 @@ from quickfaas.remotebus import publish
from quickfaas.global_dict import get as get_params from quickfaas.global_dict import get as get_params
from datetime import datetime as dt from datetime import datetime as dt
from requests.adapters import HTTPAdapter, Retry from requests.adapters import HTTPAdapter, Retry
from requests.auth import HTTPDigestAuth from requests.auth import HTTPDigestAuth, HTTPBasicAuth
from requests.exceptions import ConnectionError from requests.exceptions import ConnectionError
@@ -23,7 +23,7 @@ def getImage():
with requests.Session() as s: with requests.Session() as s:
retries = Retry(total = 10, backoff_factor=0.1, status_forcelist=[404,408, 500, 502, 503, 504]) retries = Retry(total = 10, backoff_factor=0.1, status_forcelist=[404,408, 500, 502, 503, 504])
s.mount('http://', HTTPAdapter(max_retries=retries)) s.mount('http://', HTTPAdapter(max_retries=retries))
resp = s.get("http://" + camera_ip + ":" + port + "/cgi-bin/jpg/image.cgi", auth=HTTPDigestAuth("ASS", "amerus@1903"), stream=True) resp = s.get("http://" + camera_ip + ":" + port + "/cgi-bin/jpg/image.cgi?stream=stream3", auth=HTTPBasicAuth("ASS", "amerus@1903"), stream=True)
for block in resp.iter_content(1024): for block in resp.iter_content(1024):
if not block: if not block:
break break

View File

@@ -152,6 +152,7 @@ n2_outlet_pressure,ek_facility,default,periodic,,FLOAT,,,,,Val_N2_Outlet_PSI,2,,
n2_outlet_temp,ek_facility,default,periodic,,FLOAT,,,,,Val_N2_Outlet_Temp,2,,ro,,,none,,,,,,,,,,,,,,,1,,,,,,, n2_outlet_temp,ek_facility,default,periodic,,FLOAT,,,,,Val_N2_Outlet_Temp,2,,ro,,,none,,,,,,,,,,,,,,,1,,,,,,,
n2_purity,ek_facility,default,periodic,,FLOAT,,,,,Val_N2_N2_Purity,2,,ro,,,none,,,,,,,,,,,,,,,1,,,,,,, n2_purity,ek_facility,default,periodic,,FLOAT,,,,,Val_N2_N2_Purity,2,,ro,,,none,,,,,,,,,,,,,,,1,,,,,,,
n2_run_time_lifetime,ek_facility,default,periodic,,FLOAT,,,,,Val_N2_Run_Time,2,,ro,,,none,,,,,,,,,,,,,,,1,,,,,,, n2_run_time_lifetime,ek_facility,default,periodic,,FLOAT,,,,,Val_N2_Run_Time,2,,ro,,,none,,,,,,,,,,,,,,,1,,,,,,,
onyx_pump_motor_current,ek_facility,default,periodic,,FLOAT,,,,,CT_100.Scaled_Out,2,,ro,,,none,,,,,,,,,,,,,,,1,,,,,,,
outlet_o2,ek_facility,default,periodic,,FLOAT,,,,,Val_Outlet_O2,2,,ro,,,none,,,,,,,,,,,,,,,1,,,,,,, outlet_o2,ek_facility,default,periodic,,FLOAT,,,,,Val_Outlet_O2,2,,ro,,,none,,,,,,,,,,,,,,,1,,,,,,,
outlet_orp_temp,ek_facility,default,periodic,,FLOAT,,,,,Val_Outlet_ORP_Temp,2,,ro,,,none,,,,,,,,,,,,,,,1,,,,,,, outlet_orp_temp,ek_facility,default,periodic,,FLOAT,,,,,Val_Outlet_ORP_Temp,2,,ro,,,none,,,,,,,,,,,,,,,1,,,,,,,
outlet_ph,ek_facility,default,periodic,,FLOAT,,,,,Val_Outlet_pH,2,,ro,,,none,,,,,,,,,,,,,,,1,,,,,,, outlet_ph,ek_facility,default,periodic,,FLOAT,,,,,Val_Outlet_pH,2,,ro,,,none,,,,,,,,,,,,,,,1,,,,,,,
1 MeasuringPointName ControllerName GroupName UploadType DeadZonePercent DataType ArrayIndex EnableBit BitIndex reverseBit Address Decimal Len ReadWrite Unit Description Transform Type MaxValue MinValue MaxScale MinScale Gain Offset startBit endBit Pt Ct Mapping_table TransDecimal bitMap msecSample storageLwTSDB DataEndianReverse ReadOffset ReadLength WriteOffset WriteLength DataParseMethod BitId
152 n2_outlet_temp ek_facility default periodic FLOAT Val_N2_Outlet_Temp 2 ro none 1
153 n2_purity ek_facility default periodic FLOAT Val_N2_N2_Purity 2 ro none 1
154 n2_run_time_lifetime ek_facility default periodic FLOAT Val_N2_Run_Time 2 ro none 1
155 onyx_pump_motor_current ek_facility default periodic FLOAT CT_100.Scaled_Out 2 ro none 1
156 outlet_o2 ek_facility default periodic FLOAT Val_Outlet_O2 2 ro none 1
157 outlet_orp_temp ek_facility default periodic FLOAT Val_Outlet_ORP_Temp 2 ro none 1
158 outlet_ph ek_facility default periodic FLOAT Val_Outlet_pH 2 ro none 1

View File

@@ -39,7 +39,7 @@ proto udp
# The hostname/IP and port of the server. # The hostname/IP and port of the server.
# You can have multiple remote entries # You can have multiple remote entries
# to load balance between the servers. # to load balance between the servers.
remote 166.252.175.224 1194 remote 166.136.166.238 1194
remote 172.85.171.82 1194 remote 172.85.171.82 1194
# Choose a random host from the remote # Choose a random host from the remote

View File

@@ -25,7 +25,7 @@ reneg-sec 0
redirect-gateway def1 redirect-gateway def1
ca unifi_ca.crt ca unifiCA.crt
cert unifi_client.crt cert unifiPublic.crt
key unifi_client.key key unifiPrivate.key
tls-auth unifi_tls.key 1 tls-auth unifiTLS.key 1

File diff suppressed because it is too large Load Diff