From bd457f204505870325dab942d9bff80131438d0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= <git@patrick-hassel.de>
Date: Mon, 3 Feb 2025 20:17:02 +0100
Subject: [PATCH] DEMO Cleanup

---
 src/main/angular/src/app/editor/circuit/DEMO_002.ts | 10 +++++-----
 src/main/angular/src/app/editor/circuit/DEMO_003.ts | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/angular/src/app/editor/circuit/DEMO_002.ts b/src/main/angular/src/app/editor/circuit/DEMO_002.ts
index f155af7..3e23534 100644
--- a/src/main/angular/src/app/editor/circuit/DEMO_002.ts
+++ b/src/main/angular/src/app/editor/circuit/DEMO_002.ts
@@ -4,11 +4,11 @@ export const DEMO_002 = create();
 
 function create() {
   const circuit = new Circuit("DEMO_002", "2. Reihe und Parallel");
-  const battery0 = circuit.newBattery(1, 3);
-  const battery1 = circuit.newBattery(3, 3);
-  const light0 = circuit.newLight(1, 1);
-  const light1 = circuit.newLight(3, 1);
-  const light2 = circuit.newLight(2, 5);
+  const battery0 = circuit.newBattery(1, 1);
+  const battery1 = circuit.newBattery(2, 1);
+  const light0 = circuit.newLight(1, 0);
+  const light1 = circuit.newLight(2, 0);
+  const light2 = circuit.newLight(1, 2);
   circuit.connect(light0.a, battery0.minus);
   circuit.connect(light0.b, light1.a);
   circuit.connect(light1.b, battery1.plus);
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 cee2b99..878a21a 100644
--- a/src/main/angular/src/app/editor/circuit/DEMO_003.ts
+++ b/src/main/angular/src/app/editor/circuit/DEMO_003.ts
@@ -6,17 +6,17 @@ function create() {
   const circuit = new Circuit("DEMO_003", "3. Relais");
   const batteryLight = circuit.newBattery(2, 0, "Licht Batterie");
   const lightInactive = circuit.newLight(2, 1, "Licht Inaktiv");
-  const lightActive = circuit.newLight(3, 2, "Licht Aktiv");
+  const lightActive = circuit.newLight(2, 2, "Licht Aktiv");
   const relay = circuit.newRelay(1, 2, "Relais");
-  const relaySwitch = circuit.newSwitch(0, 3, "Taster", true);
-  const batteryRelay = circuit.newBattery(1, 4, "Relais Batterie");
-  circuit.connect(batteryLight.plus, lightActive.b);
+  const relaySwitch = circuit.newSwitch(1, 3, "Taster", true);
+  const batteryRelay = circuit.newBattery(2, 3, "Relais Batterie");
   circuit.connect(batteryLight.plus, lightInactive.b);
+  circuit.connect(lightInactive.b, lightActive.b);
   circuit.connect(batteryLight.minus, relay.common);
   circuit.connect(lightInactive.a, relay.inactive);
   circuit.connect(lightActive.a, relay.active);
-  circuit.connect(batteryRelay.minus, relaySwitch.common);
-  circuit.connect(relaySwitch.active, relay.coilA);
+  circuit.connect(relaySwitch.common, relay.coilA);
+  circuit.connect(batteryRelay.minus, relaySwitch.active);
   circuit.connect(batteryRelay.plus, relay.coilB);
   return circuit;
 }