3d printer related updates.

lovelace/03_camera_view.yaml

@@ -1,7 +1,6 @@
 title: Camera Live
 icon: mdi:cctv
 cards:
-
   - type: horizontal-stack
     cards:
       - type: "custom:button-card"
@@ -13,7 +12,7 @@ cards:
           - font-weight: bold
           - color: rgb(0, 0, 5)
         state:
-          - value: 'frontyard'
+          - value: "frontyard"
             color: var(--primary-color)
         action: service
         service:
@@ -29,7 +28,7 @@ cards:
           - font-weight: bold
           - color: rgb(0, 0, 5)
         state:
-          - value: 'driveway'
+          - value: "driveway"
             color: var(--primary-color)
         action: service
         service:
@@ -45,7 +44,7 @@ cards:
           - font-weight: bold
           - color: rgb(0, 0, 5)
         state:
-          - value: 'patio'
+          - value: "patio"
             color: var(--primary-color)
         action: service
         service:
@@ -61,7 +60,7 @@ cards:
           - font-weight: bold
           - color: rgb(0, 0, 5)
         state:
-          - value: 'playarea'
+          - value: "playarea"
             color: var(--primary-color)
         action: service
         service:
@@ -75,7 +74,7 @@ cards:
     camera_image: camera.frontdoor_camera
     camera_view: live
     show_info: true
-    tap_action: 
+    tap_action:
       action: more-info
     entities:
       - switch.frontyard_light
@@ -88,7 +87,7 @@ cards:
     entity: camera.patio_camera
     camera_image: camera.patio_camera
     show_info: true
-    tap_action: 
+    tap_action:
       action: more-info
     entities:
       - switch.wemobackyardlightswitch
@@ -101,7 +100,7 @@ cards:
     entity: camera.driveway_camera
     camera_image: camera.driveway_camera
     show_info: true
-    tap_action: 
+    tap_action:
       action: more-info
     entities:
       - switch.frontyard_light
@@ -115,7 +114,7 @@ cards:
     entity: camera.playarea_camera
     camera_image: camera.playarea_camera
     show_info: true
-    tap_action: 
+    tap_action:
       action: more-info
     entities:
       - switch.wemobackyardlightswitch
@@ -128,7 +127,7 @@ cards:
     entity: camera.garage_camera
     camera_image: camera.garage_camera
     show_info: true
-    tap_action: 
+    tap_action:
       action: more-info
     entities:
       - switch.garage
@@ -136,17 +135,29 @@ cards:
       - binary_sensor.two_car_garage_door_tilt_sensor_sensor
 
   - type: picture-glance
-    id: camera_kitchen_camera
-    title: Kitchen Camera
-    entity: camera.kitchen_camera
-    camera_image: camera.kitchen_camera
+    id: camera_3dprinter_camera
+    title: 3D Printer Camera
+    entity: camera.3d_printer_camera
+    camera_image: camera.3d_printer_camera
     show_info: true
-    tap_action: 
+    tap_action:
       action: more-info
     entities:
-      - switch.kitchen
-      - binary_sensor.kitchen_camera_motion
-      - binary_sensor.back_door_sensor_sensor
+      - binary_sensor.motion_sensor_158d00016c2d0e
+      - binary_sensor.octoprint_printing
+
+  # - type: picture-glance
+  #   id: camera_kitchen_camera
+  #   title: Kitchen Camera
+  #   entity: camera.kitchen_camera
+  #   camera_image: camera.kitchen_camera
+  #   show_info: true
+  #   tap_action:
+  #     action: more-info
+  #   entities:
+  #     - switch.kitchen
+  #     - binary_sensor.kitchen_camera_motion
+  #     - binary_sensor.back_door_sensor_sensor
 
   # - type: picture-glance
   #   id: camera_frontroom_camera
@@ -154,7 +165,7 @@ cards:
   #   entity: camera.frontroom_camera
   #   camera_image: camera.frontroom_camera
   #   show_info: true
-  #   tap_action: 
+  #   tap_action:
   #     action: more-info
   #   entities:
   #     - binary_sensor.frontdoor_camera_motion

lovelace/15_3d_printer.yaml

@@ -11,6 +11,7 @@ cards:
       action: more-info
     entities:
       - binary_sensor.motion_sensor_158d00016c2d0e
+      - binary_sensor.octoprint_printing
 
   - type: vertical-stack
     cards:
@@ -26,24 +27,16 @@ cards:
     show_header_toggle: false
     entities:
       - binary_sensor.octoprint_printing
-      - binary_sensor.octoprint_printing_error
-      - sensor.octoprint_actual_bed_temp
-      - sensor.octoprint_actual_tool0_temp
       - sensor.octoprint_current_state
-      - sensor.octoprint_job_percentage
-      - sensor.octoprint_target_bed_temp
-      - sensor.octoprint_target_tool0_temp
-      - sensor.octoprint_time_elapsed
-      - sensor.octoprint_time_remaining
-
-  - type: entities
-    title: Percentage Complete
-    show_header_toggle: false
-    entities:
-      - input_boolean.twenty_five_percent
-      - input_boolean.fifty_percent
-      - input_boolean.seventy_five_percent
-      - input_boolean.hundred_percent
+      - binary_sensor.octoprint_printing_error
+      - entity: sensor.octoprint_actual_bed_temp_c
+        name: Print Bed Temperature
+      - entity: sensor.octoprint_target_bed_temp_c
+        name: Target Bed Temperature
+      - entity: sensor.octoprint_actual_tool0_temp_c
+        name: Extruder Temperature
+      - entity: sensor.octoprint_target_tool0_temp_c
+        name: Extruder Target Temperature
 
   - type: entities
     title: Print Times
@@ -53,10 +46,18 @@ cards:
         name: Elapsed
       - entity: sensor.time_estimated
         name: Estimated
+      - entity: sensor.print_completion
+        name: Print Completion
 
   - type: entities
-    title: 3D Printer
+    title: 3D Printer Settings
+    show_header_toggle: false
+    entities:
+      - input_boolean.power_off_when_complete
+      - input_boolean.send_progress_pictures
+
+  - type: entities
+    title: 3D Printer Control
     show_header_toggle: false
     entities:
       - switch.3d_printer
-      - input_boolean.power_off_when_complete