From e9490c797d71180cbb0b3399b5a7563da099e3b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Tue, 4 Feb 2025 11:34:57 +0100 Subject: [PATCH] finally implemented DEMO_004 --- .../src/app/editor/circuit/DEMO_004.ts | 25 +++++++++++-------- .../src/app/editor/editor.component.ts | 3 +-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/angular/src/app/editor/circuit/DEMO_004.ts b/src/main/angular/src/app/editor/circuit/DEMO_004.ts index 886a301..11a50d8 100644 --- a/src/main/angular/src/app/editor/circuit/DEMO_004.ts +++ b/src/main/angular/src/app/editor/circuit/DEMO_004.ts @@ -5,15 +5,20 @@ export const DEMO_004 = create(); function create() { const circuit = new Circuit("DEMO_004", "4. Relais"); - const battery = circuit.newBattery(1, 1); - const set = circuit.newSwitch(0, 0, undefined, true); - const reset = circuit.newSwitch(2, 0, undefined, true); - const relay = circuit.newRelay(1, 0); - // circuit.connect(battery.minus, set.common); - // circuit.connect(battery.plus, reset.inactive); - // circuit.connect(set.active, relay.coilA); - // circuit.connect(reset.common, relay.coilB); - // circuit.connect(battery.minus, relay.active); - // circuit.connect(relay.coilA, relay.common); + const battery = circuit.newBattery(2, 0); + const set = circuit.newSwitch(1, 0, undefined, true); + const reset = circuit.newSwitch(2, 2.3, undefined, true); + const relay = circuit.newRelay(0, 2); + const light = circuit.newLight(0, 3); + circuit.connect(battery.minus, set.active); + circuit.connect(set.common, relay.common); + circuit.connect(set.active, relay.active); + circuit.connect(relay.common, relay.coilA); + circuit.connect(relay.coilB, reset.common); + circuit.connect(reset.inactive, battery.plus); + + circuit.connect(relay.coilA, light.a); + circuit.connect(relay.coilB, light.b); + return circuit; } diff --git a/src/main/angular/src/app/editor/editor.component.ts b/src/main/angular/src/app/editor/editor.component.ts index 790824d..e908d4d 100644 --- a/src/main/angular/src/app/editor/editor.component.ts +++ b/src/main/angular/src/app/editor/editor.component.ts @@ -3,7 +3,6 @@ import {CircuitComponent} from './circuit/circuit.component'; import {MessagesComponent} from './message/messages/messages.component'; import {MenubarComponent} from './menubar/menubar.component'; import {Circuit} from './circuit/Circuit'; -import {DEMO_003} from './circuit/DEMO_003'; import {DEMO_004} from './circuit/DEMO_004'; @Component({ @@ -21,7 +20,7 @@ export class EditorComponent implements OnInit { private _circuit: Circuit = Circuit.new(); ngOnInit(): void { - this.circuit = DEMO_003; + this.circuit = DEMO_004; } set circuit(circuit: Circuit) {