From efeef7da5cd9a7a88caa336756c29e85f793b4c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Tue, 4 Feb 2025 11:19:26 +0100 Subject: [PATCH] DEMO_0003 position fix + code clean --- .../src/app/editor/circuit/DEMO_003.ts | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/angular/src/app/editor/circuit/DEMO_003.ts b/src/main/angular/src/app/editor/circuit/DEMO_003.ts index 878a21a..ae2961b 100644 --- a/src/main/angular/src/app/editor/circuit/DEMO_003.ts +++ b/src/main/angular/src/app/editor/circuit/DEMO_003.ts @@ -4,19 +4,25 @@ export const DEMO_003 = create(); function create() { const circuit = new Circuit("DEMO_003", "3. Relais"); - const batteryLight = circuit.newBattery(2, 0, "Licht Batterie"); + + const lightBattery = circuit.newBattery(2, 0, "Licht Batterie"); const lightInactive = circuit.newLight(2, 1, "Licht Inaktiv"); const lightActive = circuit.newLight(2, 2, "Licht Aktiv"); + const relay = circuit.newRelay(1, 2, "Relais"); - const relaySwitch = circuit.newSwitch(1, 3, "Taster", true); - const batteryRelay = circuit.newBattery(2, 3, "Relais Batterie"); - circuit.connect(batteryLight.plus, lightInactive.b); + const relaySwitch = circuit.newSwitch(0.3, 3.3, "Taster", true); + const relayBattery = circuit.newBattery(1.6, 3.3, "Relais Batterie"); + + circuit.connect(lightBattery.plus, lightInactive.b); circuit.connect(lightInactive.b, lightActive.b); - circuit.connect(batteryLight.minus, relay.common); + circuit.connect(lightBattery.minus, relay.common); + circuit.connect(lightInactive.a, relay.inactive); circuit.connect(lightActive.a, relay.active); + circuit.connect(relaySwitch.common, relay.coilA); - circuit.connect(batteryRelay.minus, relaySwitch.active); - circuit.connect(batteryRelay.plus, relay.coilB); + circuit.connect(relayBattery.plus, relay.coilB); + circuit.connect(relayBattery.minus, relaySwitch.active); + return circuit; }