Added second hot end management

repier37 · Jun 19, 2023 · e31bedb · e31bedb
1 parent d75cdb0
commit e31bedb
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 10 deletions.
diff --git a/dist/duet-card.js b/dist/duet-card.js
diff --git a/dist/index.html b/dist/index.html
@@ -19,7 +19,15 @@
                         'sensor.dbot_tool_1_current_temperature' : {
                             state: 214.7,
                             attributes: {
-                                unit_of_measurement: "°C"
+                                unit_of_measurement: "°C",
+                                friendly_name: "Coucou"
+                            }
+                        },
+                        'sensor.dbot_tool_2_current_temperature' : {
+                            state: 180.7,
+                            attributes: {
+                                unit_of_measurement: "°C",
+                                friendly_name: "hotend 2"
                             }
                         },
                         'sensor.dbot_tool_bed_current_temperature' : {
@@ -76,6 +84,7 @@
                     monitored: [
                         "Status",
                         "Hotend",
+                        "Hotend2",
                         "Bed",
                         "Elapsed",
                         "ETA",
@@ -137,7 +146,7 @@
 
         </style>
 
-        <script src='./duetcard.js'></script>
+        <script src='./duet-card.js'></script>
 
     </head>
 
@@ -148,7 +157,7 @@
             <duet-card>
 
             </duet-card>
-            <dueteditor>
+            <duet-editor>
 
             </duet-editor>
         </div>

diff --git a/src/Components/Stats/TemperatureStat.tsx b/src/Components/Stats/TemperatureStat.tsx
@@ -60,7 +60,9 @@ const temperature = (
     temperatureEntity: HassEntity,
     config: ThreedyConfig
 ) => {
-
+    if(!temperatureEntity){
+        return "-";
+    }
     const t: number = parseFloat(temperatureEntity.state);
     const u: ThreedyTemperatureUnit = temperatureUnitFromEntity(temperatureEntity);
     const tc: number = convertTemperature(t, u, config.temperature_unit || u);

diff --git a/src/Components/Stats/utils.tsx b/src/Components/Stats/utils.tsx
@@ -25,6 +25,8 @@ const getEntityName = (
             return `${baseName}_time_elapsed`
         case 'Hotend':
             return `${baseName}_tool_1_current_temperature`
+        case 'Hotend2':
+            return `${baseName}_tool_2_current_temperature`
         case 'Bed':
             return `${baseName}_tool_bed_current_temperature`
         case 'Progress':
@@ -101,14 +103,35 @@ const renderCondition = (
             )
 
         case ThreedyCondition.Hotend:
+            var HotEndEntity = getEntity(hass, getEntityName(config, condition));
+            var friendlyName = "Hotend";
+            if(HotEndEntity){
+                friendlyName = HotEndEntity.attributes.friendly_name;
+            }
+
             return (
                 <TemperatureStat
-                    name={"Hotend"}
-                    temperatureEntity={ getEntity(hass,getEntityName(config, condition)) }
+                    name={friendlyName}
+                    temperatureEntity={ HotEndEntity }
                     config={config}
                 />
             )
+
+        case ThreedyCondition.Hotend2:
+            var HotEndEntity = getEntity(hass, getEntityName(config, condition));
+            var friendlyName = "Hotend 2";
+            console.log("hotend2");
+            if(HotEndEntity){
+                friendlyName = HotEndEntity.attributes.friendly_name;
+            }
 
+            return (
+                <TemperatureStat
+                    name={friendlyName}
+                    temperatureEntity={ HotEndEntity }
+                    config={config}
+                />
+            )
 
         default:
             return (

diff --git a/src/Configurator/Components/MultiSelector/index.tsx b/src/Configurator/Components/MultiSelector/index.tsx
@@ -7,7 +7,7 @@ import {Enum} from "../../../types";
 
 const Item = ({ item, selected, available, reorder, toggle }) => {
 
-
+console.log("item:", item);
     const active = selected.includes(item);
     const y = active ? 56 * selected.indexOf(item) : 56 * (selected.length + available.indexOf(item));
 

diff --git a/src/Configurator/index.tsx b/src/Configurator/index.tsx
@@ -18,7 +18,18 @@ import {
 
 import styles from './styles';
 import FewSelector from "./Components/FewSelector";
-import {ThreedyCondition, ThreedyPrinter, ThreedyTheme} from '../types';
+import {ThreedyCondition, ThreedyConfig, ThreedyPrinter, ThreedyTheme} from '../types';
+import { getEntityName } from '../Components/Stats/utils';
+import { getEntity } from '../Utils/HomeAssistant';
+
+const HasSecondHotEnd =
+    (hass, config: ThreedyConfig): boolean =>{
+        if(!config){
+            return false;
+        }
+
+        return  getEntity(hass, getEntityName(config, ThreedyCondition.Hotend2)) != undefined
+    }
 
 
 const Configurator = ({ hass, config, threedy }) => {
@@ -41,6 +52,9 @@ const Configurator = ({ hass, config, threedy }) => {
         updateValue( _updateConfig, key, value);
     }
 
+    const ShowSecondHotend = HasSecondHotEnd(hass, config);
+    console.log("second hot end found?", ShowSecondHotend);
+
     if (!config) return (<div/>)
 
     // @ts-ignore
@@ -75,9 +89,11 @@ const Configurator = ({ hass, config, threedy }) => {
                                 initial={config.name || modifiedConfig.name}
                             />
 
+
                             <p style={{ ...styles.Label }}>Monitored</p>
                             <MultiSelector
-                                items={ ThreedyCondition }
+                                items={ShowSecondHotend ? ThreedyCondition : Object.values(ThreedyCondition).filter(item => item !== ThreedyCondition.Hotend2)}
+                                // items={ ThreedyCondition }
                                 initial={config.monitored}
                                 onChange={selectedValues => _updateValue('monitored', selectedValues)}
                             />

diff --git a/src/types.ts b/src/types.ts
@@ -13,6 +13,7 @@ export enum ThreedyCondition {
     ETA = "ETA",
     Elapsed = "Elapsed",
     Hotend = "Hotend",
+    Hotend2 = "Hotend2",
     Bed = "Bed",
     Remaining = "Remaining",
     Progress = 'Progress'