diff --git a/configuration.yaml b/configuration.yaml
index d5e144f..323e151 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -15,7 +15,7 @@ homeassistant:
customize_domain: !include customize_domain.yaml
packages: !include_dir_named packages
- whitelist_external_dirs:
+ allowlist_external_dirs:
- "/home/homeassistant/.homeassistant/www/downloads/camera/patio/"
- "/home/homeassistant/.homeassistant/www/downloads/camera/garage/"
- "/home/homeassistant/.homeassistant/www/downloads/camera/playarea/"
@@ -23,6 +23,7 @@ homeassistant:
- "/home/homeassistant/.homeassistant/www/downloads/camera/frontdoor/"
- "/home/homeassistant/.homeassistant/www/downloads/camera/kitchen/"
- "/home/homeassistant/.homeassistant/www/downloads/camera/frontroom/"
+ - "/home/homeassistant/.homeassistant/www/downloads/camera/3dprinter/"
sun:
alexa:
diff --git a/lovelace/05_tensorflow_view.yaml b/lovelace/05_tensorflow_view.yaml
index a0fe963..26303b1 100644
--- a/lovelace/05_tensorflow_view.yaml
+++ b/lovelace/05_tensorflow_view.yaml
@@ -7,7 +7,7 @@ cards:
entity: camera.frontdoor_latest_scan
camera_image: camera.frontdoor_latest_scan
show_info: true
- tap_action:
+ tap_action:
action: more-info
- type: picture-entity
@@ -16,7 +16,7 @@ cards:
entity: camera.patio_latest_scan
camera_image: camera.patio_latest_scan
show_info: true
- tap_action:
+ tap_action:
action: more-info
- type: picture-entity
@@ -25,7 +25,7 @@ cards:
entity: camera.driveway_latest_scan
camera_image: camera.driveway_latest_scan
show_info: true
- tap_action:
+ tap_action:
action: more-info
- type: picture-entity
@@ -34,7 +34,7 @@ cards:
entity: camera.playarea_latest_scan
camera_image: camera.playarea_latest_scan
show_info: true
- tap_action:
+ tap_action:
action: more-info
- type: picture-entity
@@ -43,7 +43,16 @@ cards:
entity: camera.garage_latest_scan
camera_image: camera.garage_latest_scan
show_info: true
- tap_action:
+ tap_action:
+ action: more-info
+
+ - type: picture-entity
+ id: camera_3dprinter_latest_scan
+ title: 3D Printer Latest Scan
+ entity: camera.3dprinter_latest_scan
+ camera_image: camera.3d_printer_camera
+ show_info: true
+ tap_action:
action: more-info
- type: entities
@@ -60,3 +69,5 @@ cards:
name: Patio Camera
- entity: image_processing.tensorflow_playarea_camera
name: Playarea Camera
+ - entity: image_processing.tensorflow_3d_printer_camera
+ name: 3D Printer Camera
diff --git a/lovelace/12_automations_view.yaml b/lovelace/12_automations_view.yaml
index 09bf78c..c85b8c8 100644
--- a/lovelace/12_automations_view.yaml
+++ b/lovelace/12_automations_view.yaml
@@ -6,12 +6,9 @@ cards:
show_header_toggle: false
entities:
- automation.family_room_cube_event_flip180
- - automation.family_room_cube_event_flip180_2
- automation.family_room_cube_event_flip90
- automation.family_room_cube_event_move
- - automation.family_room_cube_event_move_2
- automation.family_room_cube_event_shake
- - automation.family_room_cube_event_shake_2
- automation.family_room_cube_event_tap_twice
- automation.front_room_cube_event_flip90
- automation.hasika_room_cube_event_flip90
@@ -95,13 +92,23 @@ cards:
- automation.upstairs_aroma_timer_start
- automation.wfh_timer_start
+ - type: entities
+ title: 3D Printer Automations
+ show_header_toggle: false
+ entities:
+ - automation.3d_print_send_telegram_pictures
+ - automation.3d_print_job_finished
+ - automation.3d_print_progress_update
+ - automation.3d_print_state_changed
+ - automation.3d_print_notify_printer_state
+ - automation.3d_print_notify_printer_error
+
- type: entities
title: Garage Automations
show_header_toggle: false
entities:
- automation.garage_lights_on_when_door_is_opened
- automation.garage_motion_reset
- - automation.garage_motion_timer
- automation.garage_timer_elapsed
- automation.garage_timer_start_when_garage_lights_on
- automation.notify_garage_door_status
diff --git a/lovelace/15_3d_printer.yaml b/lovelace/15_3d_printer.yaml
index 7e3107c..100b53b 100644
--- a/lovelace/15_3d_printer.yaml
+++ b/lovelace/15_3d_printer.yaml
@@ -60,4 +60,16 @@ cards:
title: 3D Printer Control
show_header_toggle: false
entities:
- - switch.3d_printer
+ - entity: switch.3d_printer
+ name: Ender 3 Pro 3D Printer
+
+ - type: entities
+ title: 3D Printer Automations
+ show_header_toggle: false
+ entities:
+ - automation.3d_print_send_telegram_pictures
+ - automation.3d_print_job_finished
+ - automation.3d_print_progress_update
+ - automation.3d_print_state_changed
+ - automation.3d_print_notify_printer_state
+ - automation.3d_print_notify_printer_error
diff --git a/packages/3dprinting.yaml b/packages/3dprinting.yaml
index f316aa8..a7c1806 100644
--- a/packages/3dprinting.yaml
+++ b/packages/3dprinting.yaml
@@ -139,7 +139,7 @@ automation:
# Notify when the printer status changed from "Prnting" to anything.
# Use this later to determine if you want to turn off printer or not
#
- - alias: "Octoprint 3D Print"
+ - alias: "3D Print State Changed"
trigger:
platform: state
entity_id: "sensor.octoprint_current_state"
@@ -152,7 +152,7 @@ automation:
#
# Updates on the Printer Status
#
- - alias: "Octoprint Notify Printer State"
+ - alias: "3D Print Notify Printer State"
trigger:
platform: state
entity_id: "binary_sensor.octoprint_printing"
@@ -164,7 +164,7 @@ automation:
#
# Notifies when the printer errors out
#
- - alias: "Octoprint Noify Printer Error"
+ - alias: "3D Print Notify Printer Error"
trigger:
platform: state
entity_id: binary_sensor.octoprint_printing_error
@@ -177,7 +177,7 @@ automation:
#
# Updates appropriate input booleans based on percentage complete
#
- - alias: "Update Percentage Booleans"
+ - alias: "3D Print Update Percentage Booleans"
trigger:
platform: state
entity_id: sensor.octoprint_job_percentage
@@ -194,7 +194,7 @@ automation:
#
# Provides update at frequent intervals - 25%, 50%, 75%, and 100%!
#
- - alias: "Octoprint 3D Printer Progress Update"
+ - alias: "3D Print Progress Update"
trigger:
platform: state
entity_id: input_boolean.twenty_five_percent, input_boolean.fifty_percent, input_boolean.seventy_five_percent, input_boolean.hundred_percent
@@ -221,7 +221,7 @@ automation:
# Resetting input boleans is not necessary as they get updated automatically when
# octoprint job percentage value chaanges... but why not?
#
- - alias: "Job Finished"
+ - alias: "3d Print Job Finished"
trigger:
platform: state
entity_id: input_boolean.hundred_percent
@@ -247,7 +247,7 @@ automation:
#
# If the printer is ON and is "Printing", it will send a snapshot/picture every 30 minutes
#
- - alias: "Send 3D Print Pictures"
+ - alias: "3D Print Send Telegram Pictures"
trigger:
platform: time_pattern
minutes: "/30"
@@ -263,10 +263,10 @@ automation:
entity_id: camera.3d_printer_camera
filename: "/home/homeassistant/.homeassistant/www/downloads/camera/3dprinter/print_latest.jpg"
- service: notify.telegram
- data:
+ data_template:
title: "3D Printer"
message: "Print Progress"
data:
photo:
- file: "/home/homeassistant/.homeassistant/www/downloads/camera/3dprinter/print_latest.jpg"
- caption: "3D Print Progress"
+ caption: "3D Print Progress at {{ states('sensor.octoprint_job_percentage') }}%"
diff --git a/packages/cameras.yaml b/packages/cameras.yaml
index f309ea3..9c34167 100644
--- a/packages/cameras.yaml
+++ b/packages/cameras.yaml
@@ -72,6 +72,9 @@ camera:
- platform: local_file
name: Garage Latest Scan
file_path: "/home/homeassistant/.homeassistant/www/downloads/camera/garage/garage_latest.jpg"
+ - platform: local_file
+ name: 3dPrinter Latest Scan
+ file_path: "/home/homeassistant/.homeassistant/www/downloads/camera/3dprinter/print_latest.jpg"
binary_sensor:
- platform: hikvision
@@ -112,11 +115,12 @@ image_processing:
- entity_id: camera.patio_camera
- entity_id: camera.playarea_camera
- entity_id: camera.garage_camera
+ - entity_id: camera.3d_printer_camera
file_out:
- "/home/homeassistant/.homeassistant/www/downloads/camera/{{- camera_entity.split('.')[1].split('_')[0] -}}/{{ camera_entity.split('.')[1].split('_')[0] }}_latest.jpg"
- "/home/homeassistant/.homeassistant/www/downloads/camera/{{- camera_entity.split('.')[1].split('_')[0] -}}/{{ camera_entity.split('.')[1].split('_')[0] }}_{{ now().strftime('%Y%m%d_%H%M%S') }}.jpg"
model:
- graph: /home/homeassistant/.homeassistant/tensorflow/
+ graph: /home/homeassistant/.homeassistant/tensorflow/models/efficientdet_d0_coco17_tpu-32/
# graph: /home/homeassistant/.homeassistant/tensorflow/frozen_inference_graph.pb
# categories:
# - person
diff --git a/zwcfg_0xd89c4f0c.xml b/zwcfg_0xd89c4f0c.xml
index 6b6a3ea..32c691c 100644
--- a/zwcfg_0xd89c4f0c.xml
+++ b/zwcfg_0xd89c4f0c.xml
@@ -289,9 +289,9 @@
-
-
-
+
+
+
@@ -577,9 +577,9 @@
-
+
-
+
@@ -758,8 +758,8 @@