Merge pull request #881 from qitechgmbh/880-add-nozzle-pid-for-temperature-at-extruder

880 add nozzle pid for temperature at extruder

electron/src/machines/extruder/extruder2/Extruder2Settings.tsx

@@ -239,6 +239,50 @@ export function Extruder2SettingsPage() {
                 />
               </Label>
             </ControlCard>
+            <ControlCard title="Temperature PID Settings (Nozzle) ">
+              <Label label="Kp">
+                <EditValue
+                  value={state?.pid_settings.temperature.nozzle.kp}
+                  defaultValue={
+                    defaultState?.pid_settings.temperature.nozzle.kp
+                  }
+                  min={0}
+                  max={100}
+                  step={0.001}
+                  renderValue={(v) => roundToDecimals(v, 3)}
+                  onChange={(v) => setTemperaturePidValue("nozzle", "kp", v)}
+                  title="Temperature PID KP"
+                />
+              </Label>
+              <Label label="Ki">
+                <EditValue
+                  value={state?.pid_settings.temperature.nozzle.ki}
+                  defaultValue={
+                    defaultState?.pid_settings.temperature.nozzle.ki
+                  }
+                  min={0}
+                  max={100}
+                  step={0.001}
+                  renderValue={(v) => roundToDecimals(v, 3)}
+                  onChange={(v) => setTemperaturePidValue("nozzle", "ki", v)}
+                  title="Temperature PID KI"
+                />
+              </Label>
+              <Label label="Kd">
+                <EditValue
+                  value={state?.pid_settings.temperature.nozzle.kd}
+                  defaultValue={
+                    defaultState?.pid_settings.temperature.nozzle.kd
+                  }
+                  min={0}
+                  max={100}
+                  step={0.001}
+                  renderValue={(v) => roundToDecimals(v, 3)}
+                  onChange={(v) => setTemperaturePidValue("nozzle", "kd", v)}
+                  title="Temperature PID KD"
+                />
+              </Label>
+            </ControlCard>
           </ControlGrid>
         </>
       )}

electron/src/machines/extruder/extruder2/extruder2Namespace.ts

@@ -149,6 +149,12 @@ export const pidSettingsSchema = z.object({
       kd: z.number(),
       zone: z.string(),
     }),
+    nozzle: z.object({
+      ki: z.number(),
+      kp: z.number(),
+      kd: z.number(),
+      zone: z.string(),
+    }),
   }),
   pressure: z.object({
     ki: z.number(),

electron/src/machines/extruder/extruder2/useExtruder.ts

@@ -294,7 +294,7 @@ export function useExtruder2() {
   };
 
   const setTemperaturePidValue = (
-    zone: "front" | "middle" | "back",
+    zone: "front" | "middle" | "back" | "nozzle",
     key: "kp" | "ki" | "kd",
     value: number,
   ) => {

server/src/machines/extruder1/api.rs

@@ -188,6 +188,7 @@ pub struct TemperaturePidStates {
     pub front: TemperaturePid,
     pub middle: TemperaturePid,
     pub back: TemperaturePid,
+    pub nozzle: TemperaturePid,
 }
 
 #[derive(Deserialize, Serialize, Debug, Clone, PartialEq)]

server/src/machines/extruder1/emit.rs

@@ -127,6 +127,12 @@ impl ExtruderV2 {
                         kd: self.temperature_controller_back.pid.get_kd(),
                         zone: String::from("back"),
                     },
+                    nozzle: TemperaturePid {
+                        ki: self.temperature_controller_nozzle.pid.get_ki(),
+                        kp: self.temperature_controller_nozzle.pid.get_kp(),
+                        kd: self.temperature_controller_nozzle.pid.get_kd(),
+                        zone: String::from("nozzle"),
+                    },
                 },
                 pressure: PidSettings {
                     ki: self.screw_speed_controller.pid.get_ki(),
@@ -320,6 +326,13 @@ impl ExtruderV2 {
                     settings.kd,
                 );
             }
+            "nozzle" => {
+                self.temperature_controller_nozzle.pid.configure(
+                    settings.ki,
+                    settings.kp,
+                    settings.kd,
+                );
+            }
             _ => tracing::warn!("Unknown zone: {}", settings.zone),
         }
         self.emit_state();

server/src/machines/extruder1/mock/mock_emit.rs

@@ -151,6 +151,11 @@ impl ExtruderV2 {
                 self.pid_settings.temperature.back.kp = settings.kp;
                 self.pid_settings.temperature.back.kd = settings.kd;
             }
+            "nozzle" => {
+                self.pid_settings.temperature.nozzle.ki = settings.ki;
+                self.pid_settings.temperature.nozzle.kp = settings.kp;
+                self.pid_settings.temperature.nozzle.kd = settings.kd;
+            }
             _ => tracing::warn!("Unknown zone: {}", settings.zone),
         }
         self.emit_state();

server/src/machines/extruder1/mock/new.rs

@@ -91,23 +91,29 @@ impl control_core::machines::new::MachineNewTrait for ExtruderV2 {
             pid_settings: PidSettingsStates {
                 temperature: TemperaturePidStates {
                     front: TemperaturePid {
-                        ki: 0.0,
-                        kp: 0.0,
-                        kd: 0.0,
+                        ki: 0.1,
+                        kp: 0.1,
+                        kd: 0.1,
                         zone: String::from("front"),
                     },
                     middle: TemperaturePid {
-                        ki: 0.0,
-                        kp: 0.0,
-                        kd: 0.0,
+                        ki: 0.1,
+                        kp: 0.1,
+                        kd: 0.1,
                         zone: String::from("middle"),
                     },
                     back: TemperaturePid {
-                        ki: 0.0,
-                        kp: 0.0,
-                        kd: 0.0,
+                        ki: 0.1,
+                        kp: 0.1,
+                        kd: 0.1,
                         zone: String::from("back"),
                     },
+                    nozzle: TemperaturePid {
+                        ki: 0.1,
+                        kp: 0.1,
+                        kd: 0.1,
+                        zone: String::from("nozzle"),
+                    },
                 },
                 pressure: PidSettings {
                     ki: 0.0,