- {%- if misc.enable_upgrade_check == true -%}
+ {%- if settings.enable_upgrade_check == true -%}
{{form_settings_general.enable_upgrade_check(checked=True)}}
{%- else -%}
{{form_settings_general.enable_upgrade_check()}}
@@ -323,37 +304,37 @@
{{form_settings_general.output_usage_report_gen.label(class_='col-sm-12 control-label checkbox-nopad')}}
- {%- if misc.output_usage_report_gen == true -%}
+ {%- if settings.output_usage_report_gen == true -%}
{{form_settings_general.output_usage_report_gen(checked=True)}}
{%- else -%}
{{form_settings_general.output_usage_report_gen()}}
@@ -365,22 +346,22 @@
{{dict_translation['energy_usage']['title']}} Settings
{{form_settings_general.output_usage_report_span.label(class_='col-sm-12 control-label checkbox-nopad')}}
@@ -393,37 +374,37 @@
Controller Sample Rate Settings
diff --git a/mycodo/mycodo_flask/utils/utils_settings.py b/mycodo/mycodo_flask/utils/utils_settings.py
index 56ca4dd9a..6823fddaa 100644
--- a/mycodo/mycodo_flask/utils/utils_settings.py
+++ b/mycodo/mycodo_flask/utils/utils_settings.py
@@ -388,7 +388,12 @@ def settings_general_mod(form):
mod_misc.force_https = form.force_https.data
mod_misc.rpyc_timeout = form.rpyc_timeout.data
mod_misc.custom_css = form.custom_css.data
+ mod_misc.brand_display = form.brand_display.data
+ mod_misc.title_display = form.title_display.data
mod_misc.hostname_override = form.hostname_override.data
+ if form.brand_image.data:
+ mod_misc.brand_image = form.brand_image.data.read()
+ mod_misc.brand_image_height = form.brand_image_height.data
mod_misc.daemon_debug_mode = form.daemon_debug_mode.data
mod_misc.hide_alert_success = form.hide_success.data
mod_misc.hide_alert_info = form.hide_info.data
diff --git a/mycodo/outputs/value_dac_gp8xxx_iic.py b/mycodo/outputs/value_dac_gp8xxx_iic.py
new file mode 100644
index 000000000..816c659ba
--- /dev/null
+++ b/mycodo/outputs/value_dac_gp8xxx_iic.py
@@ -0,0 +1,240 @@
+# coding=utf-8
+#
+# value_gp8403_dac_gp8xxx_iic.py - Output for controlling the GP8403 2-channel DAC (0-10 VDC)
+#
+import copy
+import time
+
+from flask_babel import lazy_gettext
+
+from mycodo.databases.models import OutputChannel
+from mycodo.outputs.base_output import AbstractOutput
+from mycodo.utils.constraints_pass import constraints_pass_positive_or_zero_value
+from mycodo.utils.database import db_retrieve_table_daemon
+from mycodo.utils.influx import add_measurements_influxdb
+
+measurements_dict = {
+ 0: {
+ 'measurement': 'electrical_potential',
+ 'unit': 'V'
+ },
+ 1: {
+ 'measurement': 'electrical_potential',
+ 'unit': 'V'
+ }
+}
+
+channels_dict = {
+ 0: {
+ 'types': ['value'],
+ 'measurements': [0]
+ },
+ 1: {
+ 'types': ['value'],
+ 'measurements': [1]
+ }
+}
+
+OUTPUT_INFORMATION = {
+ 'output_name_unique': 'OUTPUT_GP8XXX_IIC_DAC_0_10_VDC',
+ 'output_name': "{}: GP8XXX (8403) 2-Channel DAC: 0-10 VDC".format(lazy_gettext('Value')),
+ 'output_library': 'GP8XXX-IIC',
+ 'output_manufacturer': 'Mycodo',
+ 'measurements_dict': measurements_dict,
+ 'channels_dict': channels_dict,
+ 'output_types': ['value'],
+
+ 'url_additional': 'https://www.dfrobot.com/product-2613.html',
+
+ 'message': 'Output a 0 to 10 VDC signal.',
+
+ 'dependencies_module': [
+ ('pip-pypi', 'smbus2', 'smbus2==0.4.1'),
+ ('pip-pypi', 'GP8XXX_IIC', 'GP8XXX-IIC==0.0.1')
+ ],
+
+ 'options_enabled': [
+ 'i2c_location',
+ 'button_send_value'
+ ],
+ 'options_disabled': ['interface'],
+
+ 'interfaces': ['I2C'],
+ 'i2c_location': ['0x58'],
+ 'i2c_address_editable': True,
+
+ 'custom_channel_options': [
+ {
+ 'id': 'state_start',
+ 'type': 'select',
+ 'default_value': 'value',
+ 'options_select': [
+ ('saved', 'Previously-Saved State'),
+ ('value', 'Specified Value')
+ ],
+ 'name': 'Start State',
+ 'phrase': 'Select the channel start state'
+ },
+ {
+ 'id': 'state_start_value',
+ 'type': 'float',
+ 'default_value': 0,
+ 'constraints_pass': constraints_pass_positive_or_zero_value,
+ 'name': 'Start Value (volts)',
+ 'phrase': 'If Specified Value is selected, set the start state value'
+ },
+ {
+ 'id': 'state_shutdown',
+ 'type': 'select',
+ 'default_value': 'value',
+ 'options_select': [
+ ('saved', 'Previously-Saved Value'),
+ ('value', 'Specified Value')
+ ],
+ 'name': 'Shutdown State',
+ 'phrase': 'Select the channel shutdown state'
+ },
+ {
+ 'id': 'state_shutdown_value',
+ 'type': 'float',
+ 'default_value': 0,
+ 'constraints_pass': constraints_pass_positive_or_zero_value,
+ 'name': 'Shutdown Value (volts)',
+ 'phrase': 'If Specified Value is selected, set the shutdown state value'
+ },
+ {
+ 'id': 'off_value',
+ 'type': 'float',
+ 'default_value': 0,
+ 'constraints_pass': constraints_pass_positive_or_zero_value,
+ 'name': 'Off Value (volts)',
+ 'phrase': 'If Specified Value to apply when turned off'
+ }
+ ]
+}
+
+
+class OutputModule(AbstractOutput):
+ """An output support class that operates an output."""
+ def __init__(self, output, testing=False):
+ super().__init__(output, testing=testing, name=__name__)
+
+ self.GP8403 = None
+
+ output_channels = db_retrieve_table_daemon(
+ OutputChannel).filter(OutputChannel.output_id == self.output.unique_id).all()
+ self.options_channels = self.setup_custom_channel_options_json(
+ OUTPUT_INFORMATION['custom_channel_options'], output_channels)
+
+ def initialize(self):
+ from GP8XXX_IIC import GP8403
+
+ self.GP8403 = GP8403(i2c_addr=int(str(self.output.i2c_location), 16), bus=self.output.i2c_bus, auto_range=True)
+
+ self.setup_output_variables(OUTPUT_INFORMATION)
+
+ timer = time.time()
+ while self.GP8403.begin() != 0:
+ self.logger.error("init error")
+ if time.time() - timer > 5: # Max 5 second wait
+ self.logger.error("Could not initialize after 5 seconds")
+ return
+ time.sleep(1)
+
+ self.GP8403.set_dac_outrange(GP8403.OUTPUT_RANGE_10V)
+
+ # Set start channel values
+ for channel in channels_dict:
+ value_volts = None
+
+ if (self.options_channels['state_start'][channel] == "value" and
+ self.options_channels['state_start_value'][channel]):
+ value_volts = self.options_channels['state_start_value'][channel]
+ elif (self.options_channels['state_start'][channel] == "saved" and
+ self.get_custom_option(f"saved_channel_{channel}_value") is not None):
+ value_volts = self.get_custom_option(f"saved_channel_{channel}_value")
+
+ if value_volts is not None:
+ if self.options_channels['state_start_value'][channel] > 10:
+ self.logger.error(f"Startup value cannot be greater than 10 VDC. Value provided: {value_volts}")
+ value = 4096
+ elif self.options_channels['state_start_value'][channel] < 0:
+ self.logger.error(f"Startup value cannot be less than 0 VDC. Value provided: {value_volts}")
+ value = 0
+ else:
+ value = value_volts / 10 * 4096
+ self.GP8403.set_dac_out_voltage(voltage=value, channel=channel)
+
+ self.output_setup = True
+
+ def output_switch(self, state, output_type=None, amount=None, output_channel=0):
+ measure_dict = copy.deepcopy(measurements_dict)
+
+ try:
+ if state == 'on' and amount is not None:
+ if amount > 10:
+ self.logger.error(f"Startup value cannot be greater than 10 VDC. Value provided: {amount}")
+ value = 4096
+ elif amount < 0:
+ self.logger.error(f"Startup value cannot be less than 0 VDC. Value provided: {amount}")
+ value = 0
+ else:
+ value = amount / 10 * 4096
+
+ self.GP8403.set_dac_out_voltage(voltage=value, channel=output_channel)
+ self.output_states[output_channel] = amount
+ measure_dict[output_channel]['value'] = amount
+
+ self.set_custom_option(f"saved_channel_{output_channel}_value", amount)
+ elif state == 'off':
+ self.GP8403.set_dac_out_voltage(
+ voltage=self.options_channels['off_value'][output_channel], channel=output_channel)
+ if self.options_channels['off_value'][output_channel]:
+ self.output_states[output_channel] = self.options_channels['off_value'][output_channel]
+ else:
+ self.output_states[output_channel] = False
+ measure_dict[output_channel]['value'] = self.options_channels['off_value'][output_channel]
+
+ self.set_custom_option(f"saved_channel_{output_channel}_value", amount)
+ except Exception as e:
+ self.logger.error("State change error: {}".format(e))
+ return
+
+ add_measurements_influxdb(self.unique_id, measure_dict)
+
+ def is_on(self, output_channel=0):
+ if self.is_setup():
+ if output_channel is not None and output_channel in self.output_states:
+ return self.output_states[output_channel]
+ else:
+ return self.output_states
+
+ def is_setup(self):
+ return self.output_setup
+
+ def stop_output(self):
+ """Called when Output is stopped."""
+ if self.is_setup():
+ for channel in channels_dict:
+ value_volts = None
+
+ if (self.options_channels['state_shutdown'][channel] == "value" and
+ self.options_channels['state_shutdown_value'][channel]):
+ value_volts = self.options_channels['state_shutdown_value'][channel]
+ elif (self.options_channels['state_shutdown'][channel] == "saved" and
+ self.get_custom_option(f"saved_channel_{channel}_value") is not None):
+ value_volts = self.get_custom_option(f"saved_channel_{channel}_value")
+
+ if value_volts is not None:
+ if value_volts > 10:
+ self.logger.error(f"Startup value cannot be greater than 10 VDC. Value provided: {value_volts}")
+ value = 4096
+ elif value_volts < 0:
+ self.logger.error(f"Startup value cannot be less than 0 VDC. Value provided: {value_volts}")
+ value = 0
+ else:
+ value = value_volts / 10 * 4096
+
+ self.GP8403.set_dac_out_voltage(voltage=value, channel=channel)
+
+ self.running = False
diff --git a/mycodo/outputs/value_dac_p8403.py b/mycodo/outputs/value_dac_p8403.py
index 0962f7915..8995c52bc 100644
--- a/mycodo/outputs/value_dac_p8403.py
+++ b/mycodo/outputs/value_dac_p8403.py
@@ -1,6 +1,6 @@
# coding=utf-8
#
-# value_gp8403_dac_0_10_vdc.py - Output for controlling the GP8403 2-channel DAC (0-10 VDC)
+# value_gp8403_dac_p8403.py - Output for controlling the GP8403 2-channel DAC (0-10 VDC)
#
import copy
import time
diff --git a/mycodo/widgets/widget_measurement.py b/mycodo/widgets/widget_measurement.py
index bf2f0449e..c5bfd9911 100644
--- a/mycodo/widgets/widget_measurement.py
+++ b/mycodo/widgets/widget_measurement.py
@@ -186,7 +186,7 @@
{%- for each_function in function if each_function.unique_id == device_id and measurement_id in device_measurements_dict -%}
-
+
{%- if dict_measure_units[measurement_id] in dict_units and
dict_units[dict_measure_units[measurement_id]]['unit'] and
widget_options['enable_unit'] -%}
@@ -220,7 +220,7 @@
{%- for each_output in output if each_output.unique_id == device_id and measurement_id in device_measurements_dict -%}
-
+
{%- if dict_measure_units[measurement_id] in dict_units and
dict_units[dict_measure_units[measurement_id]]['unit'] and
widget_options['enable_unit'] -%}
@@ -254,7 +254,7 @@
{%- for each_pid in pid if each_pid.unique_id == device_id and measurement_id in device_measurements_dict -%}
-
+
{%- if dict_measure_units[measurement_id] in dict_units and
dict_units[dict_measure_units[measurement_id]]['unit'] and
widget_options['enable_unit'] -%}