Edit esp-reterminal-e1001.yaml

esphome/esp-reterminal-e1001.yaml

@@ -795,61 +795,89 @@ display:
           );
           it.line(8, header_y, screen_width - 9, header_y);
 
-          // Four tiles on the top row and three centred on the lower row.
+          // Three-row, three-column nine-job grid.
+          // Row 1: three dog jobs.
           draw_job(
-            8, 70, 0,
+            8, 66, 0,
             "Dog Feeding", "Morning",
             id(job_dog_feeding_morning_state).state,
             id(job_dog_feeding_morning_due_ts).state,
-            id(job_dog_feeding_morning_completed_time).state
+            id(job_dog_feeding_morning_completed_time).state,
+            id(job_dog_feeding_morning_elapsed).state
           );
 
           draw_job(
-            206, 70, 0,
+            272, 66, 0,
             "Dog Feeding", "Evening",
             id(job_dog_feeding_evening_state).state,
             id(job_dog_feeding_evening_due_ts).state,
-            id(job_dog_feeding_evening_completed_time).state
+            id(job_dog_feeding_evening_completed_time).state,
+            id(job_dog_feeding_evening_elapsed).state
           );
 
           draw_job(
-            404, 70, 1,
+            536, 66, 1,
             "Dog", "De-pooping",
             id(job_dog_depooping_state).state,
             id(job_dog_depooping_due_ts).state,
-            id(job_dog_depooping_completed_time).state
+            id(job_dog_depooping_completed_time).state,
+            id(job_dog_depooping_elapsed).state
           );
 
+          // Row 2: dishwasher, rubbish, water TV plant.
           draw_job(
-            602, 70, 2,
+            8, 204, 2,
             "Dishwasher", "Unpacked",
             id(job_dishwasher_unpacked_state).state,
             id(job_dishwasher_unpacked_due_ts).state,
-            id(job_dishwasher_unpacked_completed_time).state
+            id(job_dishwasher_unpacked_completed_time).state,
+            id(job_dishwasher_unpacked_elapsed).state
           );
 
           draw_job(
-            99, 277, 3,
+            272, 204, 3,
             "Rubbish", "Removed",
             id(job_rubbish_removed_state).state,
             id(job_rubbish_removed_due_ts).state,
-            id(job_rubbish_removed_completed_time).state
+            id(job_rubbish_removed_completed_time).state,
+            id(job_rubbish_removed_elapsed).state
           );
 
           draw_job(
-            305, 277, 4,
+            536, 204, 4,
             "Water TV", "Pot Plant",
             id(job_water_tv_pot_plant_state).state,
             id(job_water_tv_pot_plant_due_ts).state,
-            id(job_water_tv_pot_plant_completed_time).state
+            id(job_water_tv_pot_plant_completed_time).state,
+            id(job_water_tv_pot_plant_elapsed).state
           );
 
+          // Row 3: water table plant, dryer, washing machine.
           draw_job(
-            511, 277, 4,
+            8, 342, 4,
             "Water Table", "Pot Plant",
             id(job_water_table_pot_plant_state).state,
             id(job_water_table_pot_plant_due_ts).state,
-            id(job_water_table_pot_plant_completed_time).state
+            id(job_water_table_pot_plant_completed_time).state,
+            id(job_water_table_pot_plant_elapsed).state
+          );
+
+          draw_job(
+            272, 342, 5,
+            "Empty the", "Dryer",
+            id(job_empty_dryer_state).state,
+            id(job_empty_dryer_due_ts).state,
+            id(job_empty_dryer_completed_time).state,
+            id(job_empty_dryer_elapsed).state
+          );
+
+          draw_job(
+            536, 342, 6,
+            "Empty the", "Washing Machine",
+            id(job_empty_washing_machine_state).state,
+            id(job_empty_washing_machine_due_ts).state,
+            id(job_empty_washing_machine_completed_time).state,
+            id(job_empty_washing_machine_elapsed).state
           );
 
 #:########################################################################################:#