Gandalf/OctoPrint-Enclosure
1
0
Fork 0
Code Issues 156 Pull Requests 6 Actions Packages Projects Releases 28 Wiki Activity

Merge pull request #125 from vitormhenrique/dev

Browse Source 
Additional logs...
This commit was merged in pull request #125.
This commit is contained in:
Vitor de Miranda Henrique
2018-04-10 10:22:43 -05:00
committed by GitHub
parent 0fb33458a7 ce17b3cb1e
commit 33928ada17
1 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
octoprint_enclosure/__init__.py
View File

@@ -301,6 +301,8 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
cmd = sudo_str + "python " + script + str(led_pin) + " " + str(led_count) + " " + str(
led_brightness) + " " + str(red) + " " + str(green) + " " + str(blue) + " " + str(address)
if self._settings.get(["debug"]) is True:
if queue_id is not None:
self._logger.info("Runing scheduled queue id %s", queue_id)
self._logger.info("Sending neopixel cmd: %s", cmd)
Popen(cmd, shell=True)
if queue_id is not None:
@@ -413,10 +415,19 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
self._identifier, dict(set_temperature=result))
def stop_queue_item(self, queue_id):
old_list = self.event_queue
if self._settings.get(["debug"]) is True:
self._logger.info("Stoping queue id %s...", queue_id)
for task in self.event_queue:
if self._settings.get(["debug"]) is True:
self._logger.info("Queue id found...")
if task['queue_id'] == queue_id:
task['thread'].cancel()
self.event_queue.remove(task)
if self._settings.get(["debug"]) is True:
self._logger.info("Queue id stoped and removed from list...")
self._logger.info("Old queue list: %s", old_list)
self._logger.info("New queue list: %s", self.event_queue)
def update_ui_outputs(self):
try:
@@ -1024,6 +1035,8 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
try:
GPIO.output(gpio, value)
if self._settings.get(["debug"]) is True:
if queue_id is not None:
self._logger.info("Runing scheduled queue id %s", queue_id)
self._logger.info("Writing on gpio: %s value %s", gpio, value)
self.update_ui()
if queue_id is not None:
@@ -1037,6 +1050,8 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
def write_pwm(self, gpio, pwm_value, queue_id=None):
try:
if queue_id is not None and self._settings.get(["debug"]) is True:
self._logger.info("Runing scheduled queue id %s", queue_id)
for pwm in self.pwm_intances:
if gpio in pwm:
pwm_object = pwm[gpio]
@@ -1183,6 +1198,8 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
if (rpi_output['output_type'] == 'neopixel_indirect' or rpi_output['output_type'] == 'neopixel_direct'):
self.add_neopixel_output_to_queue(
rpi_output, shutdown_delay_seconds, 0, 0, 0, sufix)
if self._settings.get(["debug"]) is True:
self._logger.info("Events scheduled to run %s", self.event_queue)
def start_outpus_with_server(self):
for rpi_output in self.rpi_outputs:
@@ -1224,6 +1241,8 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
rpi_output, delay_seconds, red, green, blue, sufix)
if rpi_output['output_type'] == 'temp_hum_control':
rpi_output['temp_ctr_set_value'] = rpi_output['temp_ctr_default_value']
if self._settings.get(["debug"]) is True:
self._logger.info("Events scheduled to run %s", self.event_queue)
def get_color_from_rgb(self, stringColor):
stringColor = stringColor.replace('rgb(', '')
@@ -1256,6 +1275,9 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
queue_id = '{0!s}_{1!s}'.format(index_id, sufix)
if self._settings.get(["debug"]) is True:
self._logger.info("Scheduling neopixel output id %s for on %s delay_seconds", queue_id, delay_seconds)
thread = threading.Timer(delay_seconds,
self.send_neopixel_command,
args=[gpio_pin, ledCount, ledBrightness, red, green, blue, address, neopixel_direct, index_id, queue_id])
@@ -1265,6 +1287,9 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
def add_pwm_output_to_queue(self, delay_seconds, rpi_output, value, sufix):
queue_id = '{0!s}_{1!s}'.format(rpi_output['index_id'], sufix)
if self._settings.get(["debug"]) is True:
self._logger.info("Scheduling pwm output id %s for on %s delay_seconds", queue_id, delay_seconds)
thread = threading.Timer(delay_seconds,
self.write_pwm,
args=[self.to_int(rpi_output['gpio_pin']), value, queue_id])
@@ -1277,6 +1302,10 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
thread = threading.Timer(delay_seconds,
self.set_pwm_duty_cycle,
args=[rpi_output, value, queue_id])
if self._settings.get(["debug"]) is True:
self._logger.info("Scheduling pwm linked temp output id %s on %s delay_seconds", queue_id, delay_seconds)
self.event_queue.append(dict(queue_id=queue_id, thread=thread))
def set_pwm_duty_cycle(self, rpi_output, value, queue_id):
@@ -1287,6 +1316,9 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
def add_regular_output_to_queue(self, delay_seconds, rpi_output, value, sufix):
queue_id = '{0!s}_{1!s}'.format(rpi_output['index_id'], sufix)
if self._settings.get(["debug"]) is True:
self._logger.info("Scheduling regular output id %s on %s delay_seconds", queue_id, delay_seconds)
thread = threading.Timer(delay_seconds,
self.write_gpio,
args=[self.to_int(rpi_output['gpio_pin']), value, queue_id])