pump updates

TheRealFalseReality · Feb 13, 2025 · 4fcf41b · 4fcf41b
1 parent 267402e
commit 4fcf41b
Show file tree

Hide file tree

Showing 5 changed files with 688 additions and 64 deletions.
diff --git a/common/ezo_commands.yaml b/common/ezo_commands.yaml
@@ -1,49 +1,59 @@
 substitutions:
-  # PMP circuit, who's default address is 103
-  addPMP_default: "103" #White
-  addPMP_alt1: "108" # Waste/Red
-  addPMP_alt2: "109" # Clean/Green
-  addPMP_alt3: "110" #Orange
-  addPMP_alt4: "106" # Blue
+  # # PMP circuit, who's default address is 103
+  # addPMP_default: "103" #White
+  # addPMP_alt1: "108" # Waste/Red
+  # addPMP_alt2: "109" # Clean/Green
+  # addPMP_alt3: "110" #Orange
+  # addPMP_alt4: "106" # Blue
 
 button:
   # Change I2C Address of EZO-PMP
   - platform: template
-    name: "Pump(Blue) -> ${addPMP_alt4} - Change I2C Address"
+    name: "Pump(Blue) -> ${addPMP_blue} - Change I2C Address"
     on_press:
         then:
         - ezo_pmp.change_i2c_address:
             id: ezo_pump_white
-            address: ${addPMP_alt4}
+            address: ${addPMP_blue}
     web_server:
       sorting_group_id: sorting_group_config
 
   - platform: template
-    name: "Pump(Red) -> ${addPMP_alt1} - Change I2C Address"
+    name: "Pump(Yellow) -> ${addPMP_yellow} - Change I2C Address"
     on_press:
         then:
         - ezo_pmp.change_i2c_address:
             id: ezo_pump_white
-            address: ${addPMP_alt1}
+            address: ${addPMP_yellow}
     web_server:
       sorting_group_id: sorting_group_config
 
   - platform: template
-    name: "Pump(Green) -> ${addPMP_alt2} - Change I2C Address"
+    name: "Pump(Red) -> ${addPMP_red} - Change I2C Address"
     on_press:
         then:
         - ezo_pmp.change_i2c_address:
             id: ezo_pump_white
-            address: ${addPMP_alt2}
+            address: ${addPMP_red}
     web_server:
       sorting_group_id: sorting_group_config
 
   - platform: template
-    name: "Pump(Orange) -> ${addPMP_alt3} - Change I2C Address"
+    name: "Pump(Green) -> ${addPMP_green} - Change I2C Address"
     on_press:
         then:
         - ezo_pmp.change_i2c_address:
             id: ezo_pump_white
-            address: ${addPMP_alt3}
+            address: ${addPMP_green}
+    web_server:
+      sorting_group_id: sorting_group_config
+
+  - platform: template
+    name: "Pump(Orange) -> ${addPMP_orange} - Change I2C Address"
+    on_press:
+        then:
+        - ezo_pmp.change_i2c_address:
+            id: ezo_pump_white
+            address: ${addPMP_orange}
     web_server:
       sorting_group_id: sorting_group_config
diff --git a/common/ezo_pmp.yaml b/common/ezo_pmp.yaml
@@ -69,7 +69,7 @@ sensor:
     id: ezo_pump_white
     current_volume_dosed:
       id: current_volume_dosed
-      name: Pump - Current Volume Dosed
+      name: Pump White - Current Volume Dosed
       icon: mdi:cube-scan
       device_class: 'volume'
       unit_of_measurement: 'mL'
@@ -80,7 +80,7 @@ sensor:
     id: ezo_pump_white
     total_volume_dosed:
       id: total_volume_dosed
-      name: Pump - Total Volume Dosed
+      name: Pump White - Total Volume Dosed
       icon: mdi:timer-sand-empty
       device_class: 'volume'
       unit_of_measurement: 'mL'
@@ -92,7 +92,7 @@ sensor:
     absolute_total_volume_dosed:
       id: absolute_total_volume_dosed
       disabled_by_default: true
-      name: Pump - Absolute Total Volume Dosed
+      name: Pump White - Absolute Total Volume Dosed
       icon: mdi:timer-sand-full
       device_class: 'volume'
       state_class: total
@@ -103,7 +103,7 @@ sensor:
     id: ezo_pump_white
     last_volume_requested:
       id: last_volume_requested
-      name: Pump - Last Volume Requested
+      name: Pump White - Last Volume Requested
       icon: mdi:history
       disabled_by_default: true
       device_class: 'volume'
@@ -115,7 +115,7 @@ sensor:
     id: ezo_pump_white
     max_flow_rate:
       id: max_flow_rate
-      name: Pump - Max Volume/Time Flow Rate
+      name: Pump White - Max Volume/Time Flow Rate
       icon: mdi:car-speed-limiter
       disabled_by_default: true
       unit_of_measurement: 'mL/min'
@@ -125,7 +125,7 @@ sensor:
     id: ezo_pump_white
     pump_voltage:
       id: pump_white_voltage
-      name: Pump - Voltage
+      name: Pump White - Voltage
       icon: mdi:lightning-bolt-circle
       disabled_by_default: true
       device_class: 'voltage'
@@ -137,15 +137,15 @@ binary_sensor:
     id: ezo_pump_white
     pump_state:
       id: pump_white_state
-      name: Pump - State
+      name: Pump White - State
       icon: mdi:pump
       web_server:
         sorting_group_id: sorting_group_pump_white
   - platform: ezo_pmp
     id: ezo_pump_white
     is_paused:
       id: is_paused
-      name: Pump - Paused Status
+      name: Pump White - Paused Status
       disabled_by_default: true
       icon: mdi:pause
       web_server:
@@ -156,15 +156,15 @@ text_sensor:
     id: ezo_pump_white
     dosing_mode:
       id: dosing_mode
-      name: Pump - Dosing Mode 
+      name: Pump White - Dosing Mode 
       icon: mdi:auto-mode
       web_server:
         sorting_group_id: sorting_group_pump_white
   - platform: ezo_pmp
     id: ezo_pump_white
     calibration_status:
       id: calibration_status
-      name: Pump - Calibration Status
+      name: Pump White - Calibration Status
       disabled_by_default: true
       icon: mdi:tape-measure
       web_server:
@@ -174,7 +174,7 @@ number:
   - platform: template
     id: volume
     icon: mdi:pump
-    name: Pump - Volume to Dose
+    name: Pump White - Volume to Dose
     device_class: 'volume'
     unit_of_measurement: 'mL'
     optimistic: true
@@ -188,7 +188,7 @@ number:
   - platform: template
     id: duration
     icon: mdi:timer
-    name: Pump - Time to Dose
+    name: Pump White - Time to Dose
     device_class: 'duration'
     unit_of_measurement: 'min'
     optimistic: true
@@ -202,7 +202,7 @@ number:
   - platform: template
     id: flow_rate
     icon: mdi:waves-arrow-right
-    name: Pump - Volume/Time Flow Rate
+    name: Pump White - Volume/Time Flow Rate
     unit_of_measurement: 'mL/min'
     optimistic: true
     initial_value: 10
@@ -215,7 +215,7 @@ number:
 
 button:
   - platform: template
-    name: Pump - Dose Volume for Time
+    name: Pump White - Dose Volume for Time
     icon: mdi:clock-time-two-outline
     id: dose_over_time
     on_press:
@@ -228,7 +228,7 @@ button:
     web_server:
       sorting_group_id: sorting_group_pump_white
   - platform: template
-    name: Pump - Dose Continuously
+    name: Pump White - Dose Continuously
     icon: mdi:infinity
     id: dose_continuously
     on_press:
@@ -237,7 +237,7 @@ button:
     web_server:
       sorting_group_id: sorting_group_pump_white
   - platform: template
-    name: Pump - Dose Volume
+    name: Pump White - Dose Volume
     icon: mdi:pump
     id: dose_volume
     on_press:
@@ -248,7 +248,7 @@ button:
     web_server:
       sorting_group_id: sorting_group_pump_white
   - platform: template
-    name: Pump - Dose at Volume/Time Flow Rate for Time
+    name: Pump White - Dose at Volume/Time Flow Rate for Time
     icon: mdi:format-text-wrapping-overflow
     id: dose_flow_rate
     on_press:
@@ -261,7 +261,7 @@ button:
     web_server:
       sorting_group_id: sorting_group_pump_white
   - platform: template
-    name: Pump - Pause Dosing
+    name: Pump White - Pause Dosing
     icon: mdi:pause
     id: dose_pause
     on_press:
@@ -270,7 +270,7 @@ button:
     web_server:
       sorting_group_id: sorting_group_pump_white
   - platform: template
-    name: Pump - Stop Dosing
+    name: Pump White - Stop Dosing
     icon: mdi:stop
     id: dose_stop
     on_press:
@@ -279,7 +279,7 @@ button:
     web_server:
       sorting_group_id: sorting_group_pump_white
   - platform: template
-    name: Pump - Clear Total Volume Dosed
+    name: Pump White - Clear Total Volume Dosed
     disabled_by_default: true
     icon: mdi:backspace
     id: dose_clear
@@ -291,7 +291,7 @@ button:
 
   # Calibrate
   - platform: template
-    name: Pump - Set Calibration Volume
+    name: Pump White - Set Calibration Volume
     icon: mdi:tape-measure
     id: dose_calibrate_volume
     on_press:
@@ -302,7 +302,7 @@ button:
     web_server:
       sorting_group_id: sorting_group_pump_white
   - platform: template
-    name: Pump - Clear Calibration Volume
+    name: Pump White - Clear Calibration Volume
     icon: mdi:cancel
     disabled_by_default: true
     id: dose_calibrate_volume_clear